Merge remote-tracking branch 'upstream/dev' into PortaTurret

This commit is contained in:
PsiOmega
2014-10-24 07:24:11 +02:00
29 changed files with 340 additions and 325 deletions

View File

@@ -225,7 +225,7 @@ obj/item/weapon/gun/energy/staff/focus
charge_cost = 250
fire_delay = 35
w_class = 4.0
zoomdevicename = "sniper scope"
zoomdevicename = "scope"
/obj/item/weapon/gun/energy/sniperrifle/verb/scope()
set category = "Object"