Merge pull request #359 from MilkForever/hardsuits-and-modsuits

Makes engineering hardsuits obtainable, reverts new hardsuit sprites
Monkestation · Sep 18, 2023 · 2df71c2 · 2df71c2
2 parents a5eff92 + 520b0da
commit 2df71c2
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 2 deletions.
diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm
@@ -45433,7 +45433,6 @@
 /obj/structure/rack,
 /obj/item/mod/module/plasma_stabilizer,
 /obj/item/mod/module/thermal_regulator,
-/obj/item/mod/control/pre_equipped/engineering,
 /turf/open/floor/iron,
 /area/station/engineering/main)
 "nwv" = (

diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm
@@ -81,12 +81,13 @@
 /obj/machinery/suit_storage_unit/engine
 	mask_type = /obj/item/clothing/mask/breath
 	storage_type = /obj/item/clothing/shoes/magboots
+	suit_type = /obj/item/clothing/suit/space/hardsuit/engine //Monkestation Edit
 	mod_type = /obj/item/mod/control/pre_equipped/engineering
 
 /obj/machinery/suit_storage_unit/atmos
 	mask_type = /obj/item/clothing/mask/gas/atmos
 	storage_type = /obj/item/watertank/atmos
-	suit_type = /obj/item/clothing/suit/space/hardsuit/atmos
+	suit_type = /obj/item/clothing/suit/space/hardsuit/atmos //Monkestation Edit
 	mod_type = /obj/item/mod/control/pre_equipped/atmospheric
 
 /obj/machinery/suit_storage_unit/ce

diff --git a/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi b/monkestation/icons/mob/clothing/hardsuit/hardsuit_body.dmi
diff --git a/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi b/monkestation/icons/mob/clothing/hardsuit/hardsuit_helm.dmi
diff --git a/monkestation/icons/obj/clothing/hardsuits/helmet.dmi b/monkestation/icons/obj/clothing/hardsuits/helmet.dmi
diff --git a/monkestation/icons/obj/clothing/hardsuits/suit.dmi b/monkestation/icons/obj/clothing/hardsuits/suit.dmi