cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze

Browse Source
This commit is contained in:
Zuhayr
2015-08-16 05:40:47 -07:00
parent 34d99c9dce 122d74acc1
commit 7e8713039a
6 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/reagents/Chemistry-Holder.dm
View File

@@ -386,7 +386,7 @@
if(!target)
return
var/datum/reagents/R = new /datum/reagents(maximum_volume)
var/datum/reagents/R = new /datum/reagents(amount * multiplier)
. = trans_to_holder(R, amount, multiplier, copy)
R.touch_turf(target)
return
@@ -396,7 +396,7 @@
return
if(!target.reagents)
var/datum/reagents/R = new /datum/reagents(maximum_volume)
var/datum/reagents/R = new /datum/reagents(amount * multiplier)
. = trans_to_holder(R, amount, multiplier, copy)
R.touch_obj(target)
return

8
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
View File

@@ -563,7 +563,6 @@
adj_drowsy = -3
adj_sleepy = -2
adj_temp = 25
overdose = 45
glass_icon_state = "hot_coffee"
glass_name = "cup of coffee"
@@ -575,11 +574,8 @@
return
if(adj_temp > 0)
holder.remove_reagent("frostoil", 10 * removed)
/datum/reagent/drink/coffee/overdose(var/mob/living/carbon/M, var/alien)
if(alien == IS_DIONA)
return
M.make_jittery(5)
if(dose > 45)
M.make_jittery(5)
/datum/reagent/drink/coffee/icecoffee
name = "Iced Coffee"