Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Endermage Rcorp Updates: Auto Shutters #2550

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Endermage Rcorp Updates: Auto Shutters #2550

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
611926d
Button
azenkov Nov 10, 2024
74d0faa
Button Fix?
EnderMage99 Nov 11, 2024
88e5f80
fixes
azenkov Nov 11, 2024
b466212
time fix
azenkov Nov 11, 2024
8bcbd60
Updating Maps with Buttons
EnderMage99 Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ModularTegustation/tegu_items/rcorp/button.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/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)
. = ..()

/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.rcorp_team == "easy")
count++
if (count > 2)
break
if (count > 2)
to_chat(usr, "<span class='notice'>There are still enemies around!</span>")
return
..()
11 changes: 6 additions & 5 deletions ModularTegustation/tegu_items/rcorp/landmarks.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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!"
Expand All @@ -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!"
Expand All @@ -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
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/beaches.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/beaches2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/city.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/city2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/maze.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
4 changes: 1 addition & 3 deletions _maps/RandomRooms/rcorp/facility/maze2.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down
Loading
Loading