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

Merge remote-tracking branch 'origin/master' into development

Browse Source
This commit is contained in:
skull132
2016-06-22 10:56:26 -04:00
parent cd012f1055 254595dfc4
commit 5d85c7c06f
27 changed files with 250 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
+1 -18
View File
@@ -158,24 +158,7 @@
T.visible_message("<span class='warning'>The water sizzles as it lands on \the [T]!</span>")
else if(volume >= 10)
if(T.wet >= 1)
return
T.wet = 1
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800) // This is terrible and needs to be changed when possible.
if(!T || !istype(T))
return
if(T.wet >= 2)
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor(1)
/datum/reagent/water/touch_obj(var/obj/O)
if(istype(O, /obj/item/weapon/reagent_containers/food/snacks/monkeycube))
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+6 -23
View File
@@ -165,24 +165,7 @@
qdel(hotspot)
if(volume >= 3)
if(T.wet >= 1)
return
T.wet = 1
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_overlay = image('icons/effects/water.dmi',T,"wet_floor")
T.overlays += T.wet_overlay
spawn(800) // This is terrible and needs to be changed when possible.
if(!T || !istype(T))
return
if(T.wet >= 2)
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor()
/datum/reagent/nutriment/virus_food
name = "Virus Food"
@@ -1996,7 +1979,7 @@
glass_desc = "A mug of a rich strong roast, you think it could be a lot better if someone added something extra to it."
/datum/reagent/drink/white_coffee
name = "Café Au Lait"
name = "Café Au Lait"
id = "white_coffee"
description = "A fancy name for something thats just coffee and milk."
color = "#482000"
@@ -2007,7 +1990,7 @@
overdose = 40
glass_icon_state = "whitecoffee"
glass_name = "A mug of Café Au Lait"
glass_name = "A mug of Café Au Lait"
glass_desc = "A fancy name for something thats just coffee and milk."
/datum/reagent/drink/white_coffee/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
@@ -2015,7 +1998,7 @@
M.heal_organ_damage(0.5 * removed, 0)
/datum/reagent/drink/cafe_melange
name = "Café Mélange"
name = "Café Mélange"
id = "cafe_melange"
description = "A delicious mug of creamy coffee."
color = "#482000"
@@ -2026,9 +2009,9 @@
overdose = 40
glass_icon_state = "whitecoffee"
glass_name = "A mug of Café Mélange"
glass_name = "A mug of Café Mélange"
glass_desc = "A delicious mug of creamy coffee, keeps you cool headed in the most heated of situations."
/datum/reagent/drink/cafe_melange/affect_ingest(var/mob/living/carbon/M, var/alien, var/removed)
..()
M.reagents.add_reagent("kelotane", removed * 0.2)
M.reagents.add_reagent("kelotane", removed * 0.2)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
+2 -11
View File
@@ -329,17 +329,8 @@
if(!istype(T))
return
if(volume >= 1)
if(T.wet >= 2)
return
T.wet = 2
spawn(800)
if(!T || !istype(T))
return
T.wet = 0
if(T.wet_overlay)
T.overlays -= T.wet_overlay
T.wet_overlay = null
T.wet_floor(2)
/datum/reagent/silicate
name = "Silicate"
id = "silicate"