Merge pull request #9727 from BlackMajor/Yeehaw
Fixes ED209 Assemblies sometimes advancing to an invalid build stage.
This commit is contained in:
@@ -101,7 +101,7 @@
|
||||
|
||||
if(ASSEMBLY_FOURTH_STEP)
|
||||
if(istype(W, /obj/item/weldingtool))
|
||||
if(W.use_tool(src, user, 0, volume=40))
|
||||
if(W.use_tool(src, user, 0, volume=40) && build_step == 4)
|
||||
name = "shielded frame assembly"
|
||||
to_chat(user, "<span class='notice'>You weld the vest to [src].</span>")
|
||||
build_step++
|
||||
@@ -183,7 +183,7 @@
|
||||
if(8)
|
||||
if(istype(W, /obj/item/screwdriver))
|
||||
to_chat(user, "<span class='notice'>You start attaching the gun to the frame...</span>")
|
||||
if(W.use_tool(src, user, 40, volume=100))
|
||||
if(W.use_tool(src, user, 40, volume=100) && build_step == 8)
|
||||
name = "armed [name]"
|
||||
to_chat(user, "<span class='notice'>Taser gun attached.</span>")
|
||||
build_step++
|
||||
|
||||
Reference in New Issue
Block a user