Merge remote-tracking branch 'upstream/master' into familyport

This commit is contained in:
keronshb
2021-10-28 14:41:46 -04:00
387 changed files with 1908 additions and 1658 deletions
+13
View File
@@ -1134,3 +1134,16 @@
else if(fake_msg)
to_chat(owner, fake_msg)
msg_stage++
/datum/status_effect/cgau_conc
id = "cgau_conc"
examine_text = "<span class='warning'>SUBJECTPRONOUN rocks from side to side, confused.</span>"
duration = 5 SECONDS
/datum/status_effect/cgau_conc/on_creation(mob/living/new_owner, ...)
. = ..()
new_owner.add_movespeed_modifier(/datum/movespeed_modifier/gauntlet_concussion)
/datum/status_effect/cgau_conc/on_remove()
owner.remove_movespeed_modifier(/datum/movespeed_modifier/gauntlet_concussion)
. = ..()