Couple more recycling tweaks

Added a button for garbage grinder that can be pressed without needing to open the windoor.
Fixed AI/borg interaction with the grinder.
Added a var to toggle the recycling crusher's manual feeding, which the grinder will toggle off for it. (borg modules will no longer be eaten out of their slots)
Made the crusher start upgraded to full efficiency.
Also fixed the funned up poster near the entrance.
This commit is contained in:
Verkister
2023-04-10 12:26:30 +03:00
parent 7c3d3a6772
commit 5024b2977c
3 changed files with 32 additions and 8 deletions

View File

@@ -6,6 +6,7 @@
var/working = FALSE var/working = FALSE
var/negative_dir = null //VOREStation Addition var/negative_dir = null //VOREStation Addition
var/hand_fed = TRUE //CHOMPAdd
/obj/machinery/recycling/process() /obj/machinery/recycling/process()
return PROCESS_KILL // these are all stateful return PROCESS_KILL // these are all stateful
@@ -33,7 +34,8 @@
return return
if(default_part_replacement(user, O)) if(default_part_replacement(user, O))
return return
if(!hand_fed) //CHOMPAdd
return
var/mob/living/M = user var/mob/living/M = user
if(can_accept_item(O)) if(can_accept_item(O))
M.drop_from_inventory(O) M.drop_from_inventory(O)

View File

@@ -51254,10 +51254,6 @@
}, },
/turf/simulated/floor/carpet/sblucarpet, /turf/simulated/floor/carpet/sblucarpet,
/area/medical/medbay2) /area/medical/medbay2)
"gRP" = (
/obj/structure/sign/poster,
/turf/simulated/wall,
/area/quartermaster/delivery)
"gSn" = ( "gSn" = (
/obj/structure/window/reinforced, /obj/structure/window/reinforced,
/obj/structure/window/reinforced{ /obj/structure/window/reinforced{
@@ -55497,6 +55493,10 @@
/obj/structure/sign/warning/moving_parts{ /obj/structure/sign/warning/moving_parts{
pixel_x = -32 pixel_x = -32
}, },
/obj/machinery/button/garbosystem{
pixel_y = 17;
pixel_x = 10
},
/turf/simulated/floor/plating, /turf/simulated/floor/plating,
/area/quartermaster/warehouse) /area/quartermaster/warehouse)
"jfz" = ( "jfz" = (
@@ -77788,6 +77788,9 @@
d2 = 2; d2 = 2;
icon_state = "1-2" icon_state = "1-2"
}, },
/obj/structure/sign/poster{
dir = 8
},
/turf/simulated/floor/tiled/steel_grid, /turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/delivery) /area/quartermaster/delivery)
"vXB" = ( "vXB" = (
@@ -103066,7 +103069,7 @@ gpI
gck gck
bud bud
bud bud
gRP bud
bGn bGn
xlj xlj
aXQ aXQ

View File

@@ -10,6 +10,7 @@
active_power_usage = 100 active_power_usage = 100
var/operating = FALSE var/operating = FALSE
var/obj/machinery/recycling/crusher/crusher //Connects to regular crusher var/obj/machinery/recycling/crusher/crusher //Connects to regular crusher
var/obj/machinery/button/garbosystem/button
var/list/affecting var/list/affecting
var/voracity = 5 //How much stuff is swallowed at once. var/voracity = 5 //How much stuff is swallowed at once.
@@ -17,13 +18,20 @@
. = ..() . = ..()
for(var/dir in cardinal) for(var/dir in cardinal)
src.crusher = locate(/obj/machinery/recycling/crusher, get_step(src, dir)) src.crusher = locate(/obj/machinery/recycling/crusher, get_step(src, dir))
if(src.crusher) break src.button = locate(/obj/machinery/button/garbosystem, get_step(src, dir))
if(crusher)
crusher.hand_fed = FALSE
if(button)
button.grinder = src
return return
/obj/machinery/v_garbosystem/attack_hand(mob/living/user as mob) /obj/machinery/v_garbosystem/attack_hand(mob/living/user as mob)
operating = !operating operating = !operating
update() update()
/obj/machinery/v_garbosystem/attack_ai(mob/user as mob)
return attack_hand(user)
/obj/machinery/v_garbosystem/power_change() /obj/machinery/v_garbosystem/power_change()
if((. = ..())) if((. = ..()))
update() update()
@@ -115,4 +123,15 @@
return return
else else
to_chat(user, "Unable to empty filter while the machine is running.") to_chat(user, "Unable to empty filter while the machine is running.")
return ..() return ..()
/obj/machinery/button/garbosystem
name = "garbage grinder switch"
desc = "A power button for the big grinder."
icon = 'icons/obj/machines/doorbell_vr.dmi'
icon_state = "doorbell-standby"
var/obj/machinery/v_garbosystem/grinder
/obj/machinery/button/garbosystem/attack_hand(mob/living/user as mob)
if(grinder)
return grinder.attack_hand(user)