Skip to content

Commit

Permalink
Кухня и ксенобио будут мне сосать после такого
Browse files Browse the repository at this point in the history
  • Loading branch information
FlitchTime committed Dec 10, 2024
1 parent e9aa08a commit 39a712e
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 5 deletions.
23 changes: 21 additions & 2 deletions code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,25 @@
to_chat(user, span_warning("You have no idea how to cook with [I]."))
return ATTACK_CHAIN_PROCEED|ATTACK_CHAIN_NO_AFTERATTACK

/obj/machinery/kitchen_machine/AltClick(mob/user)
var/mob/living/carbon/human/human = user
if(!istype(human))
return
if(operating)
return

add_fingerprint(user)
cook()

/obj/machinery/kitchen_machine/CtrlShiftClick(mob/user)
var/mob/living/carbon/human/human = user
if(!istype(human))
return
if(operating)
return

add_fingerprint(user)
dispose()

/obj/machinery/kitchen_machine/screwdriver_act(mob/living/user, obj/item/I)
. = TRUE
Expand Down Expand Up @@ -322,7 +341,7 @@
* Machine Menu Handling/Cooking *
************************************/

/obj/machinery/kitchen_machine/proc/cook()
/obj/machinery/kitchen_machine/proc/cook(mob/user)
if(stat & (NOPOWER|BROKEN))
return
start()
Expand Down Expand Up @@ -458,7 +477,7 @@
update_icon(UPDATE_ICON_STATE)
updateUsrDialog()

/obj/machinery/kitchen_machine/proc/dispose()
/obj/machinery/kitchen_machine/proc/dispose(mob/user)
for(var/obj/O in contents)
O.forceMove(loc)
if(reagents.total_volume)
Expand Down
23 changes: 20 additions & 3 deletions code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,6 @@
return
default_unfasten_wrench(user, I)


/obj/machinery/reagentgrinder/attackby(obj/item/I, mob/user, params)
if(user.a_intent == INTENT_HARM)
return ..()
Expand Down Expand Up @@ -232,7 +231,25 @@
updateUsrDialog()
return ATTACK_CHAIN_BLOCKED_ALL

/obj/machinery/reagentgrinder/AltClick(mob/user)
var/mob/living/carbon/human/human = user
if(!istype(human))
return
if(operating)
return

add_fingerprint(user)
grind(user)

/obj/machinery/reagentgrinder/CtrlShiftClick(mob/user)
var/mob/living/carbon/human/human = user
if(!istype(human))
return
if(operating)
return

add_fingerprint(user)
detach(user)

/obj/machinery/reagentgrinder/attack_ai(mob/user)
return FALSE
Expand Down Expand Up @@ -307,7 +324,7 @@
if ("detach")
detach()

/obj/machinery/reagentgrinder/proc/detach()
/obj/machinery/reagentgrinder/proc/detach(mob/user)

if (usr.stat != 0)
return
Expand Down Expand Up @@ -409,7 +426,7 @@

remove_object(O)

/obj/machinery/reagentgrinder/proc/grind()
/obj/machinery/reagentgrinder/proc/grind(mob/user)

power_change()
if(stat & (NOPOWER|BROKEN))
Expand Down

0 comments on commit 39a712e

Please sign in to comment.