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

Merge pull request #8140 from phil235/doughbeakerfix

Browse Source 
Improvised heating fixes
This commit is contained in:
Cheridan
2015-03-05 22:58:44 -06:00
parent 07676b352d bb10824737
commit 8fa6b3edea
3 changed files with 30 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/food&drinks/food/snacks/dough.dm
-19
View File
@@ -2,25 +2,6 @@
/////////////////// Dough Ingredients ////////////////////////
// Flour + egg = dough
/obj/item/weapon/reagent_containers/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg))
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = W
if(flags & OPENCONTAINER)
if(reagents)
if(reagents.has_reagent("flour"))
if(reagents.get_reagent_amount("flour") >= 15)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(src))
user << "<span class='notice'>You mix egg and flour to make some dough.</span>"
reagents.remove_reagent("flour", 15)
if(E.reagents)
E.reagents.trans_to(S,E.reagents.total_volume)
qdel(E)
else
user << "<span class='notice'>Not enough flour to make dough.</span>"
return
..()
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
desc = "A piece of dough."
code/modules/reagents/reagent_containers.dm
+18
View File
@@ -77,3 +77,21 @@
return 0
return 1
/obj/item/weapon/reagent_containers/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if(istype(W,/obj/item/weapon/reagent_containers/food/snacks/egg)) //making dough
var/obj/item/weapon/reagent_containers/food/snacks/egg/E = W
if(flags & OPENCONTAINER)
if(reagents)
if(reagents.has_reagent("flour"))
if(reagents.get_reagent_amount("flour") >= 15)
var/obj/item/weapon/reagent_containers/food/snacks/S = new /obj/item/weapon/reagent_containers/food/snacks/dough(get_turf(src))
user << "<span class='notice'>You mix egg and flour to make some dough.</span>"
reagents.remove_reagent("flour", 15)
if(E.reagents)
E.reagents.trans_to(S,E.reagents.total_volume)
qdel(E)
else
user << "<span class='notice'>Not enough flour to make dough.</span>"
return
..()
code/modules/reagents/reagent_containers/glass.dm
+12 -6
View File
@@ -91,12 +91,18 @@
/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()
var/hotness = is_hot(I)
if(hotness)
var/added_heat = (hotness / 100) //ishot returns a temperature
if(reagents)
if(reagents.chem_temp < hotness) //can't be heated to be hotter than the source
reagents.chem_temp += added_heat
user << "<span class='notice'>You heat [src] with [I].</span>"
reagents.handle_reactions()
else
user << "<span class='warning'>[src] is already hotter than [I].</span>"
..()
/obj/item/weapon/reagent_containers/glass/beaker
name = "beaker"