Merge remote-tracking branch 'citadel/master' into unarmed_parry

This commit is contained in:
silicons
2020-07-07 21:07:58 -07:00
99 changed files with 2195 additions and 1778 deletions
+1 -1
View File
@@ -118,7 +118,7 @@
return
if(istype(W, /obj/item/stack/cable_coil))
if(W.use_tool(src, user, 0, 1, max_level = JOB_SKILL_TRAINED))
if(W.use_tool(src, user, 0, 1, skill_gain_mult = TRIVIAL_USE_TOOL_MULT))
icon_state = "[fixture_type]-construct-stage2"
stage = 2
user.visible_message("[user.name] adds wires to [src].", \