From 3f179063daa2301883157016a0c0f033dc2c120d Mon Sep 17 00:00:00 2001 From: fernerr <35879136+fernerr@users.noreply.github.com> Date: Sun, 26 Jul 2020 18:29:46 +0200 Subject: [PATCH] Fixes disposal pipes being borked (#9474) Fixes bent disposal pipes appearing straight after map initialization, fixes disposal pipes not behaving properly when deconstructed. Removed the update_icon proc on them as it didn't do anything anymore after prior changes. --- code/modules/recycling/disposal.dm | 12 +----------- .../Ferner-200726-bugfix_disposalpipes.yml | 4 ++++ 2 files changed, 5 insertions(+), 11 deletions(-) create mode 100644 html/changelogs/Ferner-200726-bugfix_disposalpipes.yml diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 1393c1b2e10..5d5b3702e8a 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -769,16 +769,6 @@ // change visibility status and force update of icon /obj/structure/disposalpipe/hide(var/intact) invisibility = intact ? 101: 0 // hide if floor is intact - update_icon() - -// update actual icon_state depending on visibility -// if invisible, append "f" to icon_state to show faded version -// this will be revealed if a T-scanner is used -// if visible, use regular icon_state -/obj/structure/disposalpipe/update_icon() - icon_state = initial(icon_state) - return - // expel the held objects into a turf // called when there is a break in the pipe @@ -913,7 +903,7 @@ // called when pipe is cut with welder /obj/structure/disposalpipe/proc/welded() var/obj/structure/disposalconstruct/C = new (src.loc) - switch(initial(icon_state)) + switch(icon_state) if("pipe-s") C.ptype = 0 if("pipe-c") diff --git a/html/changelogs/Ferner-200726-bugfix_disposalpipes.yml b/html/changelogs/Ferner-200726-bugfix_disposalpipes.yml new file mode 100644 index 00000000000..7cdcc0189df --- /dev/null +++ b/html/changelogs/Ferner-200726-bugfix_disposalpipes.yml @@ -0,0 +1,4 @@ +author: Ferner +delete-after: True +changes: + - bugfix: "Fixed bent disposal pipes appearing like straight pieces, fixed disposal construction being borked." \ No newline at end of file