map stuff

GainStation13/code/clothing/under.dm

@@ -21,3 +21,17 @@
 	mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
 	icon_state = "rsecuritypink"
 	item_state = "r_suit"
+
+
+/obj/item/clothing/under/shorts/yellowwshort
+	name = "Yellow workout short"
+	icon_state = "yellowwshort"
+	icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
+
+/obj/item/clothing/under/shorts/pinkwshort
+	name = "Pink workout short"
+	icon_state = "pinkwshort"
+	icon = 'GainStation13/icons/obj/clothing/uniforms.dmi'
+	mob_overlay_icon = 'GainStation13/icons/mob/uniform.dmi'
+	item_color = "pinkwshort"

GainStation13/code/datums/crates.dm

@@ -0,0 +1,17 @@
+//gs13 - solar defence crate
+/obj/structure/closet/crate/solarpanel_defence
+	name = "solar system defence crate"
+	icon_state = "engi_e_crate"
+
+/obj/structure/closet/crate/solarpanel_defence/PopulateContents()
+	..()
+	new /obj/machinery/satellite/meteor_shield(src)
+	new /obj/machinery/satellite/meteor_shield(src)
+	new /obj/machinery/satellite/meteor_shield(src)
+	new /obj/machinery/satellite/meteor_shield(src)
+	new /obj/item/paper/guides/jobs/engi/solar_defence(src)
+	new /obj/item/circuitboard/computer/sat_control(src)
+
+/obj/item/paper/guides/jobs/engi/solar_defence
+	name = "Info on Satellite Defence"
+	info = "<h1>Welcome</h1><p>With this crate, you will be able to protect the station's solar arrays from constant barrages of space sand. The set-up is simple. Drag around all the satellites in front of solar panel arrays, preferably in direction open to space (the best spot is near the solar tracker and outside of the grilles), as that is where the space sand will come from. It's advised to set down just 1 satellite for each solar array. Once you set the satellite down, you can activate it by flicking on the switch. The crate also provides you with an OPTIONAL computer board to keep track of your defence satellites. Voila!</p>"

GainStation13/code/game/plushes.dm

@@ -66,3 +66,11 @@
 
 /obj/item/toy/plush/gs13/mammal/fox
 	icon_state = "fox"
+
+
+/obj/item/toy/plush/mothplushie/moffplush
+	name = "moth plushie"
+	desc = "A plushie depicting an adorable mothperson. It's a huggable bug!"
+	icon_state = "moffplush"
+	item_state = "moffplush"
+	squeak_override = list('modular_citadel/sound/voice/scream_moth.ogg' = 1)

GainStation13/code/modules/gym/gym.dm

@@ -83,7 +83,7 @@
 
 /obj/item/circuitboard/machine/treadmill
 	name = "Treadmill (Machine Board)"
-	build_path = /obj/machinery/autolathe
+	build_path = /obj/item/conveyor_construct/treadmill
 	req_components = list(/obj/item/stock_parts/manipulator = 1)
 
 /datum/design/treadmill
@@ -91,7 +91,7 @@
 	id = "treadmill"
 	build_type = AUTOLATHE | PROTOLATHE
 	materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
-	build_path = /obj/item/circuitboard/machine/treadmill
+	build_path = /obj/machinery/treadmill
 	category = list("inital", "Construction")
 	departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING