cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes autolathe making stacks, fuel > welding fuel, fixes some non-blue medical icons

Browse Source
This commit is contained in:
Jordie0608
2015-05-17 01:58:46 +10:00
parent 112e1d0810
commit 2b9c8ac98c
19 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/rods.dm
+1 -1
View File
@@ -16,7 +16,7 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
throw_speed = 3
throw_range = 7
m_amt = 1000
max_amount = 60
max_amount = 50
attack_verb = list("hit", "bludgeoned", "whacked")
hitsound = 'sound/weapons/grenadelaunch.ogg'
code/game/objects/items/weapons/cigs_lighters.dm
+2 -2
View File
@@ -176,9 +176,9 @@ CIGARETTE PACKETS ARE IN FANCY.DM
M.unEquip(src, 1)
qdel(src)
return
if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
if(reagents.get_reagent_amount("welding_fuel")) // the fuel explodes, too, but much less violently
var/datum/effect/effect/system/reagents_explosion/e = new()
e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
e.set_up(round(reagents.get_reagent_amount("welding_fuel") / 5, 1), get_turf(src), 0, 0)
e.start()
if(ismob(loc))
var/mob/M = loc
code/game/objects/items/weapons/tools.dm
+4 -4
View File
@@ -166,7 +166,7 @@
/obj/item/weapon/weldingtool/New()
..()
create_reagents(max_fuel)
reagents.add_reagent("fuel", max_fuel)
reagents.add_reagent("welding_fuel", max_fuel)
update_icon()
return
@@ -274,7 +274,7 @@
//Returns the amount of fuel in the welder
/obj/item/weapon/weldingtool/proc/get_fuel()
return reagents.get_reagent_amount("fuel")
return reagents.get_reagent_amount("welding_fuel")
//Removes fuel from the welding tool. If a mob is passed, it will try to flash the mob's eyes. This should probably be renamed to use()
@@ -282,7 +282,7 @@
if(!welding || !check_fuel())
return 0
if(get_fuel() >= amount)
reagents.remove_reagent("fuel", amount)
reagents.remove_reagent("welding_fuel", amount)
check_fuel()
if(M)
M.flash_eyes(2)
@@ -418,7 +418,7 @@
/obj/item/weapon/weldingtool/experimental/proc/fuel_gen()
if(!last_gen)
last_gen = 1
reagents.add_reagent("fuel",1)
reagents.add_reagent("welding_fuel",1)
spawn(10)
last_gen = 0