This commit is contained in:
SandPoot
2023-11-29 22:40:13 -03:00
parent c9b0dedf77
commit 40f1d7401d
704 changed files with 1766 additions and 1743 deletions
@@ -68,7 +68,7 @@
var/icon/bluespace
/datum/status_effect/slimerecall/on_apply()
RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/resistField)
RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(resistField))
to_chat(owner, "<span class='danger'>You feel a sudden tug from an unknown force, and feel a pull to bluespace!</span>")
to_chat(owner, "<span class='notice'>Resist if you wish avoid the force!</span>")
bluespace = icon('icons/effects/effects.dmi',"chronofield")
@@ -102,7 +102,7 @@
var/obj/structure/ice_stasis/cube
/datum/status_effect/frozenstasis/on_apply()
RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/breakCube)
RegisterSignal(owner, COMSIG_LIVING_RESIST, PROC_REF(breakCube))
cube = new /obj/structure/ice_stasis(get_turf(owner))
owner.forceMove(cube)
owner.status_flags |= GODMODE
@@ -242,7 +242,7 @@ Burning extracts:
/obj/item/slimecross/burning/oil/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] begins to shake with rapidly increasing force!</span>")
addtimer(CALLBACK(src, .proc/boom), 50)
addtimer(CALLBACK(src, PROC_REF(boom)), 50)
/obj/item/slimecross/burning/oil/proc/boom()
explosion(get_turf(src), 2, 4, 4) //Same area as normal oils, but increased high-impact values by one each, then decreased light by 2.
@@ -178,7 +178,7 @@ Charged extracts:
/obj/item/slimecross/charged/gold/do_effect(mob/user)
user.visible_message("<span class='warning'>[src] starts shuddering violently!</span>")
addtimer(CALLBACK(src, .proc/startTimer), 50)
addtimer(CALLBACK(src, PROC_REF(startTimer)), 50)
/obj/item/slimecross/charged/gold/proc/startTimer()
START_PROCESSING(SSobj, src)
@@ -202,7 +202,7 @@ Charged extracts:
/obj/item/slimecross/charged/oil/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] begins to shake with rapidly increasing force!</span>")
addtimer(CALLBACK(src, .proc/boom), 50)
addtimer(CALLBACK(src, PROC_REF(boom)), 50)
/obj/item/slimecross/charged/oil/proc/boom()
explosion(get_turf(src), 3, 2, 1) //Much smaller effect than normal oils, but devastatingly strong where it does hit.
@@ -264,7 +264,7 @@ Chilling extracts:
/obj/item/slimecross/chilling/oil/do_effect(mob/user)
user.visible_message("<span class='danger'>[src] begins to shake with muted intensity!</span>")
addtimer(CALLBACK(src, .proc/boom), 50)
addtimer(CALLBACK(src, PROC_REF(boom)), 50)
/obj/item/slimecross/chilling/oil/proc/boom()
explosion(get_turf(src), -1, -1, 10, 0) //Large radius, but mostly light damage, and no flash.
@@ -51,7 +51,7 @@
potion_action = new
hotkey_help = new
stored_slimes = list()
RegisterSignal(src, COMSIG_ATOM_CONTENTS_DEL, .proc/on_contents_del)
RegisterSignal(src, COMSIG_ATOM_CONTENTS_DEL, PROC_REF(on_contents_del))
/obj/machinery/computer/camera_advanced/xenobio/Destroy()
stored_slimes = null
@@ -107,12 +107,12 @@
hotkey_help.Grant(user)
actions += hotkey_help
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, .proc/XenoSlimeClickCtrl)
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, .proc/XenoSlimeClickAlt)
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, .proc/XenoSlimeClickShift)
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, .proc/XenoTurfClickShift)
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, .proc/XenoTurfClickCtrl)
RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, .proc/XenoMonkeyClickCtrl)
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL, PROC_REF(XenoSlimeClickCtrl))
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_ALT, PROC_REF(XenoSlimeClickAlt))
RegisterSignal(user, COMSIG_XENO_SLIME_CLICK_SHIFT, PROC_REF(XenoSlimeClickShift))
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_SHIFT, PROC_REF(XenoTurfClickShift))
RegisterSignal(user, COMSIG_XENO_TURF_CLICK_CTRL, PROC_REF(XenoTurfClickCtrl))
RegisterSignal(user, COMSIG_XENO_MONKEY_CLICK_CTRL, PROC_REF(XenoMonkeyClickCtrl))
/obj/machinery/computer/camera_advanced/xenobio/remove_eye_control(mob/living/user)
UnregisterSignal(user, COMSIG_XENO_SLIME_CLICK_CTRL)
@@ -458,7 +458,7 @@
return
to_chat(user, "<span class='notice'>You feel your skin harden and become more resistant.</span>")
species.armor += 25
addtimer(CALLBACK(src, .proc/reset_armor, species), 1200)
addtimer(CALLBACK(src, PROC_REF(reset_armor), species), 1200)
return 450
if(SLIME_ACTIVATE_MAJOR)