mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
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 🆑 balance: Nerfed the Condor's damage performance, and tweaked it's recipe. /🆑 --------- Co-authored-by: Cabbage <supredoode@gmail.com>
This commit is contained in:
@@ -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"
|
||||
@@ -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,
|
||||
)
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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,
|
||||
)
|
||||
|
||||
@@ -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
|
||||
)
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 460 B |
Binary file not shown.
|
After Width: | Height: | Size: 433 B |
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user