Endermage Rcorp Updates: Auto Shutters [DONE] (#2550)

* Button * Button Fix? * fixes * Updating Maps with Buttons * Identation * Fix * Adding Buttons/Removing Grenades * Update ModularTegustation/tegu_items/rcorp/button.dm Co-authored-by: Gboster-0 <[email protected]> * Small Error * Acounting for Better Memories * Adding warnings --------- Co-authored-by: Anton Zenkov <[email protected]> Co-authored-by: Gboster-0 <[email protected]>
vlggms · Jan 18, 2025 · 37fec10 · 37fec10
1 parent 8a1fb60
commit 37fec10
Show file tree

Hide file tree

Showing 19 changed files with 493 additions and 532 deletions.
diff --git a/ModularTegustation/tegu_items/rcorp/button.dm b/ModularTegustation/tegu_items/rcorp/button.dm
@@ -0,0 +1,37 @@
+/obj/machinery/button/door/indestructible/rcorp
+	name = "rcorp button"
+	id = "inside"
+
+/obj/machinery/button/door/indestructible/rcorp/setup_device()
+	if(!device)
+		var/obj/item/assembly/control/rcorp/A = new(src)
+		device = A
+	..()
+
+/obj/machinery/button/door/indestructible/rcorp/Destroy()
+	qdel(device)
+	return ..()
+
+/obj/item/assembly/control/rcorp
+	name = "rcorp door controller"
+
+/obj/item/assembly/control/rcorp/activate()
+	if(cooldown)
+		return
+	// check abnos
+	var/count = 0
+	var/mob/living/simple_animal/hostile/better_memories_minion/B = locate()
+	var/mob/living/carbon/human/species/pinocchio/P = locate()
+	if (P)
+		count++
+	if (B)
+		count++
+	for(var/mob/living/simple_animal/hostile/abnormality/A in GLOB.abnormality_mob_list)
+		if (A.rcorp_team == "easy")
+			count++
+		if (count > 2)
+			break
+	if (count > 2)
+		to_chat(usr, "<span class='notice'>There are still enemies around!</span>")
+		return
+	..()
diff --git a/ModularTegustation/tegu_items/rcorp/landmarks.dm b/ModularTegustation/tegu_items/rcorp/landmarks.dm
@@ -85,10 +85,10 @@ GLOBAL_LIST_INIT(raidboss, list(/mob/living/simple_animal/hostile/distortion/shr
 /obj/effect/landmark/abnospawn/easycombat/Initialize()
 	..()
 	var/spawning = pick_n_take(GLOB.easycombat)
-	new spawning(get_turf(src))
+	var/mob/living/simple_animal/hostile/abnormality/A = new spawning(get_turf(src))
+	A.rcorp_team = "easy"
 	return INITIALIZE_HINT_QDEL
 
-
 /obj/effect/landmark/abnospawn/easysupport
 	name = "easy support abno spawner"
 	desc = "It spawns an abno. Notify a coder. Thanks!"
@@ -98,10 +98,10 @@ GLOBAL_LIST_INIT(raidboss, list(/mob/living/simple_animal/hostile/distortion/shr
 /obj/effect/landmark/abnospawn/easysupport/Initialize()
 	..()
 	var/spawning = pick_n_take(GLOB.easysupport)
-	new spawning(get_turf(src))
+	var/mob/living/simple_animal/hostile/abnormality/A = new spawning(get_turf(src))
+	A.rcorp_team = "easy"
 	return INITIALIZE_HINT_QDEL
 
-
 /obj/effect/landmark/abnospawn/easytank
 	name = "easy tank abno spawner"
 	desc = "It spawns an abno. Notify a coder. Thanks!"
@@ -111,7 +111,8 @@ GLOBAL_LIST_INIT(raidboss, list(/mob/living/simple_animal/hostile/distortion/shr
 /obj/effect/landmark/abnospawn/easytank/Initialize()
 	..()
 	var/spawning = pick_n_take(GLOB.easytank)
-	new spawning(get_turf(src))
+	var/mob/living/simple_animal/hostile/abnormality/A = new spawning(get_turf(src))
+	A.rcorp_team = "easy"
 	return INITIALIZE_HINT_QDEL
 
 /obj/effect/landmark/abnospawn/hardcombat

diff --git a/_maps/RandomRooms/rcorp/facility/beaches.dmm b/_maps/RandomRooms/rcorp/facility/beaches.dmm
@@ -205,9 +205,7 @@
 /turf/open/floor/plasteel,
 /area/city/outskirts)
 "Ml" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -256,9 +254,7 @@
 /turf/open/floor/plating/ashplanet/rocky,
 /area/city/outskirts)
 "Wn" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/beaches2.dmm b/_maps/RandomRooms/rcorp/facility/beaches2.dmm
@@ -121,9 +121,7 @@
 /turf/open/floor/plating/ashplanet/rocky,
 /area/city/outskirts)
 "xK" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -249,9 +247,7 @@
 /turf/open/water,
 /area/city/outskirts)
 "Sw" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/city.dmm b/_maps/RandomRooms/rcorp/facility/city.dmm
@@ -656,9 +656,7 @@
 /turf/open/floor/wood,
 /area/city/outskirts)
 "ik" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/city2.dmm b/_maps/RandomRooms/rcorp/facility/city2.dmm
@@ -3291,9 +3291,7 @@
 /turf/open/floor/plasteel,
 /area/city/outskirts)
 "OL" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -3691,9 +3689,7 @@
 /turf/open/floor/wood,
 /area/city/outskirts)
 "Te" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/maze.dmm b/_maps/RandomRooms/rcorp/facility/maze.dmm
@@ -250,9 +250,7 @@
 	},
 /area/city/outskirts)
 "HH" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -311,9 +309,7 @@
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "Oo" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/maze2.dmm b/_maps/RandomRooms/rcorp/facility/maze2.dmm
@@ -70,9 +70,7 @@
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "hp" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -99,9 +97,7 @@
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "mW" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/nest.dmm b/_maps/RandomRooms/rcorp/facility/nest.dmm
@@ -928,9 +928,7 @@
 /turf/open/floor/plating,
 /area/city/outskirts)
 "rQ" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -2054,9 +2052,7 @@
 /turf/open/floor/wood,
 /area/city/outskirts)
 "NX" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/offices.dmm b/_maps/RandomRooms/rcorp/facility/offices.dmm
@@ -47,9 +47,7 @@
 /turf/open/floor/plasteel,
 /area/city/outskirts)
 "eS" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -72,9 +70,7 @@
 /turf/open/floor/facility/dark,
 /area/city/outskirts)
 "iB" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
 "iH" = (

diff --git a/_maps/RandomRooms/rcorp/facility/raidboss.dmm b/_maps/RandomRooms/rcorp/facility/raidboss.dmm
@@ -55,6 +55,10 @@
 /obj/effect/landmark/abnospawn/rhinobuster,
 /turf/open/floor/facility,
 /area/city/outskirts)
+"Go" = (
+/obj/machinery/button/door/indestructible/rcorp,
+/turf/closed/indestructible/syndicate,
+/area/city/outskirts)
 "HD" = (
 /turf/open/floor/facility,
 /area/city/outskirts)
@@ -67,9 +71,7 @@
 /turf/open/floor/facility,
 /area/city/outskirts)
 "VG" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -123,7 +125,7 @@ aN
 aN
 aN
 aN
-Fl
+Go
 Fl
 pz
 pz

diff --git a/_maps/RandomRooms/rcorp/facility/skeld.dmm b/_maps/RandomRooms/rcorp/facility/skeld.dmm
@@ -1650,9 +1650,7 @@
 /turf/open/floor/carpet/royalblack,
 /area/city/outskirts)
 "Ml" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)

diff --git a/_maps/RandomRooms/rcorp/facility/standard.dmm b/_maps/RandomRooms/rcorp/facility/standard.dmm
@@ -5,9 +5,7 @@
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "aQ" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move/disappearing,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -72,9 +70,7 @@
 /turf/open/floor/carpet/orange,
 /area/city/outskirts)
 "ci" = (
-/obj/machinery/button/door/indestructible{
-	id = "inside"
-	},
+/obj/machinery/button/door/indestructible/rcorp,
 /obj/effect/landmark/nobasic_incorp_move,
 /turf/closed/indestructible/syndicate,
 /area/city/outskirts)
@@ -1125,7 +1121,6 @@
 	dir = 10
 	},
 /obj/structure/rack,
-/obj/item/gun/ego_gun/clerk,
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "vS" = (
@@ -1899,7 +1894,6 @@
 	dir = 9
 	},
 /obj/structure/rack,
-/obj/item/gun/ego_gun/clerk,
 /turf/open/floor/plasteel/dark,
 /area/city/outskirts)
 "Jl" = (