mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +01:00
Update the codebase to 515. (#15553)
* Update the codebase to 515. * edit that * WHOOPS * maor * maybe works * libcall and shit * do that too * remove that * auxtools isnt updated so get rid of it * actually remove auxtools lol Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -33,7 +33,7 @@
|
||||
else
|
||||
set_max_damage(200)
|
||||
if(!mapload)
|
||||
addtimer(CALLBACK(src, .proc/clear_screen), 5)
|
||||
addtimer(CALLBACK(src, PROC_REF(clear_screen)), 5)
|
||||
|
||||
/obj/item/organ/internal/brain/Destroy()
|
||||
if(brainmob)
|
||||
|
||||
@@ -103,7 +103,7 @@
|
||||
/obj/item/organ/internal/lungs/proc/enable_rupture()
|
||||
rupture_imminent = TRUE
|
||||
checking_rupture = TRUE
|
||||
addtimer(CALLBACK(src, .proc/disable_rupture), 5 SECONDS, TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(disable_rupture)), 5 SECONDS, TIMER_UNIQUE)
|
||||
|
||||
/obj/item/organ/internal/lungs/proc/disable_rupture()
|
||||
rupture_imminent = FALSE
|
||||
@@ -130,7 +130,7 @@
|
||||
to_chat(owner, FONT_LARGE(SPAN_WARNING("You feel vast amounts of air force itself into your lungs!")))
|
||||
else
|
||||
to_chat(owner, FONT_LARGE(SPAN_WARNING("You feel as if your lungs are about to blow!")))
|
||||
addtimer(CALLBACK(src, .proc/enable_rupture), 2 SECONDS, TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(enable_rupture)), 2 SECONDS, TIMER_UNIQUE)
|
||||
checking_rupture = FALSE
|
||||
|
||||
var/safe_pressure_min = owner.species.breath_pressure // Minimum safe partial pressure of breathable gas in kPa
|
||||
|
||||
@@ -109,7 +109,7 @@
|
||||
if(functioning)
|
||||
for(var/mob/living/M in contents)
|
||||
if(M.stat == DEAD)
|
||||
addtimer(CALLBACK(src, .proc/digest_mob, M), 5 MINUTES, TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src, PROC_REF(digest_mob), M), 5 MINUTES, TIMER_UNIQUE)
|
||||
|
||||
M.adjustBruteLoss(2)
|
||||
M.adjustFireLoss(2)
|
||||
|
||||
@@ -970,7 +970,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
if(!clean)
|
||||
//Throw limb around.
|
||||
if(src && istype(loc,/turf))
|
||||
INVOKE_ASYNC(src, /atom/movable/.proc/throw_at, get_edge_target_turf(src,pick(alldirs)), rand(1,3), 30)
|
||||
INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, throw_at), get_edge_target_turf(src,pick(alldirs)), rand(1,3), 30)
|
||||
dir = 2
|
||||
if(DROPLIMB_BURN)
|
||||
new /obj/effect/decal/cleanable/ash(get_turf(victim))
|
||||
@@ -985,12 +985,12 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
if(victim.species.blood_color)
|
||||
gore.basecolor = victim.species.blood_color
|
||||
gore.update_icon()
|
||||
INVOKE_ASYNC(gore, /atom/movable/.proc/throw_at, get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
INVOKE_ASYNC(gore, TYPE_PROC_REF(/atom/movable, throw_at), get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
|
||||
for(var/obj/item/organ/I in internal_organs)
|
||||
I.removed()
|
||||
if(istype(loc,/turf))
|
||||
INVOKE_ASYNC(I, /atom/movable/.proc/throw_at, get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
INVOKE_ASYNC(I, TYPE_PROC_REF(/atom/movable, throw_at), get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
|
||||
var/turf/Tloc = get_turf(src)
|
||||
for(var/obj/item/I in src)
|
||||
@@ -998,7 +998,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
||||
qdel(I)
|
||||
continue
|
||||
I.forceMove(Tloc)
|
||||
INVOKE_ASYNC(I, /atom/movable/.proc/throw_at, get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
INVOKE_ASYNC(I, TYPE_PROC_REF(/atom/movable, throw_at), get_edge_target_turf(src, pick(alldirs)), rand(1,3), 30)
|
||||
|
||||
qdel(src)
|
||||
|
||||
|
||||
@@ -239,7 +239,7 @@
|
||||
if(owner)
|
||||
to_chat(owner, FONT_LARGE(SPAN_DANGER("You feel your [src.name] surge with energy!")))
|
||||
spark(get_turf(owner), 3)
|
||||
addtimer(CALLBACK(src, .proc/disarm), recharge_time MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(disarm)), recharge_time MINUTES)
|
||||
if(is_bruised() && prob(50))
|
||||
owner.electrocute_act(40, owner)
|
||||
|
||||
@@ -248,7 +248,7 @@
|
||||
return
|
||||
actual_charges = min(actual_charges - 1, max_charges)
|
||||
if(actual_charges > 0)
|
||||
addtimer(CALLBACK(src, .proc/disarm), recharge_time MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(disarm)), recharge_time MINUTES)
|
||||
if(is_broken())
|
||||
owner.visible_message(SPAN_DANGER("\The [owner] crackles with energy!"))
|
||||
playsound(owner, 'sound/magic/LightningShock.ogg', 75, 1)
|
||||
|
||||
@@ -205,8 +205,8 @@
|
||||
owner.change_eye_color(250, 130, 130)
|
||||
owner.update_eyes()
|
||||
online = TRUE
|
||||
addtimer(CALLBACK(src, .proc/add_warning), 5 MINUTES)
|
||||
addtimer(CALLBACK(src, .proc/add_warning), 6 MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(add_warning)), 5 MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(add_warning)), 6 MINUTES)
|
||||
else
|
||||
turn_off()
|
||||
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
if(!diona)
|
||||
return 0
|
||||
|
||||
INVOKE_ASYNC(src, .proc/create_diona_nymph)
|
||||
INVOKE_ASYNC(src, PROC_REF(create_diona_nymph))
|
||||
|
||||
/turf/proc/create_diona_nymph()
|
||||
var/mob/living/carbon/alien/diona/D = new(src)
|
||||
SSghostroles.add_spawn_atom("diona_nymph", D)
|
||||
addtimer(CALLBACK(src, .proc/kill_diona_nymph, WEAKREF(D)), 3 MINUTES)
|
||||
addtimer(CALLBACK(src, PROC_REF(kill_diona_nymph), WEAKREF(D)), 3 MINUTES)
|
||||
|
||||
/turf/proc/kill_diona_nymph(var/datum/weakref/diona_ref)
|
||||
var/mob/living/carbon/alien/diona/D = diona_ref.resolve()
|
||||
|
||||
@@ -317,7 +317,7 @@
|
||||
robotize()
|
||||
stored_mmi = new /obj/item/device/mmi/digital/posibrain(src)
|
||||
. = ..()
|
||||
addtimer(CALLBACK(src, .proc/setup_brain), 30)
|
||||
addtimer(CALLBACK(src, PROC_REF(setup_brain)), 30)
|
||||
|
||||
/obj/item/organ/internal/mmi_holder/posibrain/proc/setup_brain()
|
||||
if(owner)
|
||||
@@ -334,7 +334,7 @@
|
||||
robotize()
|
||||
stored_mmi = new /obj/item/device/mmi/digital/robot(src)
|
||||
. = ..()
|
||||
addtimer(CALLBACK(src, .proc/setup_brain), 1)
|
||||
addtimer(CALLBACK(src, PROC_REF(setup_brain)), 1)
|
||||
|
||||
/obj/item/organ/internal/mmi_holder/circuit/proc/setup_brain()
|
||||
if(owner)
|
||||
|
||||
@@ -361,7 +361,7 @@
|
||||
|
||||
if(forced)
|
||||
nymph.can_attach = FALSE
|
||||
addtimer(CALLBACK(nymph, /datum/component/nymph_limb/.proc/can_attach, nymph), 5 MINUTES, TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(nymph, TYPE_PROC_REF(/datum/component/nymph_limb, can_attach), nymph), 5 MINUTES, TIMER_UNIQUE)
|
||||
|
||||
E.removed(E.owner)
|
||||
qdel(E)
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
|
||||
/obj/item/organ/external/head/skrell/Initialize(mapload)
|
||||
. = ..()
|
||||
addtimer(CALLBACK(src, .proc/setup_storage), 3 SECONDS)
|
||||
addtimer(CALLBACK(src, PROC_REF(setup_storage)), 3 SECONDS)
|
||||
|
||||
/obj/item/organ/external/head/skrell/proc/setup_storage()
|
||||
storage = new /obj/item/storage/internal/skrell(src)
|
||||
|
||||
Reference in New Issue
Block a user