readds rd/sar rigs, adds a rig to the CMO, repaths modules/rigsuits t…

…o modules/hardsuits in preparation for the rig update (#5686) Co-authored-by: silicons <no@you.cat>
Citadel-Station-13 · Jul 13, 2023 · dd05fef · dd05fef
1 parent 519121f
commit dd05fef
Show file tree

Hide file tree

Showing 34 changed files with 31 additions and 28 deletions.
diff --git a/citadel.dme b/citadel.dme
@@ -2647,6 +2647,34 @@
 #include "code\modules\ghostroles\roles\hermit.dm"
 #include "code\modules\ghostroles\roles\pirate.dm"
 #include "code\modules\ghosttrap\trap.dm"
+#include "code\modules\hardsuits\_rig.dm"
+#include "code\modules\hardsuits\activation.dm"
+#include "code\modules\hardsuits\rig_attackby.dm"
+#include "code\modules\hardsuits\rig_pieces.dm"
+#include "code\modules\hardsuits\rig_verbs.dm"
+#include "code\modules\hardsuits\rig_wiring.dm"
+#include "code\modules\hardsuits\modules\combat.dm"
+#include "code\modules\hardsuits\modules\combat_vr.dm"
+#include "code\modules\hardsuits\modules\computer.dm"
+#include "code\modules\hardsuits\modules\modules.dm"
+#include "code\modules\hardsuits\modules\ninja.dm"
+#include "code\modules\hardsuits\modules\utility.dm"
+#include "code\modules\hardsuits\modules\utility_vr.dm"
+#include "code\modules\hardsuits\modules\vision.dm"
+#include "code\modules\hardsuits\suits\combat.dm"
+#include "code\modules\hardsuits\suits\ert.dm"
+#include "code\modules\hardsuits\suits\light.dm"
+#include "code\modules\hardsuits\suits\merc.dm"
+#include "code\modules\hardsuits\suits\pmc.dm"
+#include "code\modules\hardsuits\suits\species\protean.dm"
+#include "code\modules\hardsuits\suits\species\unathi.dm"
+#include "code\modules\hardsuits\suits\species\vox.dm"
+#include "code\modules\hardsuits\suits\station\cargo.dm"
+#include "code\modules\hardsuits\suits\station\engineering.dm"
+#include "code\modules\hardsuits\suits\station\medical.dm"
+#include "code\modules\hardsuits\suits\station\misc.dm"
+#include "code\modules\hardsuits\suits\station\science.dm"
+#include "code\modules\hardsuits\suits\station\security.dm"
 #include "code\modules\holidays\_holiday.dm"
 #include "code\modules\holidays\christmas.dm"
 #include "code\modules\holidays\christmas_loadout.dm"
@@ -4265,34 +4293,6 @@
 #include "code\modules\resleeving\machines.dm"
 #include "code\modules\resleeving\mirror.dm"
 #include "code\modules\resleeving\sleevecard.dm"
-#include "code\modules\rigsuits\_rig.dm"
-#include "code\modules\rigsuits\activation.dm"
-#include "code\modules\rigsuits\rig_attackby.dm"
-#include "code\modules\rigsuits\rig_pieces.dm"
-#include "code\modules\rigsuits\rig_verbs.dm"
-#include "code\modules\rigsuits\rig_wiring.dm"
-#include "code\modules\rigsuits\modules\combat.dm"
-#include "code\modules\rigsuits\modules\combat_vr.dm"
-#include "code\modules\rigsuits\modules\computer.dm"
-#include "code\modules\rigsuits\modules\modules.dm"
-#include "code\modules\rigsuits\modules\ninja.dm"
-#include "code\modules\rigsuits\modules\utility.dm"
-#include "code\modules\rigsuits\modules\utility_vr.dm"
-#include "code\modules\rigsuits\modules\vision.dm"
-#include "code\modules\rigsuits\suits\combat.dm"
-#include "code\modules\rigsuits\suits\ert.dm"
-#include "code\modules\rigsuits\suits\light.dm"
-#include "code\modules\rigsuits\suits\merc.dm"
-#include "code\modules\rigsuits\suits\pmc.dm"
-#include "code\modules\rigsuits\suits\species\protean.dm"
-#include "code\modules\rigsuits\suits\species\unathi.dm"
-#include "code\modules\rigsuits\suits\species\vox.dm"
-#include "code\modules\rigsuits\suits\station\cargo.dm"
-#include "code\modules\rigsuits\suits\station\engineering.dm"
-#include "code\modules\rigsuits\suits\station\medical.dm"
-#include "code\modules\rigsuits\suits\station\misc.dm"
-#include "code\modules\rigsuits\suits\station\science.dm"
-#include "code\modules\rigsuits\suits\station\security.dm"
 #include "code\modules\rogueminer_vr\asteroid.dm"
 #include "code\modules\rogueminer_vr\controller.dm"
 #include "code\modules\rogueminer_vr\debug.dm"

diff --git a/code/modules/rigsuits/_rig.dm → code/modules/hardsuits/_rig.dm b/code/modules/rigsuits/_rig.dm → code/modules/hardsuits/_rig.dm
diff --git a/code/modules/rigsuits/activation.dm → code/modules/hardsuits/activation.dm b/code/modules/rigsuits/activation.dm → code/modules/hardsuits/activation.dm
diff --git a/code/modules/rigsuits/defense.dm → code/modules/hardsuits/defense.dm b/code/modules/rigsuits/defense.dm → code/modules/hardsuits/defense.dm
diff --git a/code/modules/rigsuits/modules/combat.dm → code/modules/hardsuits/modules/combat.dm b/code/modules/rigsuits/modules/combat.dm → code/modules/hardsuits/modules/combat.dm
diff --git a/code/modules/rigsuits/modules/combat_vr.dm → code/modules/hardsuits/modules/combat_vr.dm b/code/modules/rigsuits/modules/combat_vr.dm → code/modules/hardsuits/modules/combat_vr.dm
diff --git a/code/modules/rigsuits/modules/computer.dm → code/modules/hardsuits/modules/computer.dm b/code/modules/rigsuits/modules/computer.dm → code/modules/hardsuits/modules/computer.dm
diff --git a/code/modules/rigsuits/modules/modules.dm → code/modules/hardsuits/modules/modules.dm b/code/modules/rigsuits/modules/modules.dm → code/modules/hardsuits/modules/modules.dm
diff --git a/code/modules/rigsuits/modules/ninja.dm → code/modules/hardsuits/modules/ninja.dm b/code/modules/rigsuits/modules/ninja.dm → code/modules/hardsuits/modules/ninja.dm
diff --git a/code/modules/rigsuits/modules/utility.dm → code/modules/hardsuits/modules/utility.dm b/code/modules/rigsuits/modules/utility.dm → code/modules/hardsuits/modules/utility.dm
diff --git a/code/modules/rigsuits/modules/utility_vr.dm → code/modules/hardsuits/modules/utility_vr.dm b/code/modules/rigsuits/modules/utility_vr.dm → code/modules/hardsuits/modules/utility_vr.dm
diff --git a/code/modules/rigsuits/modules/vision.dm → code/modules/hardsuits/modules/vision.dm b/code/modules/rigsuits/modules/vision.dm → code/modules/hardsuits/modules/vision.dm
diff --git a/code/modules/rigsuits/pieces.dm → code/modules/hardsuits/pieces.dm b/code/modules/rigsuits/pieces.dm → code/modules/hardsuits/pieces.dm
diff --git a/code/modules/rigsuits/rig.dm → code/modules/hardsuits/rig.dm b/code/modules/rigsuits/rig.dm → code/modules/hardsuits/rig.dm
diff --git a/code/modules/rigsuits/rig_attackby.dm → code/modules/hardsuits/rig_attackby.dm b/code/modules/rigsuits/rig_attackby.dm → code/modules/hardsuits/rig_attackby.dm
diff --git a/code/modules/rigsuits/rig_pieces.dm → code/modules/hardsuits/rig_pieces.dm b/code/modules/rigsuits/rig_pieces.dm → code/modules/hardsuits/rig_pieces.dm
diff --git a/code/modules/rigsuits/rig_verbs.dm → code/modules/hardsuits/rig_verbs.dm b/code/modules/rigsuits/rig_verbs.dm → code/modules/hardsuits/rig_verbs.dm
diff --git a/code/modules/rigsuits/rig_wiring.dm → code/modules/hardsuits/rig_wiring.dm b/code/modules/rigsuits/rig_wiring.dm → code/modules/hardsuits/rig_wiring.dm
diff --git a/code/modules/rigsuits/suits/combat.dm → code/modules/hardsuits/suits/combat.dm b/code/modules/rigsuits/suits/combat.dm → code/modules/hardsuits/suits/combat.dm
diff --git a/code/modules/rigsuits/suits/ert.dm → code/modules/hardsuits/suits/ert.dm b/code/modules/rigsuits/suits/ert.dm → code/modules/hardsuits/suits/ert.dm
diff --git a/code/modules/rigsuits/suits/light.dm → code/modules/hardsuits/suits/light.dm b/code/modules/rigsuits/suits/light.dm → code/modules/hardsuits/suits/light.dm
diff --git a/code/modules/rigsuits/suits/merc.dm → code/modules/hardsuits/suits/merc.dm b/code/modules/rigsuits/suits/merc.dm → code/modules/hardsuits/suits/merc.dm
diff --git a/code/modules/rigsuits/suits/pmc.dm → code/modules/hardsuits/suits/pmc.dm b/code/modules/rigsuits/suits/pmc.dm → code/modules/hardsuits/suits/pmc.dm
diff --git a/...modules/rigsuits/suits/species/protean.dm → ...odules/hardsuits/suits/species/protean.dm b/...modules/rigsuits/suits/species/protean.dm → ...odules/hardsuits/suits/species/protean.dm
diff --git a/.../modules/rigsuits/suits/species/unathi.dm → ...modules/hardsuits/suits/species/unathi.dm b/.../modules/rigsuits/suits/species/unathi.dm → ...modules/hardsuits/suits/species/unathi.dm
diff --git a/code/modules/rigsuits/suits/species/vox.dm → code/modules/hardsuits/suits/species/vox.dm b/code/modules/rigsuits/suits/species/vox.dm → code/modules/hardsuits/suits/species/vox.dm
diff --git a/code/modules/rigsuits/suits/station/cargo.dm → .../modules/hardsuits/suits/station/cargo.dm b/code/modules/rigsuits/suits/station/cargo.dm → .../modules/hardsuits/suits/station/cargo.dm
diff --git a/...les/rigsuits/suits/station/engineering.dm → ...es/hardsuits/suits/station/engineering.dm b/...les/rigsuits/suits/station/engineering.dm → ...es/hardsuits/suits/station/engineering.dm
diff --git a/...modules/rigsuits/suits/station/medical.dm → ...odules/hardsuits/suits/station/medical.dm b/...modules/rigsuits/suits/station/medical.dm → ...odules/hardsuits/suits/station/medical.dm
diff --git a/code/modules/rigsuits/suits/station/misc.dm → code/modules/hardsuits/suits/station/misc.dm b/code/modules/rigsuits/suits/station/misc.dm → code/modules/hardsuits/suits/station/misc.dm
diff --git a/...modules/rigsuits/suits/station/science.dm → ...odules/hardsuits/suits/station/science.dm b/...modules/rigsuits/suits/station/science.dm → ...odules/hardsuits/suits/station/science.dm
diff --git a/...odules/rigsuits/suits/station/security.dm → ...dules/hardsuits/suits/station/security.dm b/...odules/rigsuits/suits/station/security.dm → ...dules/hardsuits/suits/station/security.dm
diff --git a/maps/rift/levels/rift-04-surface1.dmm b/maps/rift/levels/rift-04-surface1.dmm
@@ -10749,6 +10749,7 @@
 /obj/effect/floor_decal/corner/paleblue{
 	dir = 10
 	},
+/obj/item/hardsuit/medical/equipped,
 /turf/simulated/floor/tiled/white,
 /area/medical/medbay_emt_bay)
 "gZK" = (
@@ -27737,6 +27738,7 @@
 /obj/item/clothing/mask/breath/anesthetic,
 /obj/item/clothing/gloves/sterile/nitrile,
 /obj/item/clothing/mask/muzzle,
+/obj/item/hardsuit/medical/equipped,
 /turf/simulated/floor/wood,
 /area/crew_quarters/heads/cmo)
 "reE" = (

diff --git a/maps/rift/levels/rift-05-surface2.dmm b/maps/rift/levels/rift-05-surface2.dmm
@@ -4853,6 +4853,7 @@
 /obj/machinery/door/window/eastleft{
 	name = "Gear Storage"
 	},
+/obj/item/hardsuit/hazmat/equipped,
 /turf/simulated/floor/tiled/steel,
 /area/crew_quarters/heads/hor)
 "ddZ" = (