cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-27 15:17:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8083 from Delimusca/getochemboyz

Browse Source 
added improvised heating
This commit is contained in:
Cheridan
2015-03-02 08:58:12 -06:00
parent 1ef6cf1229 70aaa9e693
commit 2be30eb89e
4 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/drinks/drinks.dm
+10
View File
@@ -95,6 +95,16 @@
return
/obj/item/weapon/reagent_containers/food/drinks/attackby(var/obj/item/I, mob/user as mob, params)
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
var/added_heat = (is_hot(I) / 100) //ishot returns a temperature
if(src.reagents)
src.reagents.chem_temp += added_heat
user << "<span class='notice'>You heat [src] with [I].</span>"
src.reagents.handle_reactions()
////////////////////////////////////////////////////////////////////////////////
/// Drinks. END
////////////////////////////////////////////////////////////////////////////////
code/modules/reagents/reagent_containers/glass.dm
+11
View File
@@ -88,6 +88,15 @@
reagents.reaction(target, TOUCH)
reagents.clear_reagents()
/obj/item/weapon/reagent_containers/glass/attackby(var/obj/item/I, mob/user as mob, params)
if(istype(I, /obj/item/clothing/mask/cigarette)) //ciggies are weird
return
if(is_hot(I))
var/added_heat = (is_hot(I) / 100) //ishot returns a temperature
if(src.reagents)
src.reagents.chem_temp += added_heat
user << "<span class='notice'>You heat [src] with [I].</span>"
src.reagents.handle_reactions()
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"
@@ -211,3 +220,5 @@
user.put_in_hands(new /obj/item/weapon/bucket_sensor)
user.unEquip(src)
qdel(src)
else
..()