Reticulite

__DEFINES/materials.dm

@@ -31,6 +31,7 @@
 #define MAT_CERENKITE "$cerenkite"
 #define MAT_MOLITZ    "$molitz"
 #define MAT_GINGERBREAD "$gingerbread"
+#define MAT_RETICULITE "$reticulite"
 
 
 #define VALUE_MISC 0.1
@@ -87,5 +88,6 @@
 #define CC_PER_SHEET_CERENKITE   CC_PER_SHEET_METAL
 #define CC_PER_SHEET_MOLITZ      CC_PER_SHEET_METAL
 #define CC_PER_SHEET_GINGERBREAD CC_PER_SHEET_METAL
+#define CC_PER_SHEET_RETICULITE  CC_PER_SHEET_DIAMOND
 
 #define CC_PER_U 10 //How many cc per 1 u of reagent in eg. a glass of water or a human's bloodstream.

__DEFINES/reagents.dm

@@ -72,6 +72,7 @@
 #define VIRUSFOOD 			"virusfood"
 #define STERILIZINE 			"sterilizine"
 #define IRON 			"iron"
+#define ZETADUST 		"zetadust"
 #define GOLD 			"gold"
 #define SILVER 			"silver"
 #define URANIUM 			"uranium"
@@ -142,6 +143,8 @@
 #define NANOBOTS 			"nanobots"
 #define MEDNANOBOTS 			"mednanobots"
 #define COMNANOBOTS 			"comnanobots"
+#define ZEPTOBOTS 			"zeptobots"
+#define GREYZEPTOBOTS 			"greyzeptobots"
 #define FLUOROSURFACTANT 			"fluorosurfactant"
 #define PICCOLYN			"piccolyn"
 #define NICOTINE 			"nicotine"
@@ -439,6 +442,7 @@
 #define METASTABLE_MUTAGEN	"metastable"
 #define ELECTRIC_SHEEP		"electric_sheep"
 #define SCIENTISTS_SERENDIPITY		"scientists_serendipity"
+#define SCIENTISTS_SUPREMESECRET	"scientists_supreme_secret"
 #define METABUDDY		"metabuddy"
 #define SPIDERS			"spiders"
 #define WEED_EATER		"weed_eater"

__DEFINES/research_levels.dm

@@ -10,3 +10,4 @@
 #define Tc_POWERSTORAGE      "powerstorage"
 #define Tc_NANOTRASEN        "nanotrasen"
 #define Tc_ANOMALY           "anomaly"
+#define Tc_ALIEN             "xenotech"

code/datums/supply_packs/clothing.dm

@@ -291,7 +291,7 @@
 					/obj/item/weapon/tank/oxygen/red,
 					/obj/item/clothing/mask/gas/mothership)
 	cost = 175
-	containertype = /obj/structure/closet/crate/ayy
+	containertype = /obj/structure/closet/crate/ayy/metal
 	containername = "grey Space-Ex crate"
 	group = "Clothing"
 	containsdesc = "Contains a space-worthy softsuit that is perfectly fitted for a grey. Includes a fancy red oxygen tank!"
@@ -309,7 +309,7 @@
 					/obj/item/clothing/shoes/jackboots/mothership,
 					/obj/item/clothing/shoes/jackboots/mothership)
 	cost = 50
-	containertype = /obj/structure/closet/ayy
+	containertype = /obj/structure/closet/ayy/metal
 	containername = "mothership uniform locker"
 	containsicon = "grey_uniform"
 	containsdesc = "A batch of clothing from the grey mothership. Comes with either two outfits for workers, or two outfits for researchers. Whatever they had extra."
@@ -328,7 +328,7 @@
 					/obj/item/weapon/tank/emergency_oxygen/engi,
 					/obj/item/weapon/tank/emergency_oxygen/engi)
 	cost = 40
-	containertype = /obj/structure/closet/crate/ayy3
+	containertype = /obj/structure/closet/crate/ayy3/metal
 	containername = "GDR half-mask crate"
 	contraband = 1
 	group = "Clothing"

code/datums/supply_packs/security.dm

@@ -74,8 +74,8 @@
 
 /datum/supply_packs/greyweapons
 	name = "MDF surplus weapons"
