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

Hopefully fixes some tool-conversion things

Browse Source
This commit is contained in:
Anewbe
2018-08-03 15:06:52 -05:00
parent 7f84aeab9f
commit c2794c571d
90 changed files with 594 additions and 17253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/guns/launcher/crossbow.dm
View File

@@ -227,7 +227,7 @@
else
user << "<span class='notice'>You need at least three rods to complete this task.</span>"
return
else if(W.is_welder())
else if(istype(W, /obj/item/weapon/weldingtool))
if(buildstate == 1)
var/obj/item/weapon/weldingtool/T = W
if(T.remove_fuel(0,user))
@@ -237,7 +237,7 @@
buildstate++
update_icon()
return
else if(W.is_cable_coil())
else if(istype(W, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = W
if(buildstate == 2)
if(C.use(5))

4
code/modules/projectiles/guns/magnetic/magnetic_construction.dm
View File

@@ -33,7 +33,7 @@
increment_construction_stage()
return
if(thing.is_welder() && construction_stage == 4)
if(istype(thing, /obj/item/weapon/weldingtool) && construction_stage == 4)
var/obj/item/weapon/weldingtool/welder = thing
if(!welder.isOn())
@@ -49,7 +49,7 @@
increment_construction_stage()
return
if(thing.is_cable_coil() && construction_stage == 5)
if(istype(thing, /obj/item/stack/cable_coil) && construction_stage == 5)
var/obj/item/stack/cable_coil/cable = thing
if(cable.get_amount() < 5)
to_chat(user, "<span class='warning'>You need at least 5 lengths of cable for this task.</span>")