Fix typo in catalyst.

Fix flamethrower crafting recipe (now only use 1 rod, calls checkparts() to set up the weldingtool and igniter).
Fix lack of message when trying to turn on an unsecured welding tool.
Fix lack of icon update when clicking plasma tank with empty flamethrower.
This commit is contained in:
phil235
2015-03-15 00:23:47 +01:00
parent 16a0d7bf80
commit 0232afd05d
5 changed files with 16 additions and 14 deletions
@@ -157,6 +157,10 @@
update_icon()
return
/obj/item/weapon/flamethrower/CheckParts()
weldtool = locate(/obj/item/weapon/weldingtool) in contents
igniter = locate(/obj/item/device/assembly/igniter) in contents
update_icon()
//Called from turf.dm turf/dblclick
/obj/item/weapon/flamethrower/proc/flame_turf(turflist)
@@ -195,10 +199,6 @@
/obj/item/weapon/flamethrower/full/New(var/loc)
..()
for(var/obj/item/weapon/weldingtool/W in src)
weldtool = W
for(var/obj/item/device/assembly/igniter/I in src)
igniter = I
if(!weldtool)
weldtool = new /obj/item/weapon/weldingtool(src)
weldtool.status = 0
@@ -211,4 +211,4 @@
/obj/item/weapon/flamethrower/full/tank/New(var/loc)
..()
ptank = new /obj/item/weapon/tank/internals/plasma/full(src)
update_icon()
update_icon()
@@ -96,6 +96,7 @@
F.ptank = src
user.unEquip(src)
src.loc = F
F.update_icon()
return
/obj/item/weapon/tank/internals/plasma/full/New()
+1
View File
@@ -308,6 +308,7 @@
//Toggles the welder off and on
/obj/item/weapon/weldingtool/proc/toggle(mob/user, message = 0)
if(!status)
user << "<span class='notice'>[src] can't be turned on while unsecured.</span>"
return
welding = !welding
if(welding)
+3 -3
View File
@@ -5,7 +5,7 @@
var/tools[] = list() //type paths of items needed but not consumed
var/time = 30 //time in deciseconds
var/parts[] = list() //type paths of items that will be placed in the result
var/chem_catalists[] = list() //like tools but for reagents
var/chem_catalysts[] = list() //like tools but for reagents
/datum/table_recipe/IED
@@ -84,10 +84,10 @@
/datum/table_recipe/flamethrower
name = "Flamethrower"
result = /obj/item/weapon/flamethrower/full
result = /obj/item/weapon/flamethrower
reqs = list(/obj/item/weapon/weldingtool = 1,
/obj/item/device/assembly/igniter = 1,
/obj/item/stack/rods = 2)
/obj/item/stack/rods = 1)
parts = list(/obj/item/device/assembly/igniter = 1,
/obj/item/weapon/weldingtool = 1)
tools = list(/obj/item/weapon/screwdriver)
+6 -6
View File
@@ -17,8 +17,8 @@
if(table_contents[B] >= R.reqs[A])
continue main_loop
return 0
for(var/A in R.chem_catalists)
if(table_contents[A] < R.chem_catalists[A])
for(var/A in R.chem_catalysts)
if(table_contents[A] < R.chem_catalysts[A])
return 0
return 1
@@ -196,12 +196,12 @@
req_text += " [R.reqs[A]] [RE.name]"
qdel(RE)
if(R.chem_catalists.len)
catalist_text += ", Catalists:"
for(var/C in R.chem_catalists)
if(R.chem_catalysts.len)
catalist_text += ", Catalysts:"
for(var/C in R.chem_catalysts)
if(ispath(C, /datum/reagent))
var/datum/reagent/RE = new C
catalist_text += " [R.chem_catalists[C]] [RE.name]"
catalist_text += " [R.chem_catalysts[C]] [RE.name]"
qdel(RE)
if(R.tools.len)
tool_text += ", Tools:"