From b0cc68ea71d367cfdf6ed9ac6c3a411615c09f28 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:01:43 -0400
Subject: [PATCH 01/13] pistol dual wielding
---
code/modules/projectiles/guns/ballistic/pistol.dm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index cb3550db83..288f1d12fb 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -110,6 +110,7 @@
desc = "Chinese military sidearm at the time of the Great War. The ones around are old and worn, but somewhat popular due to the long barrel and rechambered in 10mm after the original ammo ran dry decades ago."
icon_state = "chinapistol"
mag_type = /obj/item/ammo_box/magazine/m10mm_adv/simple
+ weapon_weight = WEAPON_LIGHT
fire_delay = 1
extra_damage = 24
recoil = 0.1
@@ -198,14 +199,14 @@
burst_size = 2
spread = 9
recoil = 0.1
- weapon_weight = WEAPON_HEAVY
+ weapon_weight = WEAPON_LIGHT
to_chat(user, "You switch to automatic fire.")
if(1)
select = 0
burst_size = 1
spread = 1
recoil = 0
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
to_chat(user, "You switch to semi-auto.")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
@@ -218,6 +219,7 @@
desc = "A classic .45 handgun with a small magazine capacity."
icon_state = "m1911"
item_state = "pistolchrome"
+ weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_NORMAL
fire_delay = 2
slowdown = 0.05
@@ -272,6 +274,7 @@
icon_state = "deagle"
item_state = "deagle"
mag_type = /obj/item/ammo_box/magazine/m44
+ weapon_weight = WEAPON_LIGHT
fire_delay = 3
force = 15
extra_damage = 38
@@ -301,6 +304,7 @@
icon_state = "automag"
item_state = "deagle"
mag_type = /obj/item/ammo_box/magazine/automag
+ weapon_weight = WEAPON_LIGHT
fire_delay = 4
extra_damage = 41
extra_speed = 300
From 8d2ee78879b3717b8eada5fcdb7cf69df93e62f0 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:11:00 -0400
Subject: [PATCH 02/13] YEEEEEHAW
---
code/modules/projectiles/guns/ballistic/revolver.dm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index af15732d05..3275956c3d 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -152,6 +152,7 @@
item_state = "45revolver"
icon_state = "45revolver"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45
+ weapon_weight = WEAPON_LIGHT
extra_damage = 34
fire_delay = 4.5
spread = 1
@@ -211,6 +212,7 @@
icon_state = "police"
extra_damage = 28
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev357
+ weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_TINY
spread = 2
fire_sound = 'sound/f13weapons/policepistol.ogg'
@@ -228,6 +230,7 @@
item_state = "model29"
icon_state = "m29"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
+ weapon_weight = WEAPON_LIGHT
extra_damage = 35
extra_penetration = 0.1
recoil = 0.1
@@ -263,6 +266,7 @@
desc = "A snubnose variant of the commonplace .44 magnum. An excellent holdout weapon for self defense."
icon_state = "m29_snub"
w_class = WEIGHT_CLASS_TINY
+ weapon_weight = WEAPON_LIGHT
extra_damage = 35
spread = 3
@@ -274,6 +278,7 @@
item_state = "44colt"
icon_state = "44colt"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
+ weapon_weight = WEAPON_LIGHT
fire_delay = 4.5
extra_damage = 35
spread = 0
@@ -284,6 +289,7 @@
/obj/item/gun/ballistic/revolver/revolver44/desert_ranger
name = "desert ranger revolver"
desc = "I hadn't noticed, but there on his hip, was a really spiffy looking iron..."
+ weapon_weight = WEAPON_LIGHT
fire_delay = 4
extra_penetration = 0.1
extra_damage = 40
@@ -299,7 +305,7 @@
desc = "This large, double-action revolver is a trademark weapon of the New California Republic Rangers. It features a dark finish with intricate engravings etched all around the weapon. Engraved along the barrel are the words 'For Honorable Service,' and 'Against All Tyrants.' The hand grip bears the symbol of the NCR Rangers, a bear, and a brass plate attached to the bottom that reads '20 Years.' "
icon_state = "sequoia"
item_state = "sequoia"
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
recoil = 0.2
fire_delay = 1
extra_damage = 40
@@ -365,7 +371,7 @@
desc = "A strange pistol firing rifle ammunition, possibly damaging the users wrist and with poor accuracy."
icon_state = "thatgun"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/thatgun
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
extra_damage = 33
extra_penetration = 0.2
spread = 4
@@ -398,6 +404,7 @@
icon_state = "needler"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/revneedler
fire_sound = 'sound/weapons/gunshot_silenced.ogg'
+ weapon_weight = WEAPON_LIGHT
w_class = WEIGHT_CLASS_SMALL
/obj/item/gun/ballistic/revolver/needler/ultra
From 66ccf56145bedf9d0dacdfc2c2e168f984c2c1db Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:16:09 -0400
Subject: [PATCH 03/13] dual wielding sawed offs
---
code/modules/projectiles/guns/ballistic.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index e9f669cf32..7f98b3b839 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -221,7 +221,7 @@
name = "sawn-off [src.name]"
desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM // Nope. Not unless you want broken wrist.
+ weapon_weight = WEAPON_LIGHT // FUCK IT WE BALL
item_state = "gun"
slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
From 3b1dcfcb9c84ac8d7453e02ae73ced3afafa00d7 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:25:42 -0400
Subject: [PATCH 04/13] RATATATA
---
code/modules/projectiles/guns/ballistic/automatic.dm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index c5cbeee92f..3d581ab039 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -380,13 +380,15 @@
icon_state = "uzi"
item_state = "uzi"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
+ weapon_weight = WEAPON_LIGHT
+ w_class = WEIGHT_CLASS_SMALL
fire_delay = 3
burst_shot_delay = 2.2
is_automatic = TRUE
automatic = 1
slowdown = 0.3
autofire_shot_delay = 2
- spread = 40
+ spread = 60
extra_damage = 17
can_suppress = TRUE
can_attachments = TRUE
@@ -404,7 +406,7 @@
spread = 16
fire_delay = 3
recoil = 0.1
- weapon_weight = WEAPON_HEAVY
+ weapon_weight = WEAPON_LIGHT
to_chat(user, "You switch to automatic fire.")
enable_burst()
if(1)
@@ -412,7 +414,7 @@
automatic = 0
fire_delay = 3
spread = 3
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
to_chat(user, "You switch to semi-auto.")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
From 8579dab1fd775fd921023d7c35cd29d612be82a4 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:29:30 -0400
Subject: [PATCH 05/13] laser pistols
---
code/modules/projectiles/guns/energy/laser.dm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 90355a4253..50b2f13252 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -209,7 +209,7 @@
fire_delay = 0
slowdown = 0.2
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
slot_flags = ITEM_SLOT_BELT
ammo_type = list(/obj/item/ammo_casing/energy/laser/pistol/wattz/hitscan)
cell_type = /obj/item/stock_parts/cell/ammo/ec
@@ -223,6 +223,7 @@
fire_delay = 0
item_state = "laser-pistol"
ammo_type = list(/obj/item/ammo_casing/energy/laser/pistol/wattz/magneto/hitscan)
+ weapon_weight = WEAPON_LIGHT
/obj/item/gun/energy/laser/wattz/recharger
name = "Recharger Pistol"
@@ -232,7 +233,7 @@
selfcharge = 1
icon_state = "rechargerpistol"
w_class = WEIGHT_CLASS_SMALL
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
slot_flags = ITEM_SLOT_BELT
ammo_type = list(/obj/item/ammo_casing/energy/laser/pistol/recharger/hitscan)
cell_type = /obj/item/stock_parts/cell/ammo/breeder
@@ -246,7 +247,7 @@
icon_state = "AEP7"
item_state = "laser-pistol"
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
slot_flags = ITEM_SLOT_BELT
ammo_type = list(/obj/item/ammo_casing/energy/laser/pistol/hitscan)
cell_type = /obj/item/stock_parts/cell/ammo/ec
@@ -555,7 +556,7 @@
icon_state = "ultra_pistol"
item_state = "laser-pistol"
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_MEDIUM
+ weapon_weight = WEAPON_LIGHT
slot_flags = ITEM_SLOT_BELT
ammo_type = list(/obj/item/ammo_casing/energy/gammagun)
cell_type = /obj/item/stock_parts/cell/ammo/mfc
From 2f0c063480bf3dff1a6400ff1a5336c2e5f114bf Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 11:31:45 -0400
Subject: [PATCH 06/13] shotguns are ASS
---
code/modules/jobs/job_types/ncr.dm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index 33120b9b3c..18c85b0914 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -607,11 +607,11 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
)
/datum/outfit/loadout/vrshotgunner
- name = "Veteran Ranger Shotgunner"
- suit_store = /obj/item/gun/ballistic/shotgun/automatic/combat/neostead
+ name = "Veteran Ranger Ocelot"
backpack_contents = list(
/obj/item/storage/box/ration/ranger_breakfast = 1,
- /obj/item/ammo_box/shotgun/buck = 3
+ /obj/item/gun/ballistic/revolver/sequoia = 1,
+ /obj/item/ammo_box/c4570 = 3
)
/datum/outfit/job/ncr/f13vetranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
From ee9537c67c5d3d1ab8f403aba92e5c59771514e0 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:47:34 -0400
Subject: [PATCH 07/13] beretta buff
---
code/modules/projectiles/guns/ballistic/pistol.dm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index 288f1d12fb..a3e871e1f1 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -183,7 +183,7 @@
fire_delay = 2
burst_size = 2
burst_shot_delay = 2.5
- spread = 9
+ spread = 4
recoil = 0.2
actions_types = list(/datum/action/item_action/toggle_firemode)
automatic_burst_overlay = TRUE
@@ -197,7 +197,7 @@
if(0)
select += 1
burst_size = 2
- spread = 9
+ spread = 4
recoil = 0.1
weapon_weight = WEAPON_LIGHT
to_chat(user, "You switch to automatic fire.")
From 6eb8e3e488712145a145e42e6ca2607b3be825c4 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:49:30 -0400
Subject: [PATCH 08/13] sequoias were a retarded idea
---
code/modules/projectiles/guns/ballistic/revolver.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 3275956c3d..f023e664a4 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -305,7 +305,6 @@
desc = "This large, double-action revolver is a trademark weapon of the New California Republic Rangers. It features a dark finish with intricate engravings etched all around the weapon. Engraved along the barrel are the words 'For Honorable Service,' and 'Against All Tyrants.' The hand grip bears the symbol of the NCR Rangers, a bear, and a brass plate attached to the bottom that reads '20 Years.' "
icon_state = "sequoia"
item_state = "sequoia"
- weapon_weight = WEAPON_LIGHT
recoil = 0.2
fire_delay = 1
extra_damage = 40
@@ -358,6 +357,7 @@
item_state = "coltwalker"
icon_state = "peacemaker"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev45/gunslinger
+ weapon_weight = WEAPON_LIGHT
extra_damage = 38
extra_penetration = 0.15
fire_delay = 4.5
From 473120fce22cfc9c1a35d366290bff50cc2b9c37 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 12:52:16 -0400
Subject: [PATCH 09/13] REVOLVER OCELOT
---
code/modules/jobs/job_types/ncr.dm | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/code/modules/jobs/job_types/ncr.dm b/code/modules/jobs/job_types/ncr.dm
index 18c85b0914..153e06b7f6 100644
--- a/code/modules/jobs/job_types/ncr.dm
+++ b/code/modules/jobs/job_types/ncr.dm
@@ -572,7 +572,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
id = /obj/item/card/id/dogtag/ncrvetranger
uniform = /obj/item/clothing/under/f13/ranger/vet
suit = /obj/item/clothing/suit/armor/f13/rangercombat
- suit_store = /obj/item/gun/ballistic/revolver/sequoia
head = /obj/item/clothing/head/helmet/f13/ncr/rangercombat
gloves = /obj/item/clothing/gloves/rifleman
shoes = /obj/item/clothing/shoes/f13/military/leather
@@ -587,7 +586,6 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
/obj/item/storage/bag/money/small/ncrofficers = 1,
/obj/item/reagent_containers/hypospray/medipen/stimpak = 3,
/obj/item/grenade/smokebomb = 1,
- /obj/item/ammo_box/c4570 = 3
)
/datum/outfit/loadout/vrclassic
@@ -595,7 +593,9 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/rifle/mag/antimateriel
backpack_contents = list(
/obj/item/storage/box/ration/ranger_dinner = 1,
- /obj/item/ammo_box/magazine/amr = 2
+ /obj/item/ammo_box/magazine/amr = 2,
+ /obj/item/ammo_box/c4570 = 3,
+ /obj/item/gun/ballistic/revolver/sequoia = 1
)
/datum/outfit/loadout/vrlite
@@ -603,15 +603,17 @@ Weapons Service Rifle, Grease Gun, 9mm pistol, all good.
suit_store = /obj/item/gun/ballistic/rifle/repeater/brush
backpack_contents = list(
/obj/item/storage/box/ration/ranger_lunch = 1,
- /obj/item/ammo_box/tube/c4570 = 3
+ /obj/item/ammo_box/tube/c4570 = 3,
+ /obj/item/ammo_box/c4570 = 3,
+ /obj/item/gun/ballistic/revolver/sequoia = 1
)
/datum/outfit/loadout/vrshotgunner
name = "Veteran Ranger Ocelot"
backpack_contents = list(
/obj/item/storage/box/ration/ranger_breakfast = 1,
- /obj/item/gun/ballistic/revolver/sequoia = 1,
- /obj/item/ammo_box/c4570 = 3
+ /obj/item/gun/ballistic/revolver/revolver45/gunslinger = 2,
+ /obj/item/ammo_box/magazine/internal/cylinder/rev45/gunslinger = 4
)
/datum/outfit/job/ncr/f13vetranger/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
From 1427d4843f166cc89ce8ef288dcacaf048745b87 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 16:21:20 -0400
Subject: [PATCH 10/13] Hangy had an aneurism over this
---
code/modules/projectiles/guns/ballistic/automatic.dm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/automatic.dm b/code/modules/projectiles/guns/ballistic/automatic.dm
index 3d581ab039..ab70aca36c 100644
--- a/code/modules/projectiles/guns/ballistic/automatic.dm
+++ b/code/modules/projectiles/guns/ballistic/automatic.dm
@@ -380,7 +380,7 @@
icon_state = "uzi"
item_state = "uzi"
mag_type = /obj/item/ammo_box/magazine/uzim9mm
- weapon_weight = WEAPON_LIGHT
+ weapon_weight = WEAPON_MEDIUM
w_class = WEIGHT_CLASS_SMALL
fire_delay = 3
burst_shot_delay = 2.2
@@ -388,7 +388,7 @@
automatic = 1
slowdown = 0.3
autofire_shot_delay = 2
- spread = 60
+ spread = 40
extra_damage = 17
can_suppress = TRUE
can_attachments = TRUE
@@ -406,7 +406,7 @@
spread = 16
fire_delay = 3
recoil = 0.1
- weapon_weight = WEAPON_LIGHT
+ weapon_weight = WEAPON_HEAVY
to_chat(user, "You switch to automatic fire.")
enable_burst()
if(1)
@@ -414,7 +414,7 @@
automatic = 0
fire_delay = 3
spread = 3
- weapon_weight = WEAPON_LIGHT
+ weapon_weight = WEAPON_MEDIUM
to_chat(user, "You switch to semi-auto.")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
update_icon()
From 955095afdfaf608f2cf6b1dc06e3bb677d26655b Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:29:40 -0400
Subject: [PATCH 11/13] Alright shotguns are too much
---
code/modules/projectiles/guns/ballistic.dm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 7f98b3b839..c2e306fc29 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -221,7 +221,7 @@
name = "sawn-off [src.name]"
desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
- weapon_weight = WEAPON_LIGHT // FUCK IT WE BALL
+ weapon_weight = WEAPON_MEDIUM // FUCK IT WE BALL
item_state = "gun"
slot_flags &= ~ITEM_SLOT_BACK //you can't sling it on your back
slot_flags |= ITEM_SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
From ef971234168e9ca6ad1c03becbf28ac4e7803ea8 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:32:05 -0400
Subject: [PATCH 12/13] beretta buff
---
code/modules/projectiles/guns/ballistic/pistol.dm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/code/modules/projectiles/guns/ballistic/pistol.dm b/code/modules/projectiles/guns/ballistic/pistol.dm
index a3e871e1f1..9104f9db0f 100644
--- a/code/modules/projectiles/guns/ballistic/pistol.dm
+++ b/code/modules/projectiles/guns/ballistic/pistol.dm
@@ -167,7 +167,7 @@
icon_state = "beretta"
mag_type = /obj/item/ammo_box/magazine/m9mmds
weapon_weight = WEAPON_LIGHT
- extra_damage = 20
+ extra_damage = 24
spread = 1
can_attachments = TRUE
can_suppress = "pistol_suppressor"
@@ -237,6 +237,7 @@
name = "M1911 Custom"
desc = "A well-maintained stainless-steel frame 1911, with genuine wooden grips."
icon_state = "m1911_custom"
+ weapon_weight = WEAPON_LIGHT
recoil = 0.05
fire_delay = 2
From 00bed812ca8ad5e02e7ef2cd41b73e3ea96cdad7 Mon Sep 17 00:00:00 2001
From: SirSwagmeyer <115960097+SirSwagmeyer@users.noreply.github.com>
Date: Thu, 28 Mar 2024 17:43:02 -0400
Subject: [PATCH 13/13] balanced dual revolvers for TTK
---
code/modules/projectiles/guns/ballistic/revolver.dm | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index f023e664a4..729dabea50 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -201,7 +201,7 @@
desc = "The revolver here appears to be made out of number of Sequoia's once held by a Vet Ranger. It doesn't have the punch as it once did."
icon_state = "lucky"
item_state = "lucky"
- w_class = WEIGHT_CLASS_SMALL
+ weapon_weight = WEAPON_LIGHT
extra_damage = 30
fire_delay = 3
@@ -230,7 +230,6 @@
item_state = "model29"
icon_state = "m29"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
- weapon_weight = WEAPON_LIGHT
extra_damage = 35
extra_penetration = 0.1
recoil = 0.1
@@ -278,7 +277,6 @@
item_state = "44colt"
icon_state = "44colt"
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev44
- weapon_weight = WEAPON_LIGHT
fire_delay = 4.5
extra_damage = 35
spread = 0
@@ -289,7 +287,6 @@
/obj/item/gun/ballistic/revolver/revolver44/desert_ranger
name = "desert ranger revolver"
desc = "I hadn't noticed, but there on his hip, was a really spiffy looking iron..."
- weapon_weight = WEAPON_LIGHT
fire_delay = 4
extra_penetration = 0.1
extra_damage = 40