From 04116143a924c7a913a06fa9520ac34855b59a1a Mon Sep 17 00:00:00 2001 From: Hazelrat Date: Mon, 4 Nov 2024 19:50:19 +0000 Subject: [PATCH 1/2] Final? --- .../simple_animal/hostile/giant_spider.dm | 16 ++--- html/changelogs/hazelmouse-webfix.yml | 58 +++++++++++++++++++ 2 files changed, 66 insertions(+), 8 deletions(-) create mode 100644 html/changelogs/hazelmouse-webfix.yml diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm index 44fdf09caf8..8602d248c24 100644 --- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm +++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm @@ -255,9 +255,8 @@ addtimer(CALLBACK(src, PROC_REF(GiveUp), C), 100, TIMER_UNIQUE) return - //second, spin a sticky spiderweb on this tile - var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) - if(!W) + //second, spin a sticky spiderweb on this tile if there isn't already a spiderweb there + if(!locate(/obj/effect/spider/stickyweb) in src.loc) busy = SPINNING_WEB src.visible_message(SPAN_NOTICE("\The [src] begins to secrete a sticky substance.")) stop_automated_movement = 1 @@ -312,7 +311,7 @@ stop_automated_movement = 0 /mob/living/simple_animal/hostile/giant_spider/nurse/proc/finalize_web() - if(busy == SPINNING_WEB) + if(busy == SPINNING_WEB && !locate(/obj/effect/spider/stickyweb) in src.loc) // Additional check, to be extra-sure they don't stack webs. new /obj/effect/spider/stickyweb(src.loc) busy = 0 stop_automated_movement = 0 @@ -361,12 +360,13 @@ set desc = "Create a web that slows down movement." set category = "Greimorian" - var/obj/effect/spider/stickyweb/W = locate() in get_turf(src) - if(!W) - to_chat(usr, SPAN_NOTICE("\The [src] begins to secrete a sticky substance.")) - if(!do_after(src, 20)) + if(!locate(/obj/effect/spider/stickyweb) in src.loc) + src.visible_message(SPAN_NOTICE("\The [src] begins to secrete a sticky substance.")) + if(!do_after(src, 20) || locate(/obj/effect/spider/stickyweb) in src.loc) // Additional check so you can't queue it multiple times at once to stack webs. return new /obj/effect/spider/stickyweb(get_turf(src)) + else + to_chat(usr, SPAN_WARNING("You cannot secrete webs on a turf that is already webbed!")) /mob/living/simple_animal/hostile/giant_spider/nurse/verb/cocoon() diff --git a/html/changelogs/hazelmouse-webfix.yml b/html/changelogs/hazelmouse-webfix.yml new file mode 100644 index 00000000000..b2ab6b5fbb7 --- /dev/null +++ b/html/changelogs/hazelmouse-webfix.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: hazelmouse + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - balance: "Greimorians should no longer be able to spin multiple webs on one tile." From ae9a8160671dc8eabd893783fe58a1dcf860ffb1 Mon Sep 17 00:00:00 2001 From: Hazelrat Date: Mon, 4 Nov 2024 19:59:13 +0000 Subject: [PATCH 2/2] Edits changelog to a bugfix --- html/changelogs/hazelmouse-webfix.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/changelogs/hazelmouse-webfix.yml b/html/changelogs/hazelmouse-webfix.yml index b2ab6b5fbb7..96113124125 100644 --- a/html/changelogs/hazelmouse-webfix.yml +++ b/html/changelogs/hazelmouse-webfix.yml @@ -55,4 +55,4 @@ delete-after: True # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. changes: - - balance: "Greimorians should no longer be able to spin multiple webs on one tile." + - bugfix: "Greimorians should no longer be able to spin multiple webs on one tile."