-	contains = list(/obj/item/weapon/melee/stunprobe,
-					/obj/item/weapon/melee/stunprobe,
+	contains = list(/obj/item/weapon/melee/baton/loaded/probe,
+					/obj/item/weapon/melee/baton/loaded/probe,
 					/obj/item/weapon/gun/energy/smalldisintegrator,
 					/obj/item/weapon/gun/energy/smalldisintegrator)
 	cost = 60
@@ -141,7 +141,7 @@
 					/obj/item/clothing/head/helmet/mothership,
 					/obj/item/clothing/head/helmet/mothership)
 	cost = 60
-	containertype = /obj/structure/closet/secure_closet/ayy2
+	containertype = /obj/structure/closet/secure_closet/ayy2/metal
 	containername = "MDF standard armor locker"
 	one_access = list(access_security, access_mothership_military)
 	group = "Security"
@@ -170,7 +170,7 @@
 					/obj/item/clothing/head/helmet/mothership_explorer,
 					/obj/item/clothing/head/helmet/mothership_explorer)
 	cost = 60
-	containertype = /obj/structure/closet/secure_closet/ayy
+	containertype = /obj/structure/closet/secure_closet/ayy/metal
 	containername = "GDR explorer armor locker"
 	one_access = list(access_security, access_mothership_military)
 	group = "Security"

code/game/machinery/recharger.dm

@@ -103,7 +103,7 @@
 	if(!anchored)
 		to_chat(user, "<span class='warning'>You must secure \the [src] before you can make use of it!</span>")
 		return 1
-	if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G, /obj/item/weapon/melee/stunprobe) || istype(G, /obj/item/energy_magazine) || istype(G, /obj/item/ammo_storage/magazine/lawgiver) || istype(G, /obj/item/weapon/rcs) || istype(G, /obj/item/clothing/head/helmet/stun))
+	if(istype(G, /obj/item/weapon/gun/energy) || istype(G, /obj/item/weapon/melee/baton) || istype(G, /obj/item/weapon/melee/baton/loaded/probe) || istype(G, /obj/item/energy_magazine) || istype(G, /obj/item/ammo_storage/magazine/lawgiver) || istype(G, /obj/item/weapon/rcs) || istype(G, /obj/item/clothing/head/helmet/stun))
 		if (istype(G, /obj/item/weapon/gun/energy))
 			var/obj/item/weapon/gun/energy/gun = G
 			if (!gun.rechargeable)
@@ -235,8 +235,8 @@
 					has_beeped = TRUE
 			else
 				icon_state = "recharger0"
-		else if(istype(charging, /obj/item/weapon/melee/stunprobe)) //25e power loss is so minor that the game shouldn't bother calculating the efficiency of better parts for it
-			var/obj/item/weapon/melee/stunprobe/B = charging
+		else if(istype(charging, /obj/item/weapon/melee/baton/loaded/probe)) //25e power loss is so minor that the game shouldn't bother calculating the efficiency of better parts for it
+			var/obj/item/weapon/melee/baton/loaded/probe/B = charging
 			if(B.bcell)
 				if(B.bcell.give(175*charging_speed_modifier))
 					icon_state = "recharger1"
@@ -291,8 +291,8 @@
 		if(E.power_supply)
 			E.power_supply.emp_act(severity)
 
-	if(istype(charging, /obj/item/weapon/melee/stunprobe))
-		var/obj/item/weapon/melee/stunprobe/B = charging
+	if(istype(charging, /obj/item/weapon/melee/baton/loaded/probe))
+		var/obj/item/weapon/melee/baton/loaded/probe/B = charging
 		if(B.bcell)
 			B.bcell.charge = 0
 
@@ -365,8 +365,8 @@
 					icon_state = "wrecharger2"
 			else
 				icon_state = "wrecharger3"
-		if(istype(charging, /obj/item/weapon/melee/stunprobe))
-			var/obj/item/weapon/melee/stunprobe/B = charging
+		if(istype(charging, /obj/item/weapon/melee/baton/loaded/probe))
+			var/obj/item/weapon/melee/baton/loaded/probe/B = charging
 			if(B.bcell)
 				if(B.bcell.give(175))
 					icon_state = "wrecharger1"

code/game/mecha/combat/roswell.dm

