cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 11:05:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

converts certain donk outpost objects to use SSqueuelinks instead of globals (#85637)

Browse Source 
## About The Pull Request
converts certain donk outpost objects to use SSqueuelinks instead of
globals

## Why It's Good For The Game

i dont think every cool ruin should have its own global vars + this
allows multiple of the ruin to be spawned without breaking if someone
wants to do that for some reason
its better to just do it like this

## Changelog
🆑
code: that one cool haunted donk outpost ruins tripwires and such use a
subsystem instead of globals. no real gameplay effect
/🆑

---------

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
This commit is contained in:
jimmyl
2024-09-13 13:59:21 +02:00
committed by GitHub
parent 5c67278b84
commit ef14af1ff6
3 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mapfluff/ruins/spaceruin_code/hauntedtradingpost.dm
+26 -35
View File
@@ -115,16 +115,14 @@
// [Hazards & Traps]
//cyborg holobarriers that die when the boss dies, how exciting
#define SELFDESTRUCT_QUEUE "hauntedtradingpost_sd" //make sure it matches the AI cores ID
/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield
desc = "A fragile holographic energy field projected by an AI core. It keeps unwanted humanoids at safe distance."
/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield/Initialize(mapload)
. = ..()
GLOB.selfdestructs_when_boss_dies += src
/obj/structure/holosign/barrier/cyborg/cybersun_ai_shield/Destroy()
GLOB.selfdestructs_when_boss_dies -= src
return ..()
if(mapload) //shouldnt queue when we arent even part of a ruin, probably admin shitspawned
SSqueuelinks.add_to_queue(src, SELFDESTRUCT_QUEUE)
//smes that produces power, until the boss dies then it self destructs and you gotta make your own power
/obj/machinery/power/smes/magical/cybersun
@@ -136,12 +134,7 @@
/obj/machinery/power/smes/magical/cybersun/Initialize(mapload)
. = ..()
if(donk_ai_slave)
GLOB.selfdestructs_when_boss_dies += src
/obj/machinery/power/smes/magical/cybersun/Destroy()
if(donk_ai_slave)
GLOB.selfdestructs_when_boss_dies -= src
return ..()
SSqueuelinks.add_to_queue(src, SELFDESTRUCT_QUEUE)
//this is a trigger for traps involving doors and shutters
//doors get closed and bolted, shutters get cycled open/closed
@@ -165,19 +158,31 @@
var/suicide_pact = FALSE
//id of the suicide pact this tripwire is in
var/suicide_pact_id
GLOBAL_LIST_EMPTY(tripwire_suicide_pact)
/obj/machinery/button/door/invisible_tripwire/Initialize(mapload)
. = ..()
if(donk_ai_slave == TRUE)
GLOB.selfdestructs_when_boss_dies += src
if(suicide_pact == TRUE && suicide_pact_id != null)
GLOB.tripwire_suicide_pact += src
if(donk_ai_slave)
SSqueuelinks.add_to_queue(src, SELFDESTRUCT_QUEUE)
if(suicide_pact && suicide_pact_id != null)
SSqueuelinks.add_to_queue(src, suicide_pact_id)
. = INITIALIZE_HINT_LATELOAD
var/static/list/loc_connections = list(
COMSIG_ATOM_ENTERED = PROC_REF(on_entered),
)
AddElement(/datum/element/connect_loc, loc_connections)
/obj/machinery/button/door/invisible_tripwire/post_machine_initialize()
. = ..()
if(!suicide_pact || isnull(SSqueuelinks.queues[suicide_pact_id]))
return // we got beat to it
SSqueuelinks.pop_link(suicide_pact_id)
/obj/machinery/button/door/invisible_tripwire/MatchedLinks(id, list/partners)
if(id != suicide_pact_id)
return
for(var/partner in partners)
RegisterSignal(partner, COMSIG_PUZZLE_COMPLETED, TYPE_PROC_REF(/datum, selfdelete))
/obj/machinery/button/door/invisible_tripwire/proc/on_entered(atom/source, atom/movable/victim)
SIGNAL_HANDLER
if(!isliving(victim))
@@ -194,19 +199,9 @@ GLOBAL_LIST_EMPTY(tripwire_suicide_pact)
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom, interact), victim)
if(multiuse && uses_remaining != 1)
return
if(suicide_pact&& suicide_pact_id)
for (var/obj/machinery/button/door/invisible_tripwire/pact_member in GLOB.tripwire_suicide_pact)
if(src.suicide_pact_id == pact_member.suicide_pact_id)
qdel(pact_member)
qdel(src)
/obj/machinery/button/door/invisible_tripwire/Destroy()
if(donk_ai_slave)
GLOB.selfdestructs_when_boss_dies -= src
if(suicide_pact && suicide_pact_id)
GLOB.tripwire_suicide_pact -= src
return ..()
SEND_SIGNAL(src, COMSIG_PUZZLE_COMPLETED)
qdel(src)
//door button that destroys itself when it is pressed
/obj/machinery/button/door/selfdestructs
@@ -271,13 +266,8 @@ GLOBAL_LIST_EMPTY(tripwire_suicide_pact)
proximity_monitor?.set_range(trigger_range)
my_turf = get_turf(src)
host_machine = locate(/obj/machinery) in loc
if(donk_ai_slave == TRUE)
GLOB.selfdestructs_when_boss_dies += src
/obj/effect/overloader_trap/Destroy()
if(donk_ai_slave == TRUE)
GLOB.selfdestructs_when_boss_dies -= src
return ..()
if(donk_ai_slave)
SSqueuelinks.add_to_queue(src, SELFDESTRUCT_QUEUE)
/obj/effect/overloader_trap/proc/check_faction(mob/target)
for(var/faction1 in faction)
@@ -381,3 +371,4 @@ GLOBAL_LIST_EMPTY(tripwire_suicide_pact)
damage = 30
wound_bonus = -50
#undef SELFDESTRUCT_QUEUE