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

Merge branch 'master' into development

Browse Source 
# Conflicts:
#	maps/aurora/aurora-3_sublevel.dmm
#	maps/aurora/aurora-4_mainlevel.dmm
#	maps/aurora/aurora-5_interstitial.dmm
This commit is contained in:
skull132
2018-05-13 19:19:52 +03:00
parent caaed22df2 c0db238c11
commit 674cd94714
21 changed files with 2159 additions and 1752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/food/snacks.dm
+12 -8
View File
@@ -36,17 +36,21 @@
if (nutriment_amt)
reagents.add_reagent(nutriment_type, nutriment_amt, nutriment_desc)
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/M)
/obj/item/weapon/reagent_containers/food/snacks/proc/On_Consume(var/mob/eater, var/mob/feeder = null)
if(!reagents.total_volume)
M.visible_message("<span class='notice'>[M] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
M.drop_from_inventory(src) //so icons update :[
eater.visible_message("<span class='notice'>[eater] finishes eating \the [src].</span>","<span class='notice'>You finish eating \the [src].</span>")
if (!feeder)
feeder = eater
feeder.drop_from_inventory(src) //so icons update :[
if(trash)
if(ispath(trash,/obj/item))
var/obj/item/TrashItem = new trash(M)
M.put_in_hands(TrashItem)
var/obj/item/TrashItem = new trash(feeder)
feeder.put_in_hands(TrashItem)
else if(istype(trash,/obj/item))
M.put_in_hands(trash)
feeder.put_in_hands(trash)
qdel(src)
return
@@ -114,7 +118,7 @@
else
reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST)
bitecount++
On_Consume(M)
On_Consume(M, user)
return 1
else if (isanimal(M))
@@ -144,7 +148,7 @@
user.visible_message("<span class='notice'>[user] feeds [M] a tiny bit of [src]. <b>It looks full.</b></span>")
if (!istype(M.loc, /turf))
M << "<span class='notice'>[user] feeds you a tiny bit of [src]. <b>You feel pretty full!</b></span>"
On_Consume(M)
On_Consume(M, user)
return 1
else
user << "<span class='danger'>[M.name] can't stomach anymore food!</span>"