@@ -0,0 +1,33 @@
+/obj/mecha/combat/roswell
+	desc = "An exosuit from another world."
+	name = "Roswell"
+	icon_state = "roswell"
+	initial_icon = "roswell"
+	step_in = 1
+	dir_in = 1 //Facing North.
+	health = 300
+	deflect_chance = 15
+	damage_absorption = list("brute"=0.75,"fire"=1,"bullet"=0.8,"laser"=0.7,"energy"=0.85,"bomb"=1)
+	max_temperature = 25000
+	infra_luminosity = 6
+	wreckage = /obj/effect/decal/mecha_wreckage/roswell
+	internal_damage_threshold = 35
+	max_equip = 3
+
+/obj/mecha/combat/roswell/mechturn(direction)
+	dir = direction
+	return 1
+
+/obj/mecha/combat/roswell/mechstep(direction)
+	return step(src,direction)
+
+/obj/mecha/combat/roswell/mechsteprand()
+	return step_rand(src)
+
+/obj/mecha/combat/roswell/Process_Spacemove(var/check_drift = 0) //invaders from outer spaaace
+	return TRUE
+
+/obj/effect/decal/mecha_wreckage/roswell
+    name = "downed weather balloon"
+    desc = "Seems legit"
+    icon_state = "roswell-broken"

code/game/objects/items/stacks/sheets/mineral.dm

