changes

cmss13-devs · Jul 19, 2023 · f9fb862 · f9fb862
1 parent 4abcd15
commit f9fb862
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 84 deletions.
diff --git a/code/__DEFINES/dcs/signals/signals_global.dm b/code/__DEFINES/dcs/signals/signals_global.dm
@@ -56,3 +56,6 @@
 
 /// From /datum/game_mode/colonialmarines/proc/check_ground_humans()
 #define COMSIG_GLOB_GROUNDSIDE_FORSAKEN_HANDLING "!groundside_forsaken_handling"
+
+/// From
+#define COMSIG_GLOB_YAUTJA_ARMORY_OPENED "yautja_armory_opened"
diff --git a/code/game/machinery/doors/shutters.dm b/code/game/machinery/doors/shutters.dm
@@ -87,6 +87,17 @@
 	. = ..()
 	relativewall_neighbours()
 
+/obj/structure/machinery/door/poddoor/shutters/almayer/yautja
+	name = "Armory Shutter"
+	id = "Yautja Armory"
+	needs_power = FALSE
+	unacidable = TRUE
+	indestructible = TRUE
+
+/obj/structure/machinery/door/poddoor/shutters/almayer/yautja/Initialize()
+	..()
+	RegisterSignal(SSdcs, COMSIG_GLOB_YAUTJA_ARMORY_OPENED, PROC_REF(open))
+
 /obj/structure/machinery/door/poddoor/shutters/almayer/containment
 	unacidable = TRUE
 

diff --git a/code/modules/mob/living/carbon/xenomorph/Embryo.dm b/code/modules/mob/living/carbon/xenomorph/Embryo.dm
@@ -182,9 +182,7 @@
 	if(isyautja(affected_mob) || (flags_embryo & FLAG_EMBRYO_PREDATOR))
 		new_xeno = new /mob/living/carbon/xenomorph/larva/predalien(affected_mob)
 		yautja_announcement(SPAN_YAUTJABOLDBIG("WARNING!\n\nAn abomination has been detected at [get_area_name(new_xeno)]. It is a stain upon our purity and is unfit for life. Exterminate it immediately.\n\nHeavy Armory unlocked."))
-		for(var/obj/structure/machinery/door/poddoor/shutters/almayer/D in machines)
-			if(D.id == "Yautja Armory")
-				D.open()
+		SEND_GLOBAL_SIGNAL(COMSIG_GLOB_YAUTJA_ARMORY_OPENED)
 	else
 		new_xeno = new(affected_mob)
 

diff --git a/maps/predship/huntership.dmm b/maps/predship/huntership.dmm
@@ -688,13 +688,7 @@
 	dir = 1;
 	name = "\improper Heavy Armory"
 	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	id = "Yautja Armory";
-	name = "\improper Armory Shutter";
-	needs_power = 0;
-	unacidable = 1;
-	indestructible = 1
-	},
+/obj/structure/machinery/door/poddoor/shutters/almayer/yautja,
 /turf/open/shuttle/predship,
 /area/yautja)
 "bE" = (
@@ -788,43 +782,6 @@
 	icon_state = "squareswood"
 	},
 /area/yautja)
-"bR" = (
-/obj/structure/surface/rack{
-	color = "#6b675e";
-	layer = 2.79;
-	pixel_x = -8
-	},
-/obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_y = -8;
-	pixel_x = -8
-	},
-/obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_x = -8
-	},
-/obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_y = 8;
-	pixel_x = -8
-	},
-/obj/item/stack/medical/advanced/bruise_pack/predator{
-	pixel_x = 13
-	},
-/obj/item/stack/medical/advanced/bruise_pack/predator{
-	pixel_x = 13
-	},
-/obj/item/stack/medical/advanced/bruise_pack/predator{
-	pixel_x = 13
-	},
-/obj/item/stack/medical/advanced/bruise_pack/predator{
-	pixel_x = 13
-	},
-/obj/item/stack/medical/advanced/bruise_pack/predator{
-	pixel_x = 13
-	},
-/turf/open/floor/strata{
-	color = "#5e5d5d";
-	icon_state = "multi_tiles"
-	},
-/area/yautja)
 "bS" = (
 /obj/structure/pipes/standard/simple/hidden{
 	dir = 9
@@ -1788,6 +1745,36 @@
 /obj/structure/closet/crate{
 	color = "#6b675e"
 	},
+/obj/item/stack/medical/advanced/bruise_pack/predator{
+	pixel_x = 6
+	},
+/obj/item/stack/medical/advanced/bruise_pack/predator{
+	pixel_x = 6
+	},
+/obj/item/stack/medical/advanced/bruise_pack/predator{
+	pixel_x = 6
+	},
+/obj/item/stack/medical/advanced/bruise_pack/predator{
+	pixel_x = 6
+	},
+/obj/item/stack/medical/advanced/bruise_pack/predator{
+	pixel_x = 6
+	},
+/obj/item/stack/medical/advanced/ointment/predator{
+	pixel_x = -6
+	},
+/obj/item/stack/medical/advanced/ointment/predator{
+	pixel_x = -6
+	},
+/obj/item/stack/medical/advanced/ointment/predator{
+	pixel_x = -6
+	},
+/obj/item/stack/medical/advanced/ointment/predator{
+	pixel_x = -6
+	},
+/obj/item/stack/medical/advanced/ointment/predator{
+	pixel_x = -6
+	},
 /turf/open/floor/strata{
 	color = "#5e5d5d";
 	icon_state = "multi_tiles"
@@ -2787,39 +2774,14 @@
 "If" = (
 /obj/structure/surface/rack{
 	color = "#6b675e";
-	layer = 2.79;
-	pixel_x = -16
-	},
-/obj/structure/surface/rack{
-	color = "#6b675e";
-	layer = 2.79;
-	pixel_x = 8
-	},
-/obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_y = -8;
-	pixel_x = 8
+	layer = 2.79
 	},
 /obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_x = 8
+	pixel_y = -8
 	},
+/obj/item/weapon/gun/energy/yautja/plasmapistol,
 /obj/item/weapon/gun/energy/yautja/plasmapistol{
-	pixel_y = 8;
-	pixel_x = 8
-	},
-/obj/item/stack/medical/advanced/ointment/predator{
-	pixel_x = -13
-	},
-/obj/item/stack/medical/advanced/ointment/predator{
-	pixel_x = -13
-	},
-/obj/item/stack/medical/advanced/ointment/predator{
-	pixel_x = -13
-	},
-/obj/item/stack/medical/advanced/ointment/predator{
-	pixel_x = -13
-	},
-/obj/item/stack/medical/advanced/ointment/predator{
-	pixel_x = -13
+	pixel_y = 8
 	},
 /turf/open/floor/strata{
 	color = "#5e5d5d";
@@ -3361,13 +3323,8 @@
 /obj/structure/machinery/door/airlock/yautja/secure{
 	name = "\improper Heavy Armory"
 	},
-/obj/structure/machinery/door/poddoor/shutters/almayer{
-	dir = 4;
-	id = "Yautja Armory";
-	name = "\improper Armory Shutter";
-	needs_power = 0;
-	unacidable = 1;
-	indestructible = 1
+/obj/structure/machinery/door/poddoor/shutters/almayer/yautja{
+	dir = 4
 	},
 /turf/open/floor/strata{
 	color = "#5e5d5d";
@@ -6919,7 +6876,7 @@ bj
 bj
 HD
 JH
-bR
+If
 bj
 bj
 bj