cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-30 16:47:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixes utensils, adds variable scoop size (#8165)

Browse Source 
* Fixes utensils, adds variable scoop size

* Update code/game/objects/items/weapons/material/kitchen.dm
This commit is contained in:
MarinaGryphon
2021-07-11 20:58:28 -09:00
committed by GitHub
parent 351c82238e
commit ae1ec55bf3
4 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food/food/snacks.dm
+1 -18
View File
@@ -160,24 +160,7 @@
// Eating with forks
if(istype(W,/obj/item/weapon/material/kitchen/utensil))
var/obj/item/weapon/material/kitchen/utensil/U = W
if(!U.reagents)
U.create_reagents(5)
if (U.reagents.total_volume > 0)
to_chat(user, "<font color='red'>You already have something on your [U].</font>")
return
user.visible_message( \
"[user] scoops up some [src] with \the [U]!", \
"<font color='blue'>You scoop up some [src] with \the [U]!</font>" \
)
bitecount++
reagents.trans_to_obj(U, min(reagents.total_volume,5))
if (reagents.total_volume <= 0)
qdel(src)
U.load_food(user, src)
return
if (is_sliceable())
code/modules/mob/living/carbon/human/human_helpers.dm
+2 -2
View File
@@ -8,7 +8,7 @@
return 1
if(feedback)
if(status[1] == HUMAN_EATING_NO_MOUTH)
to_chat(src, "Where do you intend to put \the [food]? You don't have a mouth!")
to_chat(src, "Where do you intend to put [food]? You don't have a mouth!")
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
to_chat(src, "<span class='warning'>\The [status[2]] is in the way!</span>")
return 0
@@ -19,7 +19,7 @@
return 1
if(feedback)
if(status[1] == HUMAN_EATING_NO_MOUTH)
to_chat(feeder, "Where do you intend to put \the [food]? \The [src] doesn't have a mouth!")
to_chat(feeder, "Where do you intend to put [food]? \The [src] doesn't have a mouth!")
else if(status[1] == HUMAN_EATING_BLOCKED_MOUTH)
to_chat(feeder, "<span class='warning'>\The [status[2]] is in the way!</span>")
return 0