@@ -604,3 +604,41 @@ var/list/datum/stack_recipe/gingerbread_recipes = list ( \
 /obj/item/stack/sheet/mineral/gingerbread/New(var/loc, var/amount=null)
 	recipes = gingerbread_recipes
 	..()
+
+/obj/item/stack/sheet/mineral/reticulite
+	name = "reticulite"
+	desc = "Abducted from distant mines you've probably been nowhere near. At least as far as you remember."
+	singular_name = "reticulite plate"
+	icon_state = "sheet-reticulite"
+	force = 5.0
+	throwforce = 5
+	w_class = W_CLASS_MEDIUM
+	throw_speed = 3
+	throw_range = 3
+	origin_tech = Tc_MATERIALS + "=5" + Tc_ALIEN + "=1"
+	perunit = CC_PER_SHEET_RETICULITE
+	mat_type = MAT_RETICULITE
+	starting_materials = list(MAT_RETICULITE = CC_PER_SHEET_RETICULITE)
+
+var/list/datum/stack_recipe/reticulite_recipes = list(
+	new/datum/stack_recipe("floor tile", /obj/item/stack/tile/mineral/reticulite, 1, 4, 60),
+	new/datum/stack_recipe("ornate floor tile", /obj/item/stack/tile/mineral/reticulite/fancy, 1, 4, 60),
+	null,
+	new/datum/stack_recipe("GDR closet", /obj/structure/closet/ayy, 2, one_per_turf = 1, time = 15),
+	new/datum/stack_recipe("MDF closet", /obj/structure/closet/ayy2, 2, one_per_turf = 1, time = 15),
+	new/datum/stack_recipe("Laborer closet", /obj/structure/closet/ayy3, 2, one_per_turf = 1, time = 15),
+	null,
+	new/datum/stack_recipe("GDR crate", /obj/structure/closet/crate/ayy, 2, one_per_turf = 1, time = 15),
+	new/datum/stack_recipe("MDF crate", /obj/structure/closet/crate/ayy2, 2, one_per_turf = 1, time = 15),
+	new/datum/stack_recipe("MDF industrial crate", /obj/structure/closet/crate/ayy3, 2, one_per_turf = 1, time = 15),
+	null,
+	new/datum/stack_recipe/chair("GDR basic chair",  /obj/structure/bed/chair/comfy/ayy1, 1, one_per_turf = 1, on_floor = 1),
+	new/datum/stack_recipe("GDR basic bed", /obj/structure/bed/ayy1, 2, one_per_turf = 1, on_floor = 1),
+)
+
+/obj/item/stack/sheet/mineral/reticulite/New(var/loc, var/amount=null)
+	recipes = reticulite_recipes
+	..()
+
+/obj/item/stack/sheet/mineral/reticulite/dissolvable()
+	return WATER

code/game/objects/items/stacks/tiles/mineral.dm

@@ -213,5 +213,24 @@
 
 	material  = "gingerbread"
 
+/obj/item/stack/tile/mineral/reticulite
+	name = "reticulite tile"
+	singular_name = "reticulite floor tile"
+	desc = "A hexagonally shaped tile made out of reticulite."
+	icon_state = "tile_reticulite"
+	w_class = W_CLASS_MEDIUM
+	force = 1.0
+	throwforce = 1.0
+	throw_speed = 3
+	throw_range = 7
+	max_amount = 60
 
+	material = "alien_tile1"
+	starting_materials = list(MAT_RETICULITE = CC_PER_SHEET_RETICULITE / 4) // Recipe requires 1 sheet for 4 tiles
+	w_type = RECYK_METAL
 
+/obj/item/stack/tile/mineral/reticulite/fancy
+	name = "ornate reticulite tile"
+	icon_state = "tile_fancyreticulite"
+	desc = "A refined, chiseled and normal shaped tile made out of reticulite."
+	material = "alien_tile_fancy"

code/game/objects/items/weapons/stock_parts.dm

@@ -253,7 +253,6 @@
 	rating = 4
 	starting_materials = list(MAT_IRON = 50, MAT_GLASS = 20, MAT_SILVER = 10, MAT_PHAZON = 5)
 
-
 // Subspace stock parts
 
 /obj/item/weapon/stock_parts/subspace/ansible
@@ -304,3 +303,33 @@
 	desc = "A large piece of equipment used to open a window into the subspace dimension."
 	origin_tech = Tc_MAGNETS + "=5;" + Tc_MATERIALS + "=5;" + Tc_BLUESPACE + "=3"
 	starting_materials = list(MAT_IRON = 50)
+
+// ayylium stock parts
+
+/obj/item/weapon/stock_parts/ayy/abductor
+	name = "zepto abductor"
+	icon_state = "subspace_transmitter"
+	desc = "Alien electronics used to pull things towards itself."
+	origin_tech = Tc_MAGNETS + "=5;" + Tc_MATERIALS + "=5;" + Tc_ALIEN + "=2"
+	starting_materials = list(MAT_URANIUM = 50, MAT_RETICULITE = 50)
+
+/obj/item/weapon/stock_parts/ayy/gravitator
+	name = "gravitation module"
+	icon_state = "subspace_transmitter"
+	desc = "Alien device used to suspend gravity around itself."
+	origin_tech = Tc_MAGNETS + "=5;" + Tc_MATERIALS + "=5;" + Tc_ALIEN + "=2"
+	starting_materials = list(MAT_GOLD = 50, MAT_RETICULITE = 50)
+
+/obj/item/weapon/stock_parts/ayy/scrambler
+	name = "zepto scrambler"
+	icon_state = "subspace_transmitter"
+	desc = "Alien instrument used to scramble the material composition of things."
+	origin_tech = Tc_PROGRAMMING + "=4;" + Tc_MATERIALS + "=5;" + Tc_ALIEN + "=2"
+	starting_materials = list(MAT_DIAMOND = 50, MAT_RETICULITE = 50)
+
+/obj/item/weapon/stock_parts/ayy/prober
+	name = "probing module"
+	icon_state = "subspace_transmitter"
+	desc = "Alien module used to probe things for inspection."
+	origin_tech = Tc_PROGRAMMING + "=4;" + Tc_MATERIALS + "=5;" + Tc_ALIEN + "=2"
+	starting_materials = list(MAT_SILVER = 50, MAT_RETICULITE = 50)

code/game/objects/items/weapons/stunbaton.dm

@@ -2,7 +2,7 @@
 	name = "stun baton"
 	desc = "A stun baton for incapacitating people with."
 	icon_state = "stun baton"
-	item_state = "baton0"
+	item_state = "baton"
 	inhand_states = list("left_hand" = 'icons/mob/in-hand/left/swords_axes.dmi', "right_hand" = 'icons/mob/in-hand/right/swords_axes.dmi')
 	flags = FPRINT
 	slot_flags = SLOT_BELT
@@ -17,6 +17,9 @@
 	var/hitcost = 100 // 10 hits on crap cell
 	var/stunsound = 'sound/weapons/Egloves.ogg'
 	var/swingsound = "swing_hit"
+	var/vismsg = TRUE
+	var/openable = TRUE
+	var/attacklogverb = "stunned"
 
 /obj/item/weapon/melee/baton/get_cell()
 	return bcell
@@ -60,15 +63,8 @@
 
 
 /obj/item/weapon/melee/baton/update_icon()
-	if(status)
-		icon_state = "[initial(name)]_active"
-		item_state = "baton1"
-	else if(!bcell)
-		icon_state = "[initial(name)]_nocell"
-		item_state = "baton0"
-	else
-		icon_state = "[initial(name)]"
-		item_state = "baton0"
+	icon_state = "[initial(name)][status ? "_active" : bcell ? "" : "_nocell"]"
+	item_state = "[initial(item_state)][status ? "-on" : ""]"
 
 	if (istype(loc,/mob/living/carbon))
 		var/mob/living/carbon/M = loc
@@ -92,7 +88,7 @@
 		else
 			to_chat(user, "<span class='notice'>[src] already has a cell.</span>")
 
-	else if(W.is_screwdriver(user))
+	else if(W.is_screwdriver(user) && openable)
 		if(bcell)
 			bcell.updateicon()
 			bcell.forceMove(get_turf(src.loc))
@@ -197,18 +193,19 @@
 
 		apply_baton_effect(L)
 
-		L.visible_message("<span class='danger'>\The [L] has been stunned with \the [src] by [user]!</span>",\
-			"<span class='userdanger'>You have been stunned with \the [src] by \the [user]!</span>",\
-			self_drugged_message="<span class='userdanger'>\The [user]'s [src] sucks the life right out of you!</span>")
+		if(vismsg)
+			L.visible_message("<span class='danger'>\The [L] has been [attacklogverb] with \the [src] by [user]!</span>",\
+				"<span class='userdanger'>You have been [attacklogverb] with \the [src] by \the [user]!</span>",\
+				self_drugged_message="<span class='userdanger'>\The [user]'s [src] sucks the life right out of you!</span>")
 		playsound(loc, stunsound, 50, 1, -1)
 
 		deductcharge(hitcost)
 
 		L.forcesay(hit_appends)
 
-		user.attack_log += "\[[time_stamp()]\]<font color='red'> Stunned [L.name] ([L.ckey]) with [name]</font>"
-		L.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by [user.name] ([user.ckey]) with [name]</font>"
-		log_attack("<font color='red'>[user.name] ([user.ckey]) stunned [L.name] ([L.ckey]) with [name]</font>" )
+		user.attack_log += "\[[time_stamp()]\]<font color='red'> [capitalize(attacklogverb)] [L.name] ([L.ckey]) with [name]</font>"
+		L.attack_log += "\[[time_stamp()]\]<font color='orange'> [capitalize(attacklogverb)] by [user.name] ([user.ckey]) with [name]</font>"
+		log_attack("<font color='red'>[user.name] ([user.ckey]) [attacklogverb] [L.name] ([L.ckey]) with [name]</font>" )
 		M.assaulted_by(user)
 
 /obj/item/weapon/melee/baton/throw_impact(atom/hit_atom)
@@ -225,16 +222,17 @@
 
 	apply_baton_effect(L)
 
-	L.visible_message("<span class='danger'>[L] has been stunned with [src] by [foundmob ? foundmob : "Unknown"]!</span>")
+	if(vismsg)
+		L.visible_message("<span class='danger'>[L] has been [attacklogverb] with [src] by [foundmob ? foundmob : "Unknown"]!</span>")
 	playsound(loc, stunsound, 50, 1, -1)
 
 	deductcharge(hitcost)
 
 	L.forcesay(hit_appends)
 
-	foundmob.attack_log += "\[[time_stamp()]\]<font color='red'> Stunned [L.name] ([L.ckey]) with [name]</font>"
-	L.attack_log += "\[[time_stamp()]\]<font color='orange'> Stunned by thrown [src] by [istype(foundmob) ? foundmob.name : ""] ([istype(foundmob) ? foundmob.ckey : ""])</font>"
-	log_attack("<font color='red'>Flying [src.name], thrown by [istype(foundmob) ? foundmob.name : ""] ([istype(foundmob) ? foundmob.ckey : ""]) stunned [L.name] ([L.ckey])</font>" )
+	foundmob.attack_log += "\[[time_stamp()]\]<font color='red'> [capitalize(attacklogverb)] [L.name] ([L.ckey]) with [name]</font>"
+	L.attack_log += "\[[time_stamp()]\]<font color='orange'> [capitalize(attacklogverb)] by thrown [src] by [istype(foundmob) ? foundmob.name : ""] ([istype(foundmob) ? foundmob.ckey : ""])</font>"
+	log_attack("<font color='red'>Flying [src.name], thrown by [istype(foundmob) ? foundmob.name : ""] ([istype(foundmob) ? foundmob.ckey : ""]) [attacklogverb] [L.name] ([L.ckey])</font>" )
 	L.assaulted_by(foundmob)
 
 /obj/item/weapon/melee/baton/emp_act(severity)