Merge pull request #16106 from sheepishgoat/chem-grinder-change

Chem grinder change
This commit is contained in:
deathride58
2024-10-23 19:22:11 -04:00
committed by GitHub
@@ -13,28 +13,40 @@
. = ..() . = ..()
AddComponent(/datum/component/plumbing/simple_supply, bolt) AddComponent(/datum/component/plumbing/simple_supply, bolt)
/obj/machinery/plumbing/grinder_chemical/can_be_rotated(mob/user,rotation_type) /obj/machinery/plumbing/grinder_chemical/examine(mob/user)
. = ..()
. += span_notice("The input direction for this item can be rotated by using CTRL+SHIFT+CLICK")
/obj/machinery/plumbing/grinder_chemical/CtrlShiftClick(mob/user)
if(anchored) if(anchored)
to_chat(user, "<span class='warning'>It is fastened to the floor!</span>") to_chat(user, "<span class='warning'>It is fastened to the floor!</span>")
return FALSE return FALSE
switch(eat_dir) switch(eat_dir)
if(WEST) if(WEST)
balloon_alert(user, "set to north")
eat_dir = NORTH eat_dir = NORTH
return TRUE return TRUE
if(EAST) if(EAST)
balloon_alert(user, "set to south")
eat_dir = SOUTH eat_dir = SOUTH
return TRUE return TRUE
if(NORTH) if(NORTH)
balloon_alert(user, "set to east")
eat_dir = EAST eat_dir = EAST
return TRUE return TRUE
if(SOUTH) if(SOUTH)
balloon_alert(user, "set to west")
eat_dir = WEST eat_dir = WEST
return TRUE return TRUE
return TRUE
/obj/machinery/plumbing/grinder_chemical/CanAllowThrough(atom/movable/AM) /obj/machinery/plumbing/grinder_chemical/CanAllowThrough(atom/movable/AM)
. = ..() . = ..()
if(!anchored) if(!anchored)
return return
var/move_dir = get_dir(loc, AM.loc) var/move_dir = get_dir(loc, AM.loc)
if(move_dir == eat_dir) if(move_dir == eat_dir)
return TRUE return TRUE
@@ -61,4 +73,8 @@
return return
I.on_grind() I.on_grind()
reagents.add_reagent_list(I.grind_results) reagents.add_reagent_list(I.grind_results)
if(I.reagents) //If the thing has any reagents inside of it, grind them up.
I.reagents.trans_to(reagents, I.reagents.total_volume)
qdel(I) qdel(I)