From 8a3b89ff609d05f6626fd86bdcab0322b0ad5354 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Sat, 20 Jun 2020 17:57:46 +0200 Subject: [PATCH] Fixes point spamming creating super saiyan mobs and items. (#9183) --- code/modules/mob/living/living.dm | 6 +++- html/changelogs/mattatlas-pointcd.yml | 41 +++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/mattatlas-pointcd.yml diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 87749afbaf9..cfc552cd9eb 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -9,6 +9,7 @@ return //mob verbs are faster than object verbs. See above. +var/mob/living/next_point_time = 0 /mob/living/pointed(atom/A as mob|obj|turf in view()) if(!isturf(src.loc) || !(A in range(world.view, get_turf(src)))) return FALSE @@ -16,7 +17,10 @@ return FALSE if(src.status_flags & FAKEDEATH) return FALSE + if(next_point_time >= world.time) + return FALSE + next_point_time = world.time + 25 face_atom(A) if(isturf(A)) if(pointing_effect) @@ -25,7 +29,7 @@ pointing_effect.invisibility = invisibility addtimer(CALLBACK(src, .proc/clear_point), 20) else - var/pointglow = filter(type = "drop_shadow", x = 0, y = -1, offset = 2, size = 1, color = "#F00") + var/pointglow = filter(type = "drop_shadow", x = 0, y = -1, offset = 1, size = 1, color = "#F00") LAZYADD(A.filters, pointglow) addtimer(CALLBACK(src, .proc/remove_filter, A, pointglow), 20) visible_message("\The [src] points to \the [A].") diff --git a/html/changelogs/mattatlas-pointcd.yml b/html/changelogs/mattatlas-pointcd.yml new file mode 100644 index 00000000000..3c0b268447d --- /dev/null +++ b/html/changelogs/mattatlas-pointcd.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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: + - bugfix: "Pointing now has a cooldown."