Merge remote-tracking branch 'upstream/master' into eoehoma

shiptest-ss13 · Sep 24, 2023 · 9d28b1a · 9d28b1a
2 parents b96ca4c + 2e9559d
commit 9d28b1a
Show file tree

Hide file tree

Showing 38 changed files with 553 additions and 360 deletions.
diff --git a/_maps/deprecated/Ruins/forgottenship.dmm b/_maps/deprecated/Ruins/forgottenship.dmm
@@ -420,7 +420,7 @@
 /obj/structure/closet/crate/secure/gear{
 	req_one_access_txt = "150"
 	},
-/obj/item/clothing/suit/space/hardsuit/cybersun,
+,
 /turf/open/floor/pod/dark,
 /area/ruin/space/has_grav/powered/syndicate_forgotten_vault)
 "bB" = (