From 26f58054f99af7f4f77a5aedc8787d36fd94ea14 Mon Sep 17 00:00:00 2001 From: Werner Date: Sun, 30 Dec 2018 16:57:22 +0100 Subject: [PATCH] Adds emp act for viscerators (#5832) * Adds emp act for viscerators * use a timer * Lose the target and bump the time --- .../living/simple_animal/hostile/syndicate.dm | 10 +++++ html/changelogs/arrow768-emp-viscerators.yml | 37 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 html/changelogs/arrow768-emp-viscerators.yml diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 3947d7d25d0..7ea1a1d3d5d 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -172,3 +172,13 @@ new /obj/effect/gibspawner/robot(T) spark(T, 3, alldirs) qdel(src) + +/mob/living/simple_animal/hostile/viscerator/proc/wakeup() + stance = HOSTILE_STANCE_IDLE + +/mob/living/simple_animal/hostile/viscerator/emp_act(severity) + LoseTarget() + stance = HOSTILE_STANCE_TIRED + addtimer(CALLBACK(src, .proc/wakeup), 150) + if(severity == 1.0) + apply_damage(5) \ No newline at end of file diff --git a/html/changelogs/arrow768-emp-viscerators.yml b/html/changelogs/arrow768-emp-viscerators.yml new file mode 100644 index 00000000000..e1d238bcbea --- /dev/null +++ b/html/changelogs/arrow768-emp-viscerators.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Arrow768 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Viscerators are now effected by EMPs."