From 6304345b60cca75e4e915ddefcedd8a2e98c866c Mon Sep 17 00:00:00 2001 From: Cabbage <130223709+SomeCabbage@users.noreply.github.com> Date: Mon, 8 Jun 2026 13:48:02 -0400 Subject: [PATCH] Regal Condor nerf (#5718) ## About The Pull Request Changes the Regal Condor to be less absolutely broken. Changes are as follows: - Damage multiplier on the gun: 1.25 -> 1.00 (effective damage from 62.5 -> 50) - Armour Penetration: 40 -> 30 - Projectile Speed: Hitscan -> 1.75 (a bit faster than average) - Crafting recipe for the gun has been altered: Requires a parts kit purchasable from an uplink instead of 4tc directly where said kit costs 4tc and cannot be discounted, along with being restricted to higher player numbers. - Crafting recipe for the magazines has been tweaked, now requiring a telecrystal per each additional magazine you want to make. - To compensate for the exclusivity of the parts kit, a credit-purchasable one has been made available to the persistence. ## Why It's Good For The Game The regal condor is a ridiculously broken gun and was fortunately not used to it's full potential up until recently, where it became very obvious that it's current state was unacceptable. ## Proof Of Testing Recipe works as intended, and the condor's projectile and damage has successfully changed. The required item is available in the uplink and the percy express console. Actual validation for the uplink restrictions will require live testing, unfortunately. ## Changelog :cl: balance: Nerfed the Condor's damage performance, and tweaked it's recipe. /:cl: --------- Co-authored-by: Cabbage --- .../datums/components/crafting/guncrafting.dm | 5 +++++ .../components/crafting/ranged_weapon.dm | 21 ++++++++++++++++++ .../modules/cargo/packs/goodies/interdyne.dm | 9 ++++++++ .../ammunition/ballistic/pistol.dm | 3 +++ .../boxes_magazines/external/pistol.dm | 9 ++++++++ .../projectiles/guns/ballistic/pistol.dm | 12 ++++++++++ .../projectiles/projectile/bullets/pistol.dm | 7 ++++++ .../modules/uplink/uplink_items/dangerous.dm | 10 +++++++++ .../icons/obj/weapons/guns/projectiles.dmi | Bin 293 -> 460 bytes .../icons/obj/weapons/improvised.dmi | Bin 0 -> 433 bytes tgstation.dme | 3 +++ 11 files changed, 79 insertions(+) create mode 100644 modular_zubbers/code/datums/components/crafting/guncrafting.dm create mode 100644 modular_zubbers/code/datums/components/crafting/ranged_weapon.dm create mode 100644 modular_zubbers/code/modules/projectiles/projectile/bullets/pistol.dm create mode 100644 modular_zubbers/icons/obj/weapons/improvised.dmi diff --git a/modular_zubbers/code/datums/components/crafting/guncrafting.dm b/modular_zubbers/code/datums/components/crafting/guncrafting.dm new file mode 100644 index 00000000000..ec94f7e6c53 --- /dev/null +++ b/modular_zubbers/code/datums/components/crafting/guncrafting.dm @@ -0,0 +1,5 @@ +/obj/item/weaponcrafting/gunkit/regal_condor + name = "unnamed weapon parts case (viciously lethal)" + desc = "A suitcase containing the necessary gun parts to assemble a very powerful handgun. The case itself has a foreboding aura to it." + icon = 'modular_zubbers/icons/obj/weapons/improvised.dmi' + icon_state = "syndikitsuitcase" diff --git a/modular_zubbers/code/datums/components/crafting/ranged_weapon.dm b/modular_zubbers/code/datums/components/crafting/ranged_weapon.dm new file mode 100644 index 00000000000..5bacc59c31a --- /dev/null +++ b/modular_zubbers/code/datums/components/crafting/ranged_weapon.dm @@ -0,0 +1,21 @@ +/datum/crafting_recipe/deagle_prime + reqs = list( + /obj/item/gun/ballistic/automatic/pistol = 1, + /obj/item/stack/sheet/mineral/gold = 25, + /obj/item/stack/sheet/mineral/silver = 25, + /obj/item/food/donkpocket = 1, + /obj/item/weaponcrafting/gunkit/regal_condor = 1, //we replace the 4tc with an uplink item that costs 4tc and is restricted + /obj/item/clothing/head/costume/crown/fancy = 1, + /obj/item/storage/toolbox/syndicate = 1, + /obj/item/stack/sheet/iron = 10, + ) + +/datum/crafting_recipe/deagle_prime_mag + reqs = list( + /obj/item/stack/sheet/iron = 10, + /obj/item/stack/sheet/mineral/gold = 10, + /obj/item/stack/sheet/mineral/silver = 10, + /obj/item/stack/sheet/mineral/plasma = 10, + /obj/item/stack/telecrystal = 1, //induces a limit on how many magazines you can make + /obj/item/food/donkpocket = 1, + ) diff --git a/modular_zubbers/code/modules/cargo/packs/goodies/interdyne.dm b/modular_zubbers/code/modules/cargo/packs/goodies/interdyne.dm index c7e122d90bd..e84f254ce7e 100644 --- a/modular_zubbers/code/modules/cargo/packs/goodies/interdyne.dm +++ b/modular_zubbers/code/modules/cargo/packs/goodies/interdyne.dm @@ -4,3 +4,12 @@ cost = PAYCHECK_COMMAND * 15 order_flags = parent_type::order_flags | ORDER_INTERDYNE_ONLY contains = list(/obj/item/card/id/advanced/chameleon) + +/datum/supply_pack/goody/interdyne_condor + name = "Regal Condor weapon parts kit" + desc = "Contains one set of gun parts to assemble a Regal Condor. Due to the inclusion of several specially cut telecrystals within the suitcase, \ + and the fact that this shit is expensive to fabricate, we're charging you a bit extra." + cost = PAYCHECK_COMMAND * 2500 + allow_non_private_purchase = TRUE + order_flags = parent_type::order_flags | ORDER_INTERDYNE_ONLY + contains = list(/obj/item/weaponcrafting/gunkit/regal_condor) diff --git a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/pistol.dm b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/pistol.dm index 2b08d15583c..e1aa470c467 100644 --- a/modular_zubbers/code/modules/projectiles/ammunition/ballistic/pistol.dm +++ b/modular_zubbers/code/modules/projectiles/ammunition/ballistic/pistol.dm @@ -77,3 +77,6 @@ if(istype(magazine, /obj/item/ammo_box/magazine/recharge/ntusp/laser)) icon_state = "ntusp-l" ..() + +/obj/item/ammo_casing/c10mm/reaper + projectile_type = /obj/projectile/bullet/c10mm/lesser_reaper diff --git a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm index d34b3cfa4ff..9bf2bf245aa 100644 --- a/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm +++ b/modular_zubbers/code/modules/projectiles/boxes_magazines/external/pistol.dm @@ -88,3 +88,12 @@ return for(var/inserted_ammo in 1 to stored_ammo.len) . += "9mm-revolver-[inserted_ammo]" + +/obj/item/ammo_box/magazine/r10mm + custom_materials = list( + /datum/material/iron = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/gold = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/silver = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/plasma = SHEET_MATERIAL_AMOUNT * 10, + /datum/material/telecrystal = SHEET_MATERIAL_AMOUNT, + ) diff --git a/modular_zubbers/code/modules/projectiles/guns/ballistic/pistol.dm b/modular_zubbers/code/modules/projectiles/guns/ballistic/pistol.dm index 9761f1246fb..66c6dedaa40 100644 --- a/modular_zubbers/code/modules/projectiles/guns/ballistic/pistol.dm +++ b/modular_zubbers/code/modules/projectiles/guns/ballistic/pistol.dm @@ -37,3 +37,15 @@ light_overlay = "flight", \ overlay_x = 15, \ overlay_y = 13) + +/obj/item/gun/ballistic/automatic/pistol/deagle/regal + desc = "Unlike the Desert Eagle, this weapon seems to utilize some kind of advanced internal stabilization system to significantly \ + reduce felt recoil and increase overall accuracy, at the cost of using a smaller caliber. \ + The smaller caliber in question however consists of custom-made high-power bullets, which makes the whole statement of it using a smaller caliber than a Desert Eagle completely pointless. \ + This does allow it to fire a very quick 2-round burst. Uses 10mm ammo." + projectile_damage_multiplier = 1.0 + custom_materials = list( + /datum/material/gold = SHEET_MATERIAL_AMOUNT * 30, + /datum/material/silver = SHEET_MATERIAL_AMOUNT * 25, + /datum/material/iron = SHEET_MATERIAL_AMOUNT * 11.5 + ) diff --git a/modular_zubbers/code/modules/projectiles/projectile/bullets/pistol.dm b/modular_zubbers/code/modules/projectiles/projectile/bullets/pistol.dm new file mode 100644 index 00000000000..e9e949f916f --- /dev/null +++ b/modular_zubbers/code/modules/projectiles/projectile/bullets/pistol.dm @@ -0,0 +1,7 @@ +/obj/projectile/bullet/c10mm/lesser_reaper + name = "10mm reaper pellet" + icon = 'modular_zubbers/icons/obj/weapons/guns/projectiles.dmi' + icon_state = "reaper" + damage = 50 + armour_penetration = 30 + speed = 1.75 diff --git a/modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm b/modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm index 80092a39696..8b7f338c3c5 100644 --- a/modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm +++ b/modular_zubbers/code/modules/uplink/uplink_items/dangerous.dm @@ -16,3 +16,13 @@ item = /obj/item/storage/toolbox/guncase/skyrat/pistol/aps cost = 8 purchasable_from = ~UPLINK_ALL_SYNDIE_OPS + +/datum/uplink_item/dangerous/regal_condor_kit + name = "Unnamed weapon parts kit" + desc = "An ominous kit of gun parts in a sleek suitcase, additionally containing several specially cut and refined telecrystals. The kit was supplied with a note that says: \"You'll figure out the rest\"." + item = /obj/item/weaponcrafting/gunkit/regal_condor + cost = 4 + cant_discount = TRUE + surplus = 0 + population_minimum = TRAITOR_POPULATION_LOWPOP + 5 + purchasable_from = ~UPLINK_ALL_SYNDIE_OPS diff --git a/modular_zubbers/icons/obj/weapons/guns/projectiles.dmi b/modular_zubbers/icons/obj/weapons/guns/projectiles.dmi index 6188a2f8d1feed29308abc926e86eade27c372c4..cc3c3723b5b8402e8f8f4c4ec47d3f5b9e7a2c74 100644 GIT binary patch delta 447 zcmV;w0YLtx0?Y%D7k@wq1^@s6s%dfF0001udQ@0+L}hbha%pgMX>V=-0C=2j%RLGL zF%SmOI&+GT-B!e`w$n%!NwIqc$&%3o;t!LkczX*A8_QR`9{cg&XSm7JQ?%yW6^z|_ zL*|uZOJHmVGD-3|wJ&N5O~B}4u3;&n$K_Fqw2n;7TEVbnPJbFMQo$I=L@D77hF#fT zRta~}|Ho2~advQ%rw>_AEQ2Xb2mAm40QyNpK~#90?b)$v!cY{(@sCpI;#+j-)7d9* z)<k<$g5*MLh;YtRzxFlV=bd+=P>m~o+k}S#na&mG)hy(xt006*k>bCDv z>Q%RWsp~(40)K2Sf4BGMUSE>5`1IWUOzX!wK+^ns6+K1K>jUl?;CcfA|AhMybn8+w z7l0uIuc6NXKkk4TLl^)6008bRebxQ?ZCdo#*kk12>V2m3p~;oSBK&i-bfFG-8a@B+ zEi**%7<>nW3UEC&sYDE;E4;0zeQ94C_Wnm8wm#o%W^r~@Q@WJzH}2LzAb pWl3Q)_zs`|?f`BSz#Ra9)ei<`Q#kBhXq5l}002ovPDHLkV1g#3%oYFu delta 279 zcmV+y0qFkB1Em6x7k?lG0{{R3P_tvV0000FP)t-s00000-0=SG?EtansHmvPn$V;G z0004WQchCV=-0C=2JR&a84_w-Y6@%7{?OD!tS z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DSsuiI588bGcYUT=QA)E5a2U75a3e*pxY@xeJcoAi2)SQ1*q>Rf^MK( d2holO0NLpRfe`0X`j`L!002ovPDHLkV1hP#ZI1u| diff --git a/modular_zubbers/icons/obj/weapons/improvised.dmi b/modular_zubbers/icons/obj/weapons/improvised.dmi new file mode 100644 index 0000000000000000000000000000000000000000..d1c754443c4a5c31662364e21eef9126ad95ea68 GIT binary patch literal 433 zcmV;i0Z#sjP)V=-0C)i?;=SkGs>>MijBoKLoRyMO4VHioZ8#H^UT@Vp%tB zk5$*gK|y$1vB3QE1#_}fA0_*P@x+tYS46E+#6+&u@ysea>tKZvFph)7^aC>nyU@!i z)_wIHZoT#%+b19eeE;l(RF%m4bsq^6};X$pJx|< zm|zwtn b01DgyMQ|7}=*46(00000NkvXXu0mjf6zaF3 literal 0 HcmV?d00001 diff --git a/tgstation.dme b/tgstation.dme index 8bea7df293f..0c56cd88680 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9008,6 +9008,8 @@ #include "modular_zubbers\code\datums\components\crafting\containers.dm" #include "modular_zubbers\code\datums\components\crafting\furniture.dm" #include "modular_zubbers\code\datums\components\crafting\gardening.dm" +#include "modular_zubbers\code\datums\components\crafting\guncrafting.dm" +#include "modular_zubbers\code\datums\components\crafting\ranged_weapon.dm" #include "modular_zubbers\code\datums\components\crafting\tailoring.dm" #include "modular_zubbers\code\datums\components\crafting\tools.dm" #include "modular_zubbers\code\datums\components\crafting\utility.dm" @@ -9896,6 +9898,7 @@ #include "modular_zubbers\code\modules\projectiles\guns\energy\energyguns.dm" #include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm" #include "modular_zubbers\code\modules\projectiles\projectile\bullets\lmg.dm" +#include "modular_zubbers\code\modules\projectiles\projectile\bullets\pistol.dm" #include "modular_zubbers\code\modules\projectiles\projectile\bullets\smg.dm" #include "modular_zubbers\code\modules\protected_roles\code\antag_restricted_jobs.dm" #include "modular_zubbers\code\modules\public_logging\public_logging.dm"