From 2e6a0f4ebbf0b08bc67fa26e0bc7f62f6faaeb4b Mon Sep 17 00:00:00 2001 From: mwerezak Date: Mon, 9 Feb 2015 22:46:00 -0500 Subject: [PATCH] Adjusts some gun force values Gave some of the heavier looking weapons the same force value as the shotgun. --- code/modules/projectiles/guns/energy/laser.dm | 1 + code/modules/projectiles/guns/energy/nuclear.dm | 1 + code/modules/projectiles/guns/energy/special.dm | 2 ++ code/modules/projectiles/guns/projectile/automatic.dm | 2 ++ 4 files changed, 6 insertions(+) diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm index c86fed89dc..24a3bb1541 100644 --- a/code/modules/projectiles/guns/energy/laser.dm +++ b/code/modules/projectiles/guns/energy/laser.dm @@ -6,6 +6,7 @@ fire_sound = 'sound/weapons/Laser.ogg' slot_flags = SLOT_BELT|SLOT_BACK w_class = 3.0 + force = 10 //it has a stock, might as well give some kind of perk over the egun matter = list("metal" = 2000) origin_tech = "combat=3;magnets=2" projectile_type = /obj/item/projectile/beam diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index 678f18bc01..8047a94784 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -41,6 +41,7 @@ icon_state = "nucgun" origin_tech = "combat=3;materials=5;powerstorage=3" slot_flags = SLOT_BELT + force = 8 var/lightfail = 0 var/charge_tick = 0 diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index eeb3511fe4..df36de84fb 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -5,6 +5,7 @@ fire_sound = 'sound/weapons/Laser.ogg' origin_tech = "combat=2;magnets=4" w_class = 4.0 + force = 10 flags = CONDUCT slot_flags = SLOT_BACK charge_cost = 100 @@ -227,6 +228,7 @@ obj/item/weapon/gun/energy/staff/focus slot_flags = SLOT_BACK charge_cost = 250 fire_delay = 35 + force = 10 w_class = 4 zoomdevicename = "scope" diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index 854f4ada20..4500f2be2d 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -31,6 +31,7 @@ icon_state = "c20r" item_state = "c20r" w_class = 3 + force = 10 caliber = "12mm" origin_tech = "combat=5;materials=2;syndicate=8" slot_flags = SLOT_BELT|SLOT_BACK @@ -58,6 +59,7 @@ icon_state = "l6closed100" item_state = "l6closedmag" w_class = 4 + force = 10 slot_flags = 0 max_shells = 50 caliber = "a762"