From 611926d74d163897f2e80ea3d22a9867b8d20190 Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Sun, 10 Nov 2024 14:17:54 -0500 Subject: [PATCH 1/5] Button --- ModularTegustation/tegu_items/rcorp/button.dm | 31 +++++++++++++++++++ .../game/gamemodes/management/event/combat.dm | 9 ++++++ lobotomy-corp13.dme | 1 + 3 files changed, 41 insertions(+) create mode 100644 ModularTegustation/tegu_items/rcorp/button.dm diff --git a/ModularTegustation/tegu_items/rcorp/button.dm b/ModularTegustation/tegu_items/rcorp/button.dm new file mode 100644 index 000000000000..1cbf08632d06 --- /dev/null +++ b/ModularTegustation/tegu_items/rcorp/button.dm @@ -0,0 +1,31 @@ +/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/item/assembly/control/rcorp + name = "rcorp door controller" + +/obj/item/assembly/control/activate() + if(cooldown) + return + // check abnos + var/count = 0 + var/mob/living/carbon/human/species/pinocchio/P = locate() + if (P) + count++ + for(var/mob/living/simple_animal/hostile/abnormality/A in GLOB.abnormality_mob_list) + if(A.type in easysupport || A.type in easycombat || A.type in easytank) + count++ + if (count > 2) + break + if (count > 2) + to_chat(usr, "There are still enemies around!") + return + ..() diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index c9bfd20fba54..e48d69ecd811 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -52,6 +52,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, PROC_REF(drawround)), 40 MINUTES) to_chat(world, span_userdanger("Round will end in a draw after 40 minutes.")) addtimer(CALLBACK(src, PROC_REF(rcorp_announce)), 3 MINUTES) + addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 10 MINUTES) //Limbus Labs if("limbus_labs") @@ -138,6 +139,14 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u announcement_type = "Intelligence has located a dangerous specimen moving towards your location. Prevent it from escaping at all costs." minor_announce("[announcement_type]" , "R-Corp Intelligence Office") +/datum/game_mode/combat/proc/rcorp_opendoor() + minor_announce("Section 1 doors are open") + for(var/obj/machinery/door/poddoor/M in GLOB.machines) + if (M.id == "inside") + M.open() + for(var/obj/machinery/button/door/indestructible/rcorp/M in GLOB.machines) + qdel(M) + /datum/game_mode/combat/proc/StartPayload() if(!GLOB.rcorp_payload) CRASH("No payload somehow") diff --git a/lobotomy-corp13.dme b/lobotomy-corp13.dme index 23250ba1422f..f101cea4e369 100644 --- a/lobotomy-corp13.dme +++ b/lobotomy-corp13.dme @@ -4149,6 +4149,7 @@ #include "ModularTegustation\tegu_items\limbus_labs\spawners.dm" #include "ModularTegustation\tegu_items\rcorp\!abno_overwrites.dm" #include "ModularTegustation\tegu_items\rcorp\basecode.dm" +#include "ModularTegustation\tegu_items\rcorp\button.dm" #include "ModularTegustation\tegu_items\rcorp\gadgets.dm" #include "ModularTegustation\tegu_items\rcorp\itemspawner.dm" #include "ModularTegustation\tegu_items\rcorp\landmarks.dm" From 74d0faa8d670b458afc651e765af3f406ae3f57a Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Mon, 11 Nov 2024 11:15:51 -0500 Subject: [PATCH 2/5] Button Fix? --- ModularTegustation/tegu_items/rcorp/button.dm | 2 +- code/game/gamemodes/management/event/combat.dm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ModularTegustation/tegu_items/rcorp/button.dm b/ModularTegustation/tegu_items/rcorp/button.dm index 1cbf08632d06..b5b513fedf11 100644 --- a/ModularTegustation/tegu_items/rcorp/button.dm +++ b/ModularTegustation/tegu_items/rcorp/button.dm @@ -21,7 +21,7 @@ if (P) count++ for(var/mob/living/simple_animal/hostile/abnormality/A in GLOB.abnormality_mob_list) - if(A.type in easysupport || A.type in easycombat || A.type in easytank) + if((A.type in (GLOB.easysupport)) || (A.type in (GLOB.easycombat)) || (A.type in (GLOB.easytank))) count++ if (count > 2) break diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index e48d69ecd811..cc94ccb67a4c 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, PROC_REF(drawround)), 40 MINUTES) to_chat(world, span_userdanger("Round will end in a draw after 40 minutes.")) addtimer(CALLBACK(src, PROC_REF(rcorp_announce)), 3 MINUTES) - addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 10 MINUTES) + addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 1 MINUTES) //Limbus Labs if("limbus_labs") @@ -140,7 +140,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u minor_announce("[announcement_type]" , "R-Corp Intelligence Office") /datum/game_mode/combat/proc/rcorp_opendoor() - minor_announce("Section 1 doors are open") + minor_announce("Facility doors are locked open." , "R-Corp Intelligence Office") for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == "inside") M.open() From 88e5f80645aa2465bfcf748de6bb3fa518a997dd Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Mon, 11 Nov 2024 12:28:07 -0500 Subject: [PATCH 3/5] fixes --- ModularTegustation/tegu_items/rcorp/button.dm | 5 ++++- ModularTegustation/tegu_items/rcorp/landmarks.dm | 11 ++++++----- code/game/gamemodes/management/event/combat.dm | 13 +++++++++---- .../simple_animal/abnormality/_abnormality.dm | 3 +++ 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/ModularTegustation/tegu_items/rcorp/button.dm b/ModularTegustation/tegu_items/rcorp/button.dm index b5b513fedf11..db66677a4d97 100644 --- a/ModularTegustation/tegu_items/rcorp/button.dm +++ b/ModularTegustation/tegu_items/rcorp/button.dm @@ -8,6 +8,9 @@ device = A ..() +/obj/machinery/button/door/indestructible/rcorp/Destroy() + qdel(device) + . = ..() /obj/item/assembly/control/rcorp name = "rcorp door controller" @@ -21,7 +24,7 @@ if (P) count++ for(var/mob/living/simple_animal/hostile/abnormality/A in GLOB.abnormality_mob_list) - if((A.type in (GLOB.easysupport)) || (A.type in (GLOB.easycombat)) || (A.type in (GLOB.easytank))) + if (A.rcorp_team == "easy") count++ if (count > 2) break diff --git a/ModularTegustation/tegu_items/rcorp/landmarks.dm b/ModularTegustation/tegu_items/rcorp/landmarks.dm index fa6e1f79e670..d7dc7139d9dc 100644 --- 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/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index cc94ccb67a4c..93d76f8ddfe5 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, PROC_REF(drawround)), 40 MINUTES) to_chat(world, span_userdanger("Round will end in a draw after 40 minutes.")) addtimer(CALLBACK(src, PROC_REF(rcorp_announce)), 3 MINUTES) - addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 1 MINUTES) + addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 30 SECONDS) //Limbus Labs if("limbus_labs") @@ -140,12 +140,17 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u minor_announce("[announcement_type]" , "R-Corp Intelligence Office") /datum/game_mode/combat/proc/rcorp_opendoor() + for(var/obj/machinery/button/door/indestructible/rcorp/M in GLOB.machines) + qdel(M) minor_announce("Facility doors are locked open." , "R-Corp Intelligence Office") for(var/obj/machinery/door/poddoor/M in GLOB.machines) if (M.id == "inside") - M.open() - for(var/obj/machinery/button/door/indestructible/rcorp/M in GLOB.machines) - qdel(M) + addtimer(CALLBACK(src, PROC_REF(OpenDoor), M), 0 MINUTES) + +/datum/game_mode/combat/proc/OpenDoor(door) + var/obj/machinery/door/poddoor/D = door + D.open() + /datum/game_mode/combat/proc/StartPayload() if(!GLOB.rcorp_payload) diff --git a/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm b/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm index 98dc5ac09b60..539e21d4068f 100644 --- a/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm +++ b/code/modules/mob/living/simple_animal/abnormality/_abnormality.dm @@ -129,6 +129,9 @@ var/observation_success_message = "Final Observation Success!" var/observation_fail_message = "Final Observation Failed!" + // rcorp stuff + var/rcorp_team + /mob/living/simple_animal/hostile/abnormality/Initialize(mapload) SHOULD_CALL_PARENT(TRUE) . = ..() From b466212ebc9cb7c934c3fe28ccaa7a75a7ae20aa Mon Sep 17 00:00:00 2001 From: Anton Zenkov Date: Mon, 11 Nov 2024 12:28:16 -0500 Subject: [PATCH 4/5] time fix --- code/game/gamemodes/management/event/combat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/management/event/combat.dm b/code/game/gamemodes/management/event/combat.dm index 93d76f8ddfe5..cdcc6e1db804 100644 --- a/code/game/gamemodes/management/event/combat.dm +++ b/code/game/gamemodes/management/event/combat.dm @@ -52,7 +52,7 @@ GLOBAL_VAR_INIT(wcorp_enemy_faction, "") //decides which faction WCorp will be u addtimer(CALLBACK(src, PROC_REF(drawround)), 40 MINUTES) to_chat(world, span_userdanger("Round will end in a draw after 40 minutes.")) addtimer(CALLBACK(src, PROC_REF(rcorp_announce)), 3 MINUTES) - addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 30 SECONDS) + addtimer(CALLBACK(src, PROC_REF(rcorp_opendoor)), 10 MINUTES) //Limbus Labs if("limbus_labs") From 8bcbd603cd99f4a5e5a5417442a555e077f7fb33 Mon Sep 17 00:00:00 2001 From: Endermage99 Date: Mon, 11 Nov 2024 12:34:27 -0500 Subject: [PATCH 5/5] Updating Maps with Buttons --- _maps/RandomRooms/rcorp/facility/beaches.dmm | 4 +- _maps/RandomRooms/rcorp/facility/beaches2.dmm | 4 +- _maps/RandomRooms/rcorp/facility/city.dmm | 4 +- _maps/RandomRooms/rcorp/facility/city2.dmm | 4 +- _maps/RandomRooms/rcorp/facility/maze.dmm | 4 +- _maps/RandomRooms/rcorp/facility/maze2.dmm | 4 +- _maps/RandomRooms/rcorp/facility/nest.dmm | 75 +++++++------------ _maps/RandomRooms/rcorp/facility/offices.dmm | 4 +- _maps/RandomRooms/rcorp/facility/raidboss.dmm | 4 +- _maps/RandomRooms/rcorp/facility/skeld.dmm | 4 +- _maps/RandomRooms/rcorp/facility/standard.dmm | 4 +- .../RandomRooms/rcorp/facility/standard2.dmm | 4 +- _maps/RandomRooms/rcorp/facility/xenos.dmm | 4 +- 13 files changed, 38 insertions(+), 85 deletions(-) diff --git a/_maps/RandomRooms/rcorp/facility/beaches.dmm b/_maps/RandomRooms/rcorp/facility/beaches.dmm index 7511e71b516c..ec9bf8850c77 100644 --- a/_maps/RandomRooms/rcorp/facility/beaches.dmm +++ b/_maps/RandomRooms/rcorp/facility/beaches.dmm @@ -185,9 +185,7 @@ /turf/open/floor/plasteel, /area/city/outskirts) "Ml" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Mq" = ( diff --git a/_maps/RandomRooms/rcorp/facility/beaches2.dmm b/_maps/RandomRooms/rcorp/facility/beaches2.dmm index 927b99784a97..6b2bd2f7a27f 100644 --- a/_maps/RandomRooms/rcorp/facility/beaches2.dmm +++ b/_maps/RandomRooms/rcorp/facility/beaches2.dmm @@ -110,9 +110,7 @@ /turf/open/floor/plating/ashplanet/rocky, /area/city/outskirts) "xK" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "xM" = ( diff --git a/_maps/RandomRooms/rcorp/facility/city.dmm b/_maps/RandomRooms/rcorp/facility/city.dmm index 0de0fd1a80ee..eda90e2cc2f2 100644 --- a/_maps/RandomRooms/rcorp/facility/city.dmm +++ b/_maps/RandomRooms/rcorp/facility/city.dmm @@ -640,9 +640,7 @@ /turf/open/floor/wood, /area/city/outskirts) "ik" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "ip" = ( diff --git a/_maps/RandomRooms/rcorp/facility/city2.dmm b/_maps/RandomRooms/rcorp/facility/city2.dmm index 54424618a963..938bad33f982 100644 --- a/_maps/RandomRooms/rcorp/facility/city2.dmm +++ b/_maps/RandomRooms/rcorp/facility/city2.dmm @@ -3661,9 +3661,7 @@ /turf/open/floor/wood, /area/city/outskirts) "Te" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Tp" = ( diff --git a/_maps/RandomRooms/rcorp/facility/maze.dmm b/_maps/RandomRooms/rcorp/facility/maze.dmm index e68a0f34f6be..0206dc964dc0 100644 --- a/_maps/RandomRooms/rcorp/facility/maze.dmm +++ b/_maps/RandomRooms/rcorp/facility/maze.dmm @@ -291,9 +291,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "Oo" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Op" = ( diff --git a/_maps/RandomRooms/rcorp/facility/maze2.dmm b/_maps/RandomRooms/rcorp/facility/maze2.dmm index da1562fc7f12..d7c1c83c8a78 100644 --- a/_maps/RandomRooms/rcorp/facility/maze2.dmm +++ b/_maps/RandomRooms/rcorp/facility/maze2.dmm @@ -88,9 +88,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "mW" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "nd" = ( diff --git a/_maps/RandomRooms/rcorp/facility/nest.dmm b/_maps/RandomRooms/rcorp/facility/nest.dmm index a8d77ebda95c..1b4c8d05e8f0 100644 --- a/_maps/RandomRooms/rcorp/facility/nest.dmm +++ b/_maps/RandomRooms/rcorp/facility/nest.dmm @@ -283,9 +283,7 @@ dir = 4; pixel_y = 10 }, -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/yellow/filled/line, /turf/open/floor/plating/ashplanet, /area/city/outskirts) "fe" = ( @@ -339,15 +337,6 @@ /obj/effect/landmark/abnospawn/hardcombat, /turf/open/floor/mineral/plastitanium, /area/city/outskirts) -"gJ" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, -/obj/effect/decal/cleanable/blood/footprints{ - dir = 4 - }, -/turf/open/floor/plating/ashplanet, -/area/city/outskirts) "gT" = ( /obj/structure/grille/broken, /obj/effect/decal/cleanable/glass, @@ -935,9 +924,7 @@ /turf/open/floor/plating, /area/city/outskirts) "rQ" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "rV" = ( @@ -1362,9 +1349,7 @@ /turf/open/floor/carpet/green, /area/city/outskirts) "zt" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/red/filled/line, /turf/open/floor/plasteel/dark, /area/city/outskirts) "zA" = ( @@ -1816,12 +1801,6 @@ }, /turf/open/floor/plasteel/dark, /area/city/outskirts) -"Jj" = ( -/obj/effect/turf_decal/trimline/yellow/filled/line{ - dir = 2 - }, -/turf/open/floor/plating/ashplanet, -/area/city/outskirts) "Jl" = ( /obj/effect/decal/cleanable/blood/gibs/body, /obj/effect/decal/cleanable/blood/tracks, @@ -2654,9 +2633,7 @@ /turf/open/floor/plasteel/dark, /area/city/outskirts) "YJ" = ( -/obj/effect/turf_decal/trimline/red/filled/line{ - dir = 2 - }, +/obj/effect/turf_decal/trimline/red/filled/line, /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/plasteel/dark, /area/city/outskirts) @@ -2956,7 +2933,7 @@ lo mI mI mI -Jj +Ts uh mI mI @@ -3119,7 +3096,7 @@ lx mI mI hD -Jj +Ts uh mI mI @@ -3282,7 +3259,7 @@ lx mI mI mI -Jj +Ts uh hD mI @@ -3445,7 +3422,7 @@ lx mI mI mI -Jj +Ts uh mI mI @@ -3608,7 +3585,7 @@ lx hD mI mI -Jj +Ts uh mI mI @@ -3771,7 +3748,7 @@ lx mI mI mI -Jj +Ts uh mI mI @@ -3934,7 +3911,7 @@ ZL mI mI mI -Jj +Ts uh mI mI @@ -4097,7 +4074,7 @@ lx mI mI hD -Jj +Ts uh mI mI @@ -4912,7 +4889,7 @@ lx mI mI mI -gJ +al eF Jb Jb @@ -5458,7 +5435,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -5621,7 +5598,7 @@ mI mI YS mI -Jj +Ts uh mI mI @@ -11921,7 +11898,7 @@ lx hD wh mI -Jj +Ts uh mI mI @@ -12084,7 +12061,7 @@ jh mI mI mI -Jj +Ts uh mI mI @@ -12162,7 +12139,7 @@ YS mI mI mI -Jj +Ts uh mI ks @@ -12247,7 +12224,7 @@ mI mI mI hD -Jj +Ts uh Br mI @@ -12325,7 +12302,7 @@ mI mI mI wh -Jj +Ts uh mI mI @@ -12410,7 +12387,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -12488,7 +12465,7 @@ mI mI YS mI -Jj +Ts uh mI mI @@ -12573,7 +12550,7 @@ mI mI mI mI -Jj +Ts eF Jb Jb @@ -17194,7 +17171,7 @@ mI mI mI mI -Jj +Ts uh mI mI @@ -17357,7 +17334,7 @@ mI ks mI mI -Jj +Ts uh mI mI @@ -17520,7 +17497,7 @@ mI mI mI mI -Jj +Ts uh mI mI diff --git a/_maps/RandomRooms/rcorp/facility/offices.dmm b/_maps/RandomRooms/rcorp/facility/offices.dmm index c44499e278ff..42f59abed697 100644 --- a/_maps/RandomRooms/rcorp/facility/offices.dmm +++ b/_maps/RandomRooms/rcorp/facility/offices.dmm @@ -65,9 +65,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 index d8ee26feb1ed..682869855c18 100644 --- a/_maps/RandomRooms/rcorp/facility/raidboss.dmm +++ b/_maps/RandomRooms/rcorp/facility/raidboss.dmm @@ -46,9 +46,7 @@ /turf/open/floor/facility, /area/city/outskirts) "VG" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "WS" = ( diff --git a/_maps/RandomRooms/rcorp/facility/skeld.dmm b/_maps/RandomRooms/rcorp/facility/skeld.dmm index b3cc84ada8e8..12debece030d 100644 --- a/_maps/RandomRooms/rcorp/facility/skeld.dmm +++ b/_maps/RandomRooms/rcorp/facility/skeld.dmm @@ -1639,9 +1639,7 @@ /turf/open/floor/carpet/royalblack, /area/city/outskirts) "Ml" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Mq" = ( diff --git a/_maps/RandomRooms/rcorp/facility/standard.dmm b/_maps/RandomRooms/rcorp/facility/standard.dmm index c933e91850f9..f75ab9f2451e 100644 --- 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, /turf/closed/indestructible/syndicate, /area/city/outskirts) "aX" = ( diff --git a/_maps/RandomRooms/rcorp/facility/standard2.dmm b/_maps/RandomRooms/rcorp/facility/standard2.dmm index 9c0d981020f1..c61f874cec86 100644 --- a/_maps/RandomRooms/rcorp/facility/standard2.dmm +++ b/_maps/RandomRooms/rcorp/facility/standard2.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, /turf/closed/indestructible/syndicate, /area/city/outskirts) "aX" = ( diff --git a/_maps/RandomRooms/rcorp/facility/xenos.dmm b/_maps/RandomRooms/rcorp/facility/xenos.dmm index 78fc034c386e..1d9c5d442e30 100644 --- a/_maps/RandomRooms/rcorp/facility/xenos.dmm +++ b/_maps/RandomRooms/rcorp/facility/xenos.dmm @@ -1644,9 +1644,7 @@ /turf/open/floor/carpet/royalblack, /area/city/outskirts) "Ml" = ( -/obj/machinery/button/door/indestructible{ - id = "inside" - }, +/obj/machinery/button/door/indestructible/rcorp, /turf/closed/indestructible/syndicate, /area/city/outskirts) "Mq" = (