diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index d40d396b496..effe6e985b7 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -1,7 +1,7 @@ //generic procs copied from obj/effect/alien /obj/effect/spider name = "web" - desc = "It's stringy and sticky, eugh. Probably came from one of those giant spiders..." + desc = "It's stringy and sticky, eugh. Probably came from one of those greimorians..." icon = 'icons/effects/effects.dmi' anchored = TRUE density = FALSE @@ -321,14 +321,14 @@ qdel(O) /obj/effect/decal/cleanable/spiderling_remains - name = "spiderling remains" + name = "greimorian larva remains" desc = "Green squishy mess." icon = 'icons/effects/effects.dmi' icon_state = "greenshatter" /obj/effect/spider/cocoon name = "cocoon" - desc = "Something wrapped in silky spider web" + desc = "Something wrapped in silky greimorian web" icon_state = "cocoon1" health = 60 diff --git a/html/changelogs/wickedcybs_remainsfix.yml b/html/changelogs/wickedcybs_remainsfix.yml new file mode 100644 index 00000000000..b49618a3197 --- /dev/null +++ b/html/changelogs/wickedcybs_remainsfix.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: WickedCybs + +# 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: "References to spiderlings and spiders should now reference greimorians. Overt references like 'spiderling remains' are now 'greimorian larva remains' too." diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index be108957a47..74d7fafc426 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -7289,7 +7289,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /obj/machinery/status_display{ layer = 4; @@ -8259,7 +8259,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -12046,7 +12046,7 @@ "avD" = ( /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/tiled, /area/bridge/aibunker) diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e1fc95a4cf1..479c64bdfd9 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -600,7 +600,7 @@ "abq" = ( /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/airless, /area/mine/unexplored) diff --git a/maps/aurora/aurora-5_interstitial.dmm b/maps/aurora/aurora-5_interstitial.dmm index bbc9e72341b..79b6b8823cf 100644 --- a/maps/aurora/aurora-5_interstitial.dmm +++ b/maps/aurora/aurora-5_interstitial.dmm @@ -4161,7 +4161,7 @@ /obj/effect/decal/cleanable/cobweb2, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -7945,7 +7945,7 @@ }, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/tiled/white, /area/maintenance/medbay_virology) diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index fe824c6dfd7..84d3c5aeb9e 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -141,7 +141,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/plating, /area/store) @@ -387,7 +387,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/lino/grey, /area/store) diff --git a/maps/dungeon_spawns/sol_bunker_unique.dmm b/maps/dungeon_spawns/sol_bunker_unique.dmm index 2403c7b78f0..48c1f31ac01 100644 --- a/maps/dungeon_spawns/sol_bunker_unique.dmm +++ b/maps/dungeon_spawns/sol_bunker_unique.dmm @@ -82,7 +82,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/tiled, /area/dungeon/sol_outpost) @@ -115,7 +115,7 @@ /obj/structure/toilet, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/white, @@ -638,7 +638,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /turf/simulated/floor/wood, /area/dungeon/sol_outpost) @@ -960,7 +960,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb2{ icon_state = "spiderling"; - name = "dead spider" + name = "dead greimorian" }, /obj/machinery/light{ brightness_color = "#FA8282"