From 5b3dadfe69e699acdf3266830f735536b8899ab0 Mon Sep 17 00:00:00 2001 From: Merchoven Date: Thu, 3 Dec 2015 21:03:46 -0600 Subject: [PATCH 1/2] Fix for disposal pipes not vanishing under floors. This is a fix for issue #291. Disposals pipes should now properly stop displaying when a floor is placed on top of them. --- code/modules/recycling/disposal-construction.dm | 9 +++++++++ code/modules/recycling/disposal.dm | 3 +++ 2 files changed, 12 insertions(+) diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm index b2760755836..c44220bc3f1 100644 --- a/code/modules/recycling/disposal-construction.dm +++ b/code/modules/recycling/disposal-construction.dm @@ -91,6 +91,9 @@ if(invisibility) // if invisible, fade icon alpha = 128 + else + alpha = 255 + //otherwise burying half-finished pipes under floors causes them to half-fade // hide called by levelupdate if turf intact status changes // change visibility status and force update of icon @@ -318,3 +321,9 @@ else user << "You need to attach it to the plating first!" return + +/obj/structure/disposalconstruct/hides_under_flooring() + if(anchored) + return 1 + else + return 0 diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index d764d56e555..a11bf15a248 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -940,6 +940,9 @@ expel(H, T, 0) ..() +/obj/structure/disposalpipe/hides_under_flooring() + return 1 + // *** TEST verb //client/verb/dispstop() // for(var/obj/structure/disposalholder/H in world) From 1c2917fdd9a36fa8297f64d1e39f243123de93db Mon Sep 17 00:00:00 2001 From: Merchoven Date: Thu, 3 Dec 2015 21:07:19 -0600 Subject: [PATCH 2/2] Forgot the changelog. --- html/changelogs/magmaram-disposalfix.yml | 36 ++++++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 html/changelogs/magmaram-disposalfix.yml diff --git a/html/changelogs/magmaram-disposalfix.yml b/html/changelogs/magmaram-disposalfix.yml new file mode 100644 index 00000000000..79571d4991c --- /dev/null +++ b/html/changelogs/magmaram-disposalfix.yml @@ -0,0 +1,36 @@ +################################ +# 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 +################################# + +# Your name. +author: MagmaRam + +# 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: "Fixed a bug where disposals pipes would show up above floors despite being installed under them."