Merge pull request #564 from molnizz/cringe9

Fix ships after merge
CeladonSS13 · May 21, 2024 · 3ae3cad · 3ae3cad
2 parents c418fce + 9fb9432
commit 3ae3cad
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 17 deletions.
diff --git a/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/_mod_celadon/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -647,6 +647,7 @@
 /obj/structure/cable{
 	icon_state = "1-2"
 	},
+/obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/ruin/jungle/starport)
 "eO" = (
@@ -1869,7 +1870,6 @@
 /obj/machinery/power/terminal,
 /obj/structure/cable,
 /obj/item/radio/intercom/directional/east,
-/obj/machinery/light/small/directional/east,
 /turf/open/floor/plating,
 /area/ruin/jungle/starport)
 "nq" = (
@@ -5611,7 +5611,6 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7296,7 +7295,6 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)

diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_hyena.dmm
@@ -1696,8 +1696,8 @@
 	dir = 4;
 	pixel_x = -20
 	},
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/carpet/black,
 /area/ship/bridge)
 "Ck" = (

diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_gorlex_komodo.dmm
@@ -470,9 +470,9 @@
 /obj/machinery/camera/autoname{
 	dir = 1
 	},
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "fd" = (
@@ -1054,9 +1054,9 @@
 /obj/machinery/suit_storage_unit/inherit,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/power/apc/auto_name/directional/west,
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "ko" = (
@@ -3506,9 +3506,9 @@
 /obj/effect/turf_decal/techfloor,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/machinery/light/directional/south,
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg,
 /obj/item/tank/internals/oxygen,
 /obj/item/clothing/mask/gas/syndicate,
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security/armory)
 "If" = (

diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_kau_delta.dmm
@@ -129,9 +129,7 @@
 /obj/item/tank/jetpack/oxygen/security{
 	name = "Suspicious looking jetpack (oxygen)"
 	},
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg{
-	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
-	},
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "dg" = (

diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_krait.dmm
@@ -525,8 +525,6 @@
 	req_ship_access = 1
 	},
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
-/obj/item/clothing/head/ngrcap,
 /obj/item/clothing/under/syndicate/ngr,
 /obj/item/clothing/under/syndicate/sniper,
 /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
@@ -3129,9 +3127,7 @@
 /obj/item/tank/jetpack/oxygen/security{
 	name = "Suspicious looking jetpack (oxygen)"
 	},
-/obj/item/clothing/suit/space/hardsuit/syndi/sbg{
-	armor = list("melee" = 50, "bullet" = 50, "laser" = 30, "energy" = 40, "bomb" = 35, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
-	},
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/carpet/red_gold,
 /area/ship/bridge)
 "Az" = (

diff --git a/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/_mod_celadon/shuttles/syndicate/syndicate_twinkleshine.dmm
@@ -101,8 +101,6 @@
 	req_access = list(3,150)
 	},
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
-/obj/item/clothing/head/ngrcap,
 /obj/item/clothing/shoes/combat,
 /obj/item/megaphone/sec{
 	name = "syndicate megaphone"
@@ -526,6 +524,7 @@
 /obj/structure/window/reinforced{
 	dir = 1
 	},
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "db" = (
@@ -2369,6 +2368,7 @@
 	suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg;
 	name = "lieutenant's suit storage unit"
 	},
+/obj/item/clothing/suit/space/hardsuit/syndi/ngr,
 /turf/open/floor/mineral/plastitanium,
 /area/ship/security)
 "nw" = (