mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-18 19:39:53 +01:00
more changes
This commit is contained in:
@@ -52,7 +52,7 @@
|
||||
|
||||
/obj/item/clothing/glasses/judicial_visor/dropped(mob/user)
|
||||
. = ..()
|
||||
addtimer(CALLBACK(src, .proc/check_on_mob, user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
|
||||
addtimer(CALLBACK(src,PROC_REF(check_on_mob), user), 1) //dropped is called before the item is out of the slot, so we need to check slightly later
|
||||
|
||||
/obj/item/clothing/glasses/judicial_visor/proc/check_on_mob(mob/user)
|
||||
if(user && src != user.get_item_by_slot(SLOT_GLASSES)) //if we happen to check and we AREN'T in the slot, we need to remove our shit from whoever we got dropped from
|
||||
@@ -161,7 +161,7 @@
|
||||
. = ..()
|
||||
set_light(1.4, 2, "#FE9C11")
|
||||
user = caster
|
||||
INVOKE_ASYNC(src, .proc/judicialblast)
|
||||
INVOKE_ASYNC(src,PROC_REF(judicialblast))
|
||||
|
||||
/obj/effect/clockwork/judicial_marker/singularity_act()
|
||||
return
|
||||
|
||||
@@ -290,7 +290,7 @@
|
||||
B.current.client.images += C.cult_team.blood_target_image
|
||||
attached_action.owner.update_action_buttons_icon()
|
||||
remove_ranged_ability("<span class='cult'>The marking rite is complete! It will last for 90 seconds.</span>")
|
||||
C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target,C.cult_team), 900, TIMER_STOPPABLE)
|
||||
C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC,PROC_REF(reset_blood_target),C.cult_team), 900, TIMER_STOPPABLE)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
@@ -377,8 +377,8 @@
|
||||
desc = "Remove the Blood Mark you previously set."
|
||||
button_icon_state = "emp"
|
||||
owner.update_action_buttons_icon()
|
||||
C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, .proc/reset_blood_target,C.cult_team), base_cooldown, TIMER_STOPPABLE)
|
||||
addtimer(CALLBACK(src, .proc/reset_button), base_cooldown)
|
||||
C.cult_team.blood_target_reset_timer = addtimer(CALLBACK(GLOBAL_PROC, PROC_REF(reset_blood_target),C.cult_team), base_cooldown, TIMER_STOPPABLE)
|
||||
addtimer(CALLBACK(src, PROC_REF(reset_button)), base_cooldown)
|
||||
|
||||
|
||||
//////// ELDRITCH PULSE /////////
|
||||
|
||||
@@ -258,7 +258,7 @@
|
||||
sword.spinning = TRUE
|
||||
sword.block_chance = 100
|
||||
sword.slowdown += 1.5
|
||||
addtimer(CALLBACK(src, .proc/stop_spinning), 50)
|
||||
addtimer(CALLBACK(src,PROC_REF(stop_spinning)), 50)
|
||||
holder.update_action_buttons_icon()
|
||||
|
||||
/datum/action/innate/cult/spin2win/proc/stop_spinning()
|
||||
@@ -849,10 +849,10 @@
|
||||
qdel(src)
|
||||
return
|
||||
charging = TRUE
|
||||
INVOKE_ASYNC(src, .proc/charge, user)
|
||||
INVOKE_ASYNC(src,PROC_REF(charge), user)
|
||||
if(do_after(user, 90, target = user))
|
||||
firing = TRUE
|
||||
INVOKE_ASYNC(src, .proc/pewpew, user, params)
|
||||
INVOKE_ASYNC(src,PROC_REF(pewpew), user, params)
|
||||
var/obj/structure/emergency_shield/invoker/N = new(user.loc)
|
||||
if(do_after(user, 90, target = user))
|
||||
user.Knockdown(40)
|
||||
|
||||
@@ -437,7 +437,7 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
outer_portal = new(T, 600, color)
|
||||
light_range = 4
|
||||
update_light()
|
||||
addtimer(CALLBACK(src, .proc/close_portal), 600, TIMER_UNIQUE)
|
||||
addtimer(CALLBACK(src,PROC_REF(close_portal)), 600, TIMER_UNIQUE)
|
||||
|
||||
/obj/effect/rune/teleport/proc/close_portal()
|
||||
qdel(inner_portal)
|
||||
@@ -663,7 +663,7 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
W.density = TRUE
|
||||
W.update_state()
|
||||
W.spread_density()
|
||||
density_timer = addtimer(CALLBACK(src, .proc/lose_density), 3000, TIMER_STOPPABLE)
|
||||
density_timer = addtimer(CALLBACK(src,PROC_REF(lose_density)), 3000, TIMER_STOPPABLE)
|
||||
|
||||
/obj/effect/rune/wall/proc/lose_density()
|
||||
if(density)
|
||||
@@ -673,7 +673,7 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
var/oldcolor = color
|
||||
add_atom_colour("#696969", FIXED_COLOUR_PRIORITY)
|
||||
animate(src, color = oldcolor, time = 50, easing = EASE_IN)
|
||||
addtimer(CALLBACK(src, .proc/recharge), 50)
|
||||
addtimer(CALLBACK(src,PROC_REF(recharge)), 50)
|
||||
|
||||
/obj/effect/rune/wall/proc/recharge()
|
||||
recharging = FALSE
|
||||
@@ -991,7 +991,7 @@ structure_check() searches for nearby cultist structures required for the invoca
|
||||
if(ishuman(M))
|
||||
if(!iscultist(M))
|
||||
AH.remove_hud_from(M)
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/hudFix, M), duration)
|
||||
addtimer(CALLBACK(GLOBAL_PROC,PROC_REF(hudFix), M), duration)
|
||||
var/image/A = image('icons/mob/mob.dmi',M,"cultist", ABOVE_MOB_LAYER)
|
||||
A.override = 1
|
||||
add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/noncult, "human_apoc", A, FALSE)
|
||||
|
||||
@@ -435,7 +435,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
|
||||
|
||||
minor_announce("Hostile runtime detected in door controllers. Isolation lockdown protocols are now in effect. Please remain calm.","Network Alert:", TRUE)
|
||||
to_chat(owner, "<span class='danger'>Lockdown initiated. Network reset in 90 seconds.</span>")
|
||||
addtimer(CALLBACK(GLOBAL_PROC, .proc/minor_announce,
|
||||
addtimer(CALLBACK(GLOBAL_PROC,PROC_REF(minor_announce),
|
||||
"Automatic system reboot complete. Have a secure day.",
|
||||
"Network reset:"), 900)
|
||||
|
||||
@@ -706,7 +706,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list(
|
||||
I.loc = T
|
||||
client.images += I
|
||||
I.icon_state = "[success ? "green" : "red"]Overlay" //greenOverlay and redOverlay for success and failure respectively
|
||||
addtimer(CALLBACK(src, .proc/remove_transformer_image, client, I, T), 30)
|
||||
addtimer(CALLBACK(src,PROC_REF(remove_transformer_image), client, I, T), 30)
|
||||
if(!success)
|
||||
to_chat(src, "<span class='warning'>[alert_msg]</span>")
|
||||
return success
|
||||
|
||||
Reference in New Issue
Block a user