mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-10 23:47:16 +01:00
it compiles, that's better than it not compiling, right?
This commit is contained in:
@@ -36,7 +36,7 @@
|
||||
if(!owner)
|
||||
return
|
||||
update_image()
|
||||
RegisterSignal(owner, COMSIG_CYBORG_MODULE_CHANGE, .proc/update_image)
|
||||
RegisterSignal(owner, COMSIG_CYBORG_MODULE_CHANGE,PROC_REF(update_image))
|
||||
|
||||
/datum/action/cyborg_small_sprite/Remove(mob/M)
|
||||
UnregisterSignal(owner, COMSIG_CYBORG_MODULE_CHANGE)
|
||||
|
||||
@@ -13,9 +13,9 @@
|
||||
inv_slots = _inv_slots
|
||||
proctype = _proctype
|
||||
|
||||
RegisterSignal(target, COMSIG_CLICK_ALT, .proc/mob_try_pickup_micro, override = TRUE)
|
||||
RegisterSignal(target, COMSIG_PARENT_EXAMINE, .proc/on_examine, override = TRUE)
|
||||
RegisterSignal(target, COMSIG_MICRO_PICKUP_FEET, .proc/mob_pickup_micro_feet)
|
||||
RegisterSignal(target, COMSIG_CLICK_ALT,PROC_REF(mob_try_pickup_micro), override = TRUE)
|
||||
RegisterSignal(target, COMSIG_PARENT_EXAMINE,PROC_REF(on_examine), override = TRUE)
|
||||
RegisterSignal(target, COMSIG_MICRO_PICKUP_FEET,PROC_REF(mob_pickup_micro_feet))
|
||||
|
||||
/datum/element/mob_holder/micro/Detach(datum/source, force)
|
||||
. = ..()
|
||||
|
||||
@@ -156,7 +156,7 @@ GLOBAL_DATUM_INIT(lore_terminal_controller, /datum/lore_controller, new)
|
||||
icon_state = "terminal_scroll"
|
||||
clicks = clicks/3
|
||||
var/loops = clicks/3 //Each click sound has 4 clicks in it, so we only need to click 1/4th of the time per character yeet.
|
||||
addtimer(CALLBACK(src, .proc/stop_clicking), loops)
|
||||
addtimer(CALLBACK(src,PROC_REF(stop_clicking)), loops)
|
||||
soundloop?.start()
|
||||
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
/obj/item/storage/backpack/gigantic/equipped(mob/equipper, slot)
|
||||
. = ..()
|
||||
if(slot == SLOT_BACK)
|
||||
RegisterSignal(equipper, COMSIG_MOBSIZE_CHANGED, .proc/fallOff)
|
||||
RegisterSignal(equipper, COMSIG_MOBSIZE_CHANGED,PROC_REF(fallOff))
|
||||
else
|
||||
UnregisterSignal(equipper, COMSIG_MOBSIZE_CHANGED)
|
||||
|
||||
|
||||
@@ -253,7 +253,7 @@
|
||||
var/turf/open/chasm/cloud/M = F
|
||||
M.TerraformTurf(/turf/open/floor/plating/asteroid/layenia, /turf/open/floor/plating/asteroid/layenia)
|
||||
gps = new /obj/item/gps/internal(src)
|
||||
addtimer(CALLBACK(src, .proc/delayedInitialize), 4 SECONDS)
|
||||
addtimer(CALLBACK(src,PROC_REF(delayedInitialize)), 4 SECONDS)
|
||||
|
||||
/obj/structure/spawner/crystalline/deconstruct(disassembled)
|
||||
new /obj/effect/cloud_collapse(loc)
|
||||
@@ -292,7 +292,7 @@
|
||||
visible_message("<span class='boldannounce'>The tendril writhes in fury as the earth around it begins to crack and break apart! Get back!</span>")
|
||||
visible_message("<span class='warning'>Something falls free of the tendril!</span>")
|
||||
playsound(loc,'sound/effects/tendril_destroyed.ogg', 200, 0, 50, 1, 1)
|
||||
addtimer(CALLBACK(src, .proc/collapse), 50)
|
||||
addtimer(CALLBACK(src,PROC_REF(collapse)), 50)
|
||||
|
||||
/obj/effect/cloud_collapse/Destroy()
|
||||
QDEL_NULL(emitted_light)
|
||||
|
||||
@@ -579,7 +579,7 @@ The reactor CHEWS through moderator. It does not do this slowly. Be very careful
|
||||
|
||||
/obj/machinery/computer/reactor/Initialize(mapload, obj/item/circuitboard/C)
|
||||
. = ..()
|
||||
addtimer(CALLBACK(src, .proc/link_to_reactor), 10 SECONDS)
|
||||
addtimer(CALLBACK(src,PROC_REF(link_to_reactor)), 10 SECONDS)
|
||||
|
||||
/obj/machinery/computer/reactor/wrench_act(mob/living/user, obj/item/I)
|
||||
to_chat(user, "<span class='notice'>You start [anchored ? "un" : ""]securing [name]...</span>")
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
/datum/action/sizecode_resize/Grant(mob/M, safety=FALSE)
|
||||
if(ishuman(M) && !safety) //this probably gets called before a person gets overlays on roundstart, so try again
|
||||
if(!LAZYLEN(M.overlays))
|
||||
addtimer(CALLBACK(src, .proc/Grant, M, TRUE), 5) //https://www.youtube.com/watch?v=QQ-aYZzlDeo
|
||||
addtimer(CALLBACK(src,PROC_REF(Grant), M, TRUE), 5) //https://www.youtube.com/watch?v=QQ-aYZzlDeo
|
||||
return
|
||||
|
||||
..()
|
||||
|
||||
@@ -45,8 +45,8 @@ Icons, maybe?
|
||||
|
||||
|
||||
/datum/status_effect/leash_pet/on_apply()
|
||||
//redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src, .proc/owner_resist))))
|
||||
RegisterSignal(owner, COMSIG_LIVING_RESIST, .proc/owner_resist)
|
||||
//redirect_component = WEAKREF(owner.AddComponent(/datum/component/redirect, list(COMSIG_LIVING_RESIST = CALLBACK(src,PROC_REF(owner_resist)))))
|
||||
RegisterSignal(owner, COMSIG_LIVING_RESIST,PROC_REF(owner_resist))
|
||||
redirect_component = owner
|
||||
if(!owner.stat)
|
||||
to_chat(owner, "<span class='userdanger'>You have been leashed!</span>")
|
||||
@@ -103,11 +103,11 @@ Icons, maybe?
|
||||
user.apply_status_effect(/datum/status_effect/leash_dom) //Is the leasher
|
||||
leash_pet = C //Save pet reference for later
|
||||
leash_master = user //Save dom reference for later
|
||||
//mobhook_leash_pet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_pet_move)))
|
||||
RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, .proc/on_pet_move)
|
||||
//mobhook_leash_pet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src,PROC_REF(on_pet_move))))
|
||||
RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED,PROC_REF(on_pet_move))
|
||||
mobhook_leash_pet = leash_pet
|
||||
//mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_master_move)))
|
||||
RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, .proc/on_master_move)
|
||||
//mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src,PROC_REF(on_master_move))))
|
||||
RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED,PROC_REF(on_master_move))
|
||||
mobhook_leash_master = leash_master
|
||||
leash_used = 1
|
||||
if(!leash_pet.has_status_effect(/datum/status_effect/leash_dom)) //Add slowdown if the pet didn't leash themselves
|
||||
@@ -389,8 +389,8 @@ Icons, maybe?
|
||||
viewing.show_message("<span class='notice'>[leash_master] has dropped the leash.</span>", 1)
|
||||
//DOM HAS DROPPED LEASH. PET IS FREE. SCP HAS BREACHED CONTAINMENT.
|
||||
leash_pet.remove_movespeed_modifier(MOVESPEED_ID_LEASH)
|
||||
//mobhook_leash_freepet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_freepet_move)))
|
||||
RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED, .proc/on_freepet_move)
|
||||
//mobhook_leash_freepet = leash_pet.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src,PROC_REF(on_freepet_move))))
|
||||
RegisterSignal(leash_pet, COMSIG_MOVABLE_MOVED,PROC_REF(on_freepet_move))
|
||||
mobhook_leash_freepet = leash_pet
|
||||
leash_master.remove_status_effect(/datum/status_effect/leash_dom) //No dom with no leash. We will get a new dom if the leash is picked back up.
|
||||
leash_master = "null"
|
||||
@@ -409,8 +409,8 @@ Icons, maybe?
|
||||
leash_master = "null"
|
||||
return
|
||||
leash_master.apply_status_effect(/datum/status_effect/leash_dom)
|
||||
//mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src, .proc/on_master_move)))
|
||||
RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED, .proc/on_master_move)
|
||||
//mobhook_leash_master = leash_master.AddComponent(/datum/component/redirect, list(COMSIG_MOVABLE_MOVED = CALLBACK(src,PROC_REF(on_master_move))))
|
||||
RegisterSignal(leash_master, COMSIG_MOVABLE_MOVED,PROC_REF(on_master_move))
|
||||
mobhook_leash_master = leash_master
|
||||
leash_pet.remove_status_effect(/datum/status_effect/leash_freepet)
|
||||
//QDEL_NULL(mobhook_leash_freepet)
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
playsound(src.loc, 'hyperstation/sound/misc/helfire_use.ogg', 100, 1, extrarange = 8)
|
||||
icon_state = "helfire_tincture_used"
|
||||
update_icon()
|
||||
addtimer(CALLBACK(src, .proc/restore, user), cooldowntime)
|
||||
addtimer(CALLBACK(src,PROC_REF(restore), user), cooldowntime)
|
||||
else
|
||||
to_chat(user, "<span class='warning'>It's too soon to use this again!</span>")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user