[MIRROR] Fixes a bunch of harddels that are sourced from player action (#6252)

* Fixes a bunch of harddels that are sourced from player action

* Mirror!

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Funce <funce.973@gmail.com>
This commit is contained in:
SkyratBot
2021-06-11 04:13:33 +02:00
committed by GitHub
parent cc5595fddf
commit 6f3b151bb8
165 changed files with 1076 additions and 546 deletions
@@ -399,8 +399,6 @@
var/sale_price = 20
///The Account which will receive payment for purchases. Set by the first ID to swipe the tray.
var/datum/bank_account/payments_acc = null
///We're using the same trick as paper does in order to cache the image, and only load the UI when messed with.
var/list/viewing_ui = list()
/obj/structure/displaycase/forsale/update_icon_state()
icon_state = "[initial(icon_state)][broken ? "_broken" : (open ? "_open" : (!showpiece ? "_empty" : null))]"
@@ -416,7 +414,6 @@
if(!ui)
ui = new(user, src, "Vendatray", name)
ui.set_autoupdate(FALSE)
viewing_ui[user] = ui
ui.open()
/obj/structure/displaycase/forsale/ui_data(mob/user)
@@ -77,7 +77,7 @@
yolk.equipOutfit(/datum/outfit/ashwalker)//this is an authentic mess we're making
yolk.update_body()
yolk.gib()
qdel(egg)
QDEL_NULL(egg)
return ..()
@@ -101,6 +101,11 @@
var/datum/team/ashwalkers/team
var/obj/structure/ash_walker_eggshell/eggshell
/obj/effect/mob_spawn/human/ash_walker/Destroy()
eggshell = null
return ..()
/obj/effect/mob_spawn/human/ash_walker/allow_spawn(mob/user)
if(!(user.key in team.players_spawned))//one per person unless you get a bonus spawn
return TRUE
@@ -125,7 +130,7 @@
H.remove_language(/datum/language/common)
team.players_spawned += (new_spawn.key)
eggshell.egg = null
qdel(eggshell)
QDEL_NULL(eggshell)
/obj/effect/mob_spawn/human/ash_walker/Initialize(mapload, datum/team/ashwalkers/ashteam)
. = ..()
+13 -2
View File
@@ -597,10 +597,21 @@
var/mob/living/carbon/M = locate(/mob/living/carbon) in loc
if(M)
if(M.resting)
patient = M
set_patient(M)
else
patient = null
set_patient(null)
/obj/structure/table/optable/proc/set_patient(new_patient)
if(patient)
UnregisterSignal(patient, COMSIG_PARENT_QDELETING)
patient = new_patient
if(patient)
RegisterSignal(patient, COMSIG_PARENT_QDELETING, .proc/patient_deleted)
/obj/structure/table/optable/proc/patient_deleted(datum/source)
SIGNAL_HANDLER
set_patient(null)
/obj/structure/table/optable/proc/check_eligible_patient()
get_patient()
if(!patient)
+9 -1
View File
@@ -114,6 +114,12 @@
time_between_triggers = 10
flare_message = "<span class='warning'>[src] snaps shut!</span>"
/obj/structure/trap/stun/hunter/Destroy()
if(!QDELETED(stored_item))
qdel(stored_item)
stored_item = null
return ..()
/obj/structure/trap/stun/hunter/on_entered(datum/source, atom/movable/AM)
if(isliving(AM))
var/mob/living/L = AM
@@ -167,7 +173,9 @@
forceMove(stored_trap)//moves item into trap
/obj/item/bountytrap/Destroy()
qdel(stored_trap)
if(!QDELETED(stored_trap))
qdel(stored_trap)
stored_trap = null
QDEL_NULL(radio)
QDEL_NULL(spark_system)
. = ..()