cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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

2
code/modules/power/singularity/field_generator.dm
View File

@@ -122,7 +122,7 @@ field_generator power level display
if(2)
user << "<font color='red'>The [src.name] needs to be unwelded from the floor.</font>"
return
else if(W.is_welder())
else if(istype(W, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/WT = W
switch(state)
if(0)

4
code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
View File

@@ -220,7 +220,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
user.visible_message("[user.name] detaches the [src.name] from the floor.", \
"You remove the external bolts.")
temp_state--
else if(O.is_cable_coil())
else if(istype(O, /obj/item/stack/cable_coil))
if(O:use(1,user))
user.visible_message("[user.name] adds wires to the [src.name].", \
"You add some wires.")
@@ -359,7 +359,7 @@ So, hopefully this is helpful if any more icons are to be added/changed/wonderin
user.visible_message("[user.name] detaches the [src.name] from the floor.", \
"You remove the external bolts.")
temp_state--
else if(O.is_cable_coil())
else if(istype(O, /obj/item/stack/cable_coil))
if(O:use(1))
user.visible_message("[user.name] adds wires to the [src.name].", \
"You add some wires.")