mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Misc disposal fixes (#22666)
Stickers can no longer be attached to disposal machinery or conveyors, to prevent further issues with throwing them there. The disposal outlet sprite was set to face the wrong direction when expelling items, for two of its directions. This was fixed. The disposal UI constantly reopening itself was fixed. And a set of disposal systems were added to runtime for easier debugging. <img width="344" height="385" alt="image" src="https://github.com/user-attachments/assets/ff93f3e9-bfa7-480c-9d6b-c501b02ca51a" />
This commit is contained in:
@@ -195,6 +195,9 @@
|
||||
..()
|
||||
update()
|
||||
|
||||
/obj/structure/machinery/conveyor/can_attach_sticker(mob/user, obj/item/sticker/S)
|
||||
return FALSE
|
||||
|
||||
// the conveyor control switch
|
||||
//
|
||||
//
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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."
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 33 KiB After Width: | Height: | Size: 35 KiB |
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user