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

Completely fixed the microwave to display and handle the cheese_amount var properly.

Browse Source 
Included Skie's fix of the syringe gun firing at the table when placed on it.

ENOUGH WITH MY SILLY SMALL REVS.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@64 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
polyxenitopalidou
2010-09-06 09:03:29 +00:00
parent 325346360b
commit c0a9db6274
3 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -224,6 +224,9 @@
proc proc
fire_syringe(atom/target, mob/user) fire_syringe(atom/target, mob/user)
if (locate (/obj/table, src.loc))
return
else
var/turf/trg = get_turf(target) var/turf/trg = get_turf(target)
var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src)) var/obj/syringe_gun_dummy/D = new/obj/syringe_gun_dummy(get_turf(src))
var/obj/item/weapon/reagent_containers/syringe/S = syringes[1] var/obj/item/weapon/reagent_containers/syringe/S = syringes[1]

1
code/defines/obj/machinery.dm
View File

@@ -630,6 +630,7 @@
var/flour_amount = 0 //Current amount of flour inside var/flour_amount = 0 //Current amount of flour inside
var/water_amount = 0 //Current amount of water inside var/water_amount = 0 //Current amount of water inside
var/monkeymeat_amount = 0 var/monkeymeat_amount = 0
var/cheese_amount = 0 //cheese inside, yo
var/humanmeat_amount = 0 var/humanmeat_amount = 0
var/donkpocket_amount = 0 var/donkpocket_amount = 0
var/xenomeat_amount = 0 var/xenomeat_amount = 0

5
code/game/machinery/microwave.dm
View File

@@ -232,6 +232,7 @@ Please clean it before use!</TT><BR>
dat = {" dat = {"
<B>Eggs:</B>[src.egg_amount] eggs<BR> <B>Eggs:</B>[src.egg_amount] eggs<BR>
<B>Flour:</B>[src.flour_amount] cups of flour<BR> <B>Flour:</B>[src.flour_amount] cups of flour<BR>
<B>Cheese:</B>[src.cheese_amount] cheese wedges<BR>
<B>Monkey Meat:</B>[src.monkeymeat_amount] slabs of meat<BR> <B>Monkey Meat:</B>[src.monkeymeat_amount] slabs of meat<BR>
<B>Meat Turnovers:</B>[src.donkpocket_amount] turnovers<BR> <B>Meat Turnovers:</B>[src.donkpocket_amount] turnovers<BR>
<B>Other Meat:</B>[src.humanmeat_amount] slabs of meat<BR> <B>Other Meat:</B>[src.humanmeat_amount] slabs of meat<BR>
@@ -275,6 +276,7 @@ Please clean it before use!</TT><BR>
src.egg_amount = 0 // If so remove all the eggs src.egg_amount = 0 // If so remove all the eggs
src.flour_amount = 0 // And the flour src.flour_amount = 0 // And the flour
src.water_amount = 0 //And the water src.water_amount = 0 //And the water
src.cheese_amount = 0 //And the cheese
src.monkeymeat_amount = 0 src.monkeymeat_amount = 0
src.humanmeat_amount = 0 src.humanmeat_amount = 0
src.donkpocket_amount = 0 src.donkpocket_amount = 0
@@ -288,6 +290,7 @@ Please clean it before use!</TT><BR>
src.updateUsrDialog() src.updateUsrDialog()
src.egg_amount = 0 //Clear all the values as this crap is what makes the mess inside!! src.egg_amount = 0 //Clear all the values as this crap is what makes the mess inside!!
src.flour_amount = 0 src.flour_amount = 0
src.cheese_amount = 0
src.water_amount = 0 src.water_amount = 0
src.humanmeat_amount = 0 src.humanmeat_amount = 0
src.monkeymeat_amount = 0 src.monkeymeat_amount = 0
@@ -311,6 +314,7 @@ Please clean it before use!</TT><BR>
src.updateUsrDialog() src.updateUsrDialog()
src.egg_amount = 0 //Clear all the values as this crap is gone when it breaks!! src.egg_amount = 0 //Clear all the values as this crap is gone when it breaks!!
src.flour_amount = 0 src.flour_amount = 0
src.cheese_amount = 0
src.water_amount = 0 src.water_amount = 0
src.humanmeat_amount = 0 src.humanmeat_amount = 0
src.monkeymeat_amount = 0 src.monkeymeat_amount = 0
@@ -339,6 +343,7 @@ Please clean it before use!</TT><BR>
if(operation == 2) // If dispose was pressed, empty the microwave if(operation == 2) // If dispose was pressed, empty the microwave
src.egg_amount = 0 src.egg_amount = 0
src.flour_amount = 0 src.flour_amount = 0
src.cheese_amount = 0
src.water_amount = 0 src.water_amount = 0
src.humanmeat_amount = 0 src.humanmeat_amount = 0
src.monkeymeat_amount = 0 src.monkeymeat_amount = 0