From 209bd24bbbf0e07b53aef1f88e9c6078fad6a464 Mon Sep 17 00:00:00 2001 From: ReoDaProtovali <84661000+ReoDaProtovali@users.noreply.github.com> Date: Sun, 29 Sep 2024 22:50:47 -0500 Subject: [PATCH] Finished. Scrubbed out a few last bugs --- .../code/machinery/feeding_tube_industrial.dm | 24 +++++++++++++----- .../icons/obj/feeding_tube_industrial.dmi | Bin 2854 -> 5656 bytes 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/GainStation13/code/machinery/feeding_tube_industrial.dm b/GainStation13/code/machinery/feeding_tube_industrial.dm index 7de83343fa..ddf73f97f3 100644 --- a/GainStation13/code/machinery/feeding_tube_industrial.dm +++ b/GainStation13/code/machinery/feeding_tube_industrial.dm @@ -42,7 +42,7 @@ ..() pump_limit = 0 for(var/obj/item/stock_parts/matter_bin/mb in contents) - if(pump_stuff.Find(mb)) //stuff we're going to pump are not being used to build us. + if(mb in pump_stuff) //stuff we're going to pump are not being used to build us. continue pump_limit += mb.rating * 2.5 // ~20 items per pump with 2 bluespace bins @@ -156,7 +156,8 @@ else tube_overlay.icon_state = "tube-idle" - add_overlay("light-[clogged ? "r" : "g"]") + if(welded) //if we're not welded, dont show our light on. + add_overlay("light-[clogged ? "r" : "g"]") add_overlay(tube_overlay) @@ -368,6 +369,8 @@ playsound(src, 'sound/items/welder2.ogg', 100, 1) if(I.use_tool(src, user, 20)) + update_icon() + playsound(src, 'sound/items/welder.ogg', 100, 1) if(welded) to_chat(user, "You slice the floorweld off [src].") welded = FALSE @@ -381,8 +384,10 @@ else + playsound(src, 'sound/items/welder2.ogg', 100, 1) to_chat(user, "You begin deconstructing \the [src]") if(I.use_tool(src, user, 30)) + playsound(src, 'sound/items/welder.ogg', 100, 1) deconstruct(TRUE) return TRUE @@ -391,24 +396,29 @@ /obj/structure/disposaloutlet/industrial_feeding_tube/container_resist(mob/living/user) if(user.stat || !clogged) //If it's not clogged, they'll be ejected soon... One way or another. return - playsound(src, "clang", 50) + playsound(src, 'sound/effects/clang.ogg', 50) visible_message("\The [src] loudly clongs as something inside tries to break free!") if(do_after(user, 100)) unclog() -/obj/structure/disposaloutlet/industrial_feeding_tube/proc/clog(list/clog_junk) +/obj/structure/disposaloutlet/industrial_feeding_tube/proc/clog(list/clog_junk, loud = TRUE) clogged = TRUE for(var/atom/movable/AM in clog_junk) - if(!pump_stuff.Find(AM)) + if(!(AM in pump_stuff)) pump_stuff += AM - - playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 1) + AM.forceMove(src) + + + update_icon() + if(loud) + playsound(src, 'sound/machines/warning-buzzer.ogg', 50, 1) /obj/structure/disposaloutlet/industrial_feeding_tube/proc/unclog() spew(pump_stuff) clogged = FALSE + update_icon() /obj/structure/disposaloutlet/industrial_feeding_tube/proc/spew(var/list/spew_stuff, playsound = FALSE) var/turf/T = get_turf(src) diff --git a/GainStation13/icons/obj/feeding_tube_industrial.dmi b/GainStation13/icons/obj/feeding_tube_industrial.dmi index 99adb797ecc03568c9de501e1dd672974b1b7e2d..058e5f47c1e60f6af24007edbafba2c5da0947f5 100644 GIT binary patch delta 5499 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 T8Z*%R|3IEd??d$mPo@4Jb(N5v