diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 662548f3712..f3214f7f33e 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -195,6 +195,9 @@ ..() update() +/obj/structure/machinery/conveyor/can_attach_sticker(mob/user, obj/item/sticker/S) + return FALSE + // the conveyor control switch // // diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index 95c251bc042..45f41abcb16 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -497,7 +497,7 @@ feedback_inc("disposal_auto_flush",1) flush() flush_count = 0 - src.updateDialog() + SStgui.update_uis(src) // If we're ready, don't draw any extra power if(mode == MODE_READY || !uses_air) @@ -654,6 +654,8 @@ else return ..() +/obj/structure/machinery/disposal/can_attach_sticker(mob/user, obj/item/sticker/S) + return FALSE /** * Virtual disposal object diff --git a/html/changelogs/DisposalStuffFix.yml b/html/changelogs/DisposalStuffFix.yml new file mode 100644 index 00000000000..34d2f006942 --- /dev/null +++ b/html/changelogs/DisposalStuffFix.yml @@ -0,0 +1,11 @@ + +author: TheGreyWolf + +delete-after: True + +changes: + - bugfix: "Fixed disposal UI forcing itself open if a player kept standing near it after closing the UI." + - bugfix: "Fixed the inability to put stickers in disposal bins." + - bugfix: "Fixed potential issues with attaching stickers to conveyor belts." + - bugfix: "Fixed the disposal outlet using the wrong direction for sprites." + - rscadd: "Added a disposal system to the runtime map." diff --git a/icons/obj/disposals.dmi b/icons/obj/disposals.dmi index afe67c6e379..671c0f68d58 100644 Binary files a/icons/obj/disposals.dmi and b/icons/obj/disposals.dmi differ diff --git a/maps/runtime/runtime.dmm b/maps/runtime/runtime.dmm index eccc522d57b..d080850fbbc 100644 --- a/maps/runtime/runtime.dmm +++ b/maps/runtime/runtime.dmm @@ -163,6 +163,10 @@ /area/construction/storage) "aD" = ( /obj/structure/machinery/alarm/west, +/obj/structure/disposalpipe/trunk, +/obj/structure/disposaloutlet{ + dir = 1 + }, /turf/simulated/floor/tiled/full, /area/hallway/primary/central_one) "aE" = ( @@ -3969,6 +3973,15 @@ }, /turf/simulated/floor/tiled/gridded, /area/construction/storage) +"tO" = ( +/obj/structure/machinery/light/spot{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_one) "tT" = ( /obj/effect/floor_decal/corner/yellow{ dir = 4 @@ -5471,6 +5484,13 @@ /obj/structure/lattice/catwalk/indoor, /turf/simulated/open, /area/hallway/primary/central_two) +"CS" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/machinery/disposal/small/north, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_one) "CT" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -6554,6 +6574,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 9 }, +/obj/structure/reagent_dispensers/acid, /turf/simulated/floor/tiled/white, /area/hallway/primary/central_one) "Jc" = ( @@ -8183,6 +8204,13 @@ /obj/structure/machinery/vending/engivend, /turf/simulated/floor/tiled/gridded, /area/hallway/primary/central_one) +"Ti" = ( +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/machinery/disposal/deliveryChute, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_one) "Tj" = ( /obj/structure/lattice, /obj/structure/machinery/atmospherics/pipe/simple/heat_exchanging{ @@ -8852,7 +8880,10 @@ /obj/effect/floor_decal/industrial/warning{ dir = 10 }, -/obj/structure/reagent_dispensers/acid, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/structure/machinery/disposal, /turf/simulated/floor/tiled/white, /area/hallway/primary/central_one) "Xi" = ( @@ -8997,6 +9028,12 @@ }, /turf/simulated/floor/tiled/gridded, /area/hallway/primary/central_one) +"XT" = ( +/obj/structure/disposalpipe/junction{ + dir = 1 + }, +/turf/simulated/floor/tiled/full, +/area/hallway/primary/central_one) "XU" = ( /obj/effect/floor_decal/industrial/outline/medical, /obj/structure/machinery/atmospherics/omni/filter{ @@ -10990,9 +11027,9 @@ dq dq dq aD -ia -dq -dq +tO +XT +Ti dq dq dq @@ -11248,7 +11285,7 @@ zP zM Op Xe -dq +CS wL CI Vm