From 079dd582b80ac996d48d4f680a4cdea8a181f9aa Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Apr 2019 01:26:32 -0400 Subject: [PATCH 1/3] Update magweapon.dm --- .../code/modules/projectiles/guns/ballistic/magweapon.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm index 017a9dd52d..0ab5b9bffd 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -55,9 +55,9 @@ /obj/item/projectile/bullet/nlmags //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-nl" - damage = 0 + damage = 25 knockdown = 0 - stamina = 25 + damage_type = STAMINA armour_penetration = -10 light_range = 2 speed = 0.7 @@ -210,9 +210,9 @@ /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large-nl" - damage = 0 + damage = 25 knockdown = 0 - stamina = 25 + damage_type = STAMINA armour_penetration = -10 light_range = 3 speed = 0.65 From 02f8f89a79779641972dacef3c715adfd01511fa Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 9 Apr 2019 09:52:05 -0400 Subject: [PATCH 2/3] Update magweapon.dm --- .../code/modules/projectiles/guns/ballistic/magweapon.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm index 0ab5b9bffd..ba73398a05 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -55,9 +55,9 @@ /obj/item/projectile/bullet/nlmags //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-nl" - damage = 25 + damage = 5 knockdown = 0 - damage_type = STAMINA + stamina = 25 armour_penetration = -10 light_range = 2 speed = 0.7 @@ -210,9 +210,9 @@ /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large-nl" - damage = 25 + damage = 5 knockdown = 0 - damage_type = STAMINA + stamina = 25 armour_penetration = -10 light_range = 3 speed = 0.65 From 0b58285b539d1fe3d31e070ba772e56b059488b2 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Thu, 11 Apr 2019 00:36:31 -0400 Subject: [PATCH 3/3] 5 - > 2 --- .../code/modules/projectiles/guns/ballistic/magweapon.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm index ba73398a05..df41a79592 100644 --- a/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm +++ b/modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm @@ -55,7 +55,7 @@ /obj/item/projectile/bullet/nlmags //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-nl" - damage = 5 + damage = 2 knockdown = 0 stamina = 25 armour_penetration = -10 @@ -210,7 +210,7 @@ /obj/item/projectile/bullet/nlmagrifle //non-lethal boolets icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi' icon_state = "magjectile-large-nl" - damage = 5 + damage = 2 knockdown = 0 stamina = 25 armour_penetration = -10