cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 07:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	code/modules/modular_computers/computers/modular_computer/damage.dm
This commit is contained in:
skull132
2017-05-20 19:18:35 +03:00
parent d8b6ba2c6c 5de06206e7
commit efee411ad7
9 changed files with 66 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/medical.dm
+1 -1
View File
@@ -11,7 +11,7 @@
var/heal_burn = 0
/obj/item/stack/medical/attack(mob/living/M as mob, mob/user as mob)
if (!istype(M) || istype(M, /mob/living/silicon))
if (!istype(M) || istype(M, /mob/living/silicon) || istype(M, /mob/living/simple_animal/spiderbot))
user << "<span class='warning'>\The [src] cannot be applied to [M]!</span>"
return 1
code/game/objects/items/weapons/material/kitchen.dm
+7 -1
View File
@@ -34,14 +34,20 @@
return eyestab(M,user)
else
return ..()
var/fullness = M.nutrition + (M.reagents.get_reagent_amount("nutriment") * 25)
if (reagents.total_volume > 0)
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
if(M == user)
if(!M.can_eat(loaded))
return
if (fullness > (550 * (1 + M.overeatduration / 2000)))
M <<"You cannot force anymore food down!"
return
M.visible_message("<span class='notice'>\The [user] eats some [loaded] from \the [src].</span>")
else
if (fullness > (550 * (1 + M.overeatduration / 2000)))
M <<"You cannot force anymore food down their throat!"
return
user.visible_message("<span class='warning'>\The [user] begins to feed \the [M]!</span>")
if(!(M.can_force_feed(user, loaded) && do_mob(user, M, 5 SECONDS)))
return