shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update glass.dm

Browse Source
This commit is contained in:
kevinz000
2020-02-24 13:58:51 -07:00
committed by GitHub
parent 1668bc598a
commit d4657df9f5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_containers/glass.dm
+3 -3
View File
@@ -32,7 +32,7 @@
var/turf/UT = get_turf(user)
var/turf/MT = get_turf(M)
var/turf/OT = get_turf(target)
log_reagent("SPLASH: attack(target mob [key_name(M)] at [COORD(MT)], from user [key_name(user)] at [COORD(UT)], target object [target[ at [COORD(OT)]) - [R]")
log_reagent("SPLASH: attack(target mob [key_name(M)] at [AREA_COORD(MT)], from user [key_name(user)] at [AREA_COORD(UT)], target object [target] at [AREA_COORD(OT)]) - [R]")
reagents.clear_reagents()
else
var/self_fed = M == user
@@ -48,11 +48,11 @@
var/turf/MT = get_turf(M)
M.visible_message("<span class='danger'>[user] feeds something to [M].</span>", "<span class='userdanger'>[user] feeds something to you.</span>")
log_combat(user, M, "fed", reagents.log_list())
log_reagent("INGESTION: FED BY: [key_name(user)] (loc [user.loc] at [COORD(UT)]) -> [key_name(M)] (loc [M.loc] at [COORD(MT)]) - [reagents.log_list())]")
log_reagent("INGESTION: FED BY: [key_name(user)] (loc [user.loc] at [AREA_COORD(UT)]) -> [key_name(M)] (loc [M.loc] at [AREA_COORD(MT)]) - [reagents.log_list())]")
else
var/turf/T = get_turf(user)
to_chat(user, "<span class='notice'>You swallow a gulp of [src].</span>")
log_reagent("INGESTION: SELF: [key_name(user)] (loc [user.loc] at [COORD(T)]) - [reagents.log_list())]")
log_reagent("INGESTION: SELF: [key_name(user)] (loc [user.loc] at [AREA_COORD(T)]) - [reagents.log_list())]")
var/fraction = min(5/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5, null, null, null, self_fed? "self swallowed" : "fed by [user]"), 5)