[MIRROR] Adds macros to help with common set_- and adjust_timed_status_effect uses [MDB IGNORE] (#16410)

* Adds macros to help with common `set_`- and `adjust_timed_status_effect` uses

* merge conflicts

* modular skyrat and missed changes

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
This commit is contained in:
SkyratBot
2022-09-26 17:56:24 -04:00
committed by GitHub
co-authored by MrMelbert tastyfish
parent d55ee2d3c3
commit eefbd40ce6
111 changed files with 434 additions and 378 deletions
+2 -2
View File
@@ -775,7 +775,7 @@
var/datum/status_effect/agent_pinpointer/scan_pinpointer = living_owner.apply_status_effect(/datum/status_effect/agent_pinpointer/scan)
scan_pinpointer.scan_target = living_scanned
living_scanned.set_timed_status_effect(100 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
living_scanned.set_jitter_if_lower(100 SECONDS)
to_chat(living_scanned, span_warning("You've been staggered!"))
living_scanned.add_filter("scan", 2, list("type" = "outline", "color" = COLOR_YELLOW, "size" = 1))
addtimer(CALLBACK(living_scanned, /atom/.proc/remove_filter, "scan"), 30 SECONDS)
@@ -978,7 +978,7 @@
target.ranged_cooldown += 5 SECONDS
else if(iscarbon(source))
var/mob/living/carbon/target = source
target.set_timed_status_effect(8 SECONDS, /datum/status_effect/confusion, only_if_higher = TRUE)
target.set_confusion_if_lower(8 SECONDS)
return NONE
/obj/item/cursed_katana/proc/slice(mob/living/target, mob/user)
+1 -1
View File
@@ -127,7 +127,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return
C.adjust_blurriness(6)
C.adjustStaminaLoss(15)//the pain from your eyes burning does stamina damage
C.adjust_timed_status_effect(5 SECONDS, /datum/status_effect/confusion)
C.adjust_confusion(5 SECONDS)
to_chat(C, span_userdanger("\The [src] gets into your eyes! The pain, it burns!"))
qdel(src)