Merge pull request #984 from Erthilo/master

TG Updates up to r3502
This commit is contained in:
CIB
2012-05-06 01:19:58 -07:00
86 changed files with 1165 additions and 387 deletions
@@ -1548,6 +1548,10 @@ CIRCULAR SAW
return
if(3.0)
if(M.changeling && M.changeling.changeling_fakedeath)
user << "\red The neural tissue regrows before your eyes as you cut it."
return
if(M != user)
for(var/mob/O in (viewers(M) - user - M))
O.show_message("\red [M] has \his spine's connection to the brain severed with [src] by [user].", 1)
+3 -3
View File
@@ -13,7 +13,7 @@ WELDINGTOOOL
desc = "A wrench with common uses. Can be found in your hand."
icon = 'items.dmi'
icon_state = "wrench"
flags = FPRINT | TABLEPASS| CONDUCT
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 5.0
throwforce = 7.0
w_class = 2.0
@@ -44,7 +44,7 @@ WELDINGTOOOL
name = "Welding Tool"
icon = 'items.dmi'
icon_state = "welder"
flags = FPRINT | TABLEPASS| CONDUCT
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 3.0
throwforce = 5.0
throw_speed = 1
@@ -310,7 +310,7 @@ WELDINGTOOOL
desc = "This cuts wires."
icon = 'items.dmi'
icon_state = "cutters"
flags = FPRINT | TABLEPASS| CONDUCT
flags = FPRINT | TABLEPASS| CONDUCT | ONBELT
force = 6.0
throw_speed = 2
throw_range = 9