cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-22 04:22:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert #3316 from BEF due to compile errors and (assumed) missing files.

Browse Source 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-07-20 18:38:00 +01:00
parent f29cd5946f
commit adc3c14779
13 changed files with 79 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/reagent_dispenser.dm
+9 -42
View File
@@ -1,3 +1,5 @@
/obj/structure/reagent_dispensers
name = "Dispenser"
desc = "..."
@@ -64,6 +66,12 @@
new /obj/effect/effect/water(src.loc)
del(src)
//Dispensers
/obj/structure/reagent_dispensers/watertank
name = "watertank"
@@ -71,39 +79,10 @@
icon = 'icons/obj/objects.dmi'
icon_state = "watertank"
amount_per_transfer_from_this = 10
m_amt = 7500
g_amt = 3750
fire_min_burn_temp = 800
fire_burn_multiplier = 0.75
fire_fuel_worth = 0
New()
..()
reagents.add_reagent("water",1000)
/obj/structure/reagent_dispensers/watertank/fire_burn()
src.reagents.update_total()
var/number_of_gusts = src.reagents.total_volume / 50
for(var/a=0, a < number_of_gusts , a++)
var/obj/effect/effect/water/W = new /obj/effect/effect/water( get_turf(src) )
var/turf/my_target = get_step(get_step(get_step(get_step(get_step(get_turf(src),pick(cardinal)),pick(cardinal)),pick(cardinal)),pick(cardinal)),pick(cardinal))
var/datum/reagents/R = new/datum/reagents(50)
if(!W) return
W.reagents = R
R.my_atom = W
if(!W || !src) return
src.reagents.trans_to(W,50)
for(var/b=0, b<5, b++)
step_towards(W,my_target)
if(!W) return
W.reagents.reaction(get_turf(W))
for(var/atom/atm in get_turf(W))
if(!W) return
W.reagents.reaction(atm)
if(W.loc == my_target) break
..()
/obj/structure/reagent_dispensers/fueltank
name = "fueltank"
desc = "A fueltank"
@@ -112,13 +91,6 @@
amount_per_transfer_from_this = 10
var/modded = 0
var/obj/item/device/assembly_holder/rig = null
m_amt = 7500
g_amt = 3750
fire_min_burn_temp = 800
fire_burn_multiplier = 1
fire_fuel_worth = 0
New()
..()
reagents.add_reagent("fuel",1000)
@@ -192,11 +164,6 @@
if(src)
del(src)
/obj/structure/reagent_dispensers/fueltank/fire_burn()
src.reagents.update_total()
new/obj/effect/decal/cleanable/liquid_fuel(src.loc, src.reagents.total_volume)
..()
/obj/structure/reagent_dispensers/peppertank
name = "Pepper Spray Refiller"
desc = "Refill pepper spray canisters."
@@ -247,4 +214,4 @@
New()
..()
reagents.add_reagent("virusfood", 1000)
reagents.add_reagent("virusfood", 1000)