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_SECRET	"scientists_secret"
 #define METABUDDY		"metabuddy"
 #define SPIDERS			"spiders"
 #define WEED_EATER		"weed_eater"
@@ -461,6 +465,7 @@
 #define PLUMPHJUICE		"plumphjuice"
 #define PLUMPHWINE		"phwine"
 #define IRONROT			"ironrot"
+#define ZETAROT			"zetarot"
 #define GEOMETER		"geometer"
 #define EGG_YOLK		"egg_yolk"
 #define PANCAKE			"pancake"

__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/machinery/vending.dm

@@ -525,6 +525,7 @@ var/global/num_vending_terminals = 1
 			if(user.drop_item(W, src))
 				coin = W
 				to_chat(user, "<span class='notice'>You insert \a [W] into [src].</span>")
+				coin_act(W)
 				src.updateUsrDialog()
 		else
 			to_chat(user, "<SPAN CLASS='notice'>There's already \a [coin] in [src].</SPAN>")
@@ -1146,6 +1147,9 @@ var/global/num_vending_terminals = 1
 		update_icon()
 		src.updateUsrDialog()
 
+/obj/machinery/vending/proc/coin_act(obj/item/weapon/coin/C, mob/user)
+	return
+
 /obj/machinery/vending/proc/on_return_coin_detect(mob/user)
 	return 0
 
@@ -3890,6 +3894,11 @@ var/global/num_vending_terminals = 1
 	else
 		return pick(product_slogans)
 
+/obj/machinery/vending/zamsnax/coin_act(obj/item/weapon/coin/C, mob/user)
+	if(C.material == MAT_RETICULITE && !(/obj/item/weapon/reagent_containers/food/snacks/vreemdkoekje in premium))
+		premium[/obj/item/weapon/reagent_containers/food/snacks/vreemdkoekje] = 3
+		build_inventories()
+
 /obj/machinery/vending/lotto
 	name = "\improper Lotto Tickets"
 	desc = "Table-mounted vending machine which dispenses scratch-off lottery tickets. Winners can be cashed here."

code/game/mecha/combat/roswell.dm

@@ -0,0 +1,44 @@
+/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 = 200
+	deflect_chance = 15
+	damage_absorption = list("brute"=1,"fire"=0.9,"bullet"=0.5,"laser"=1,"energy"=0.8,"bomb"=1.2)
+	max_temperature = 25000
+	infra_luminosity = 6
+	wreckage = /obj/effect/decal/mecha_wreckage/roswell
+	internal_damage_threshold = 35
+	max_equip = 3
+	plane = ABOVE_HUMAN_PLANE
+	layer = VEHICLE_LAYER
+	drifts = FALSE
+
+/obj/mecha/combat/roswell/mechturn(direction)
+	dir = direction
+	return 1
+
+/obj/mecha/combat/roswell/mechstep(direction)
+	var/result = step(src,direction)
+	if(result)
+		playsound(loc, 'sound/mecha/ufo.ogg', 100)
+	return result
+
+/obj/mecha/combat/roswell/mechsteprand()
+	var/result = step_rand(src)
+	if(result)
+		playsound(loc, 'sound/mecha/ufo.ogg', 100)
+	return result
+
+/obj/mecha/combat/roswell/preloaded/New()
+	..()
+	new /obj/item/mecha_parts/mecha_equipment/tool/ayy/abductor(src)
+	new /obj/item/mecha_parts/mecha_equipment/tool/ayy/prober(src)
+
+/obj/effect/decal/mecha_wreckage/roswell
+    name = "downed weather balloon"
+    desc = "Seems legit"
+    icon_state = "roswell-broken"