From df01bd3020d4b1831bc413bb718a782d7bb48456 Mon Sep 17 00:00:00 2001 From: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com> Date: Sat, 24 Aug 2024 16:45:37 +0700 Subject: [PATCH] Follow up 5 (#29554) * mfw * harass me enough and i'll do it * yip yap * hypothetically * Update rifle.dm * Update rifle.dm * superb * Update blueshield.dm * no description --- .../crates_lockers/closets/secure/security.dm | 2 +- .../modules/blueshield/code/blueshield.dm | 7 ++++-- .../modules/blueshield/code/closet.dm | 2 +- .../romulus_technology/ammo/rifle.dm | 2 +- .../romulus_technology/pistol.dm | 11 +++++---- .../romulus_technology/rifle.dm | 23 ++++++++++++------- .../modules/sec_haul/code/guns/cargo_stuff.dm | 4 ++-- .../sec_haul/code/misc/gun_redemption.dm | 2 +- .../modules/sec_haul/code/misc/packs.dm | 15 +++++++++++- .../modules/shotgunrebalance/code/shotgun.dm | 10 ++++---- 10 files changed, 51 insertions(+), 27 deletions(-) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 51b9f7c7feb..14751aae288 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -108,7 +108,7 @@ /obj/structure/closet/secure_closet/security/PopulateContents() ..() new /obj/item/clothing/suit/armor/vest/alt/sec(src) - new /obj/item/storage/toolbox/guncase/skyrat/rom_flech(src) //SKYRAT EDIT ADDITION + new /obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech(src) //SKYRAT EDIT ADDITION new /obj/item/clothing/head/helmet/sec(src) new /obj/item/radio/headset/headset_sec(src) new /obj/item/radio/headset/headset_sec/alt(src) diff --git a/modular_skyrat/modules/blueshield/code/blueshield.dm b/modular_skyrat/modules/blueshield/code/blueshield.dm index b91c34827ff..b02a3af8594 100644 --- a/modular_skyrat/modules/blueshield/code/blueshield.dm +++ b/modular_skyrat/modules/blueshield/code/blueshield.dm @@ -34,11 +34,13 @@ mail_goodies = list( /obj/item/storage/fancy/cigarettes/cigars/havana = 10, - /obj/item/stack/spacecash/c500 = 3, + /obj/item/stack/spacecash/c500 = 30, /obj/item/disk/nuclear/fake/obvious = 2, /obj/item/clothing/head/collectable/captain = 4, - /obj/item/gun/energy/disabler/smoothbore = 1, + /obj/item/gun/energy/disabler/smoothbore = 5, /obj/item/restraints/legcuffs/bola/energy = 10, + /obj/item/ammo_box/magazine/caflechette/ripper = 20, + /obj/item/ammo_box/magazine/caflechette = 10, ) veteran_only = TRUE @@ -62,6 +64,7 @@ head = /obj/item/clothing/head/beret/blueshield box = /obj/item/storage/box/survival/security belt = /obj/item/modular_computer/pda/blueshield + suit_store = /obj/item/gun/energy/e_gun id_trim = /datum/id_trim/job/blueshield diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm index 4d848ee6466..fe378128824 100644 --- a/modular_skyrat/modules/blueshield/code/closet.dm +++ b/modular_skyrat/modules/blueshield/code/closet.dm @@ -44,4 +44,4 @@ new /obj/item/mod/control/pre_equipped/blueshield(src) new /obj/item/storage/box/glasseskit(src) new /obj/item/storage/medkit/brute(src) - new /obj/item/storage/toolbox/guncase/skyrat/blueshield_cmg(src) + new /obj/item/storage/toolbox/guncase/skyrat/pistol/blueshield_cmg(src) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm index 1c70af15dbf..cd5e591b8ad 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/ammo/rifle.dm @@ -1,7 +1,7 @@ #define AMMO_MATS_SHOTGUN list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 4) // not quite as thick as a half-sheet #define AMMO_MATS_SHOTGUN_FLECH list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\ - /datum/material/titanium = SMALL_MATERIAL_AMOUNT * 2) + /datum/material/glass = SMALL_MATERIAL_AMOUNT * 2) #define AMMO_MATS_SHOTGUN_HIVE list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 2,\ /datum/material/silver = SMALL_MATERIAL_AMOUNT * 1) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm index fe66d9ede66..c5456120696 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/pistol.dm @@ -86,26 +86,27 @@ AddElement(/datum/element/manufacturer_examine, COMPANY_ROMTECH) -/obj/item/storage/toolbox/guncase/skyrat/m1911_gold +/obj/item/storage/toolbox/guncase/skyrat/pistol/m1911_gold name = "golden m1911 .460 ceres" weapon_to_spawn = /obj/item/gun/ballistic/automatic/pistol/m1911/gold extra_to_spawn = /obj/item/ammo_box/magazine/m45 -/obj/item/storage/toolbox/guncase/skyrat/m1911/PopulateContents() +/obj/item/storage/toolbox/guncase/skyrat/pistol/m1911/PopulateContents() new weapon_to_spawn (src) generate_items_inside(list( /obj/item/ammo_box/c45 = 2, ), src) -/obj/item/storage/toolbox/guncase/skyrat/m45a5 +/obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5 name = "heavy pistol .460 magnum" -/obj/item/storage/toolbox/guncase/skyrat/m45a5/PopulateContents() +/obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5/PopulateContents() new /obj/item/gun/ballistic/automatic/pistol/m45a5(src) new /obj/item/ammo_box/magazine/m45a5(src) new /obj/item/ammo_box/magazine/m45a5(src) new /obj/item/ammo_box/magazine/m45a5(src) + new /obj/item/storage/pouch/ammo(src) /obj/item/gun/ballistic/automatic/pistol/m45a5 name = "M4A5" @@ -114,7 +115,7 @@ icon_state = "m45a5" fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/pistol_heavy.ogg' force = 15 - fire_delay = 1.8 SECONDS + fire_delay = 1 SECONDS special_mags = TRUE recoil = 3 diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm index f2a3cdec7bc..c8ffe4ea202 100644 --- a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/romulus_technology/rifle.dm @@ -154,13 +154,15 @@ /// how long does it take to extend/collapse the stock var/toggle_time = 1 SECONDS /// what's our spread with our extended stock (mild varedit compatibility I Guess)? - var/unfolded_spread = 5 + var/unfolded_spread = 2 /// what's our spread with a folded stock (see above comment)? - var/folded_spread = 20 + var/folded_spread = 15 /// Do we have any recoil if it's folded? - var/folded_recoil = 5 + var/folded_recoil = 3 ///Do we lose any recoil when it's not? var/unfolded_recoil = 0 + ///Shuld this gun be one handed anyway? + var/one_handed_always = TRUE /obj/item/gun/ballistic/automatic/rom_flech/examine(mob/user) . = ..() . += span_notice("Alt-click to [folded ? "extend" : "collapse"] the stock.") @@ -191,10 +193,15 @@ spread = folded_spread w_class = WEIGHT_CLASS_NORMAL recoil = folded_recoil + weapon_weight = WEAPON_LIGHT else spread = unfolded_spread w_class = WEIGHT_CLASS_BULKY recoil = unfolded_recoil + if(one_handed_always) + weapon_weight = WEAPON_LIGHT + else + weapon_weight = WEAPON_HEAVY update_icon() /obj/item/gun/ballistic/automatic/rom_flech/update_overlays() @@ -207,11 +214,11 @@ /obj/item/gun/ballistic/automatic/rom_flech/empty spawnwithmagazine = FALSE -/obj/item/storage/toolbox/guncase/skyrat/rom_flech +/obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech name = "CMG-1 Rifle Case" weapon_to_spawn = /obj/item/gun/ballistic/automatic/rom_flech/empty -/obj/item/storage/toolbox/guncase/skyrat/rom_flech/PopulateContents() +/obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech/PopulateContents() new weapon_to_spawn (src) generate_items_inside(list( @@ -228,7 +235,6 @@ lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/carwo_defense_systems/guns_lefthand.dmi' righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/carwo_defense_systems/guns_righthand.dmi' inhand_icon_state = "infanterie_evil" - bolt_type = BOLT_TYPE_LOCKING w_class = WEIGHT_CLASS_BULKY weapon_weight = WEAPON_LIGHT burst_size = 3 @@ -238,15 +244,16 @@ folded_spread = 7 folded_recoil = 2 unfolded_recoil = 0 + one_handed_always = 1 /obj/item/gun/ballistic/automatic/rom_flech/blueshield/empty spawnwithmagazine = FALSE -/obj/item/storage/toolbox/guncase/skyrat/blueshield_cmg +/obj/item/storage/toolbox/guncase/skyrat/pistol/blueshield_cmg name = "CMG-2C Rifle Case" weapon_to_spawn = /obj/item/gun/ballistic/automatic/rom_flech/blueshield/empty -/obj/item/storage/toolbox/guncase/skyrat/blueshield_cmg/PopulateContents() +/obj/item/storage/toolbox/guncase/skyrat/pistol/blueshield_cmg/PopulateContents() new weapon_to_spawn (src) generate_items_inside(list( diff --git a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm index b23b124cdd9..2b248320e9c 100644 --- a/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm +++ b/modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm @@ -119,8 +119,8 @@ desc = "Two CMG-1, chambered in experimental steel flechette." cost = CARGO_CRATE_VALUE * 20 contains = list( - /obj/item/storage/toolbox/guncase/skyrat/rom_flech, - /obj/item/storage/toolbox/guncase/skyrat/rom_flech, + /obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech, + /obj/item/storage/toolbox/guncase/skyrat/pistol/rom_flech, ) crate_name = "RomTech CMG-1 Crate" diff --git a/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm b/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm index 7405acb815f..0fb12c3c1d4 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/gun_redemption.dm @@ -45,7 +45,7 @@ var/static/list/selectable_gun_types = list( "Energy Revolver" = /obj/item/gun/energy/e_gun/blueshield, ".457 Romulus Revolver" = /obj/item/storage/toolbox/guncase/skyrat/hos_revolver, - ".460 Rowland Magnum Pistol" = /obj/item/storage/toolbox/guncase/skyrat/m45a5 + ".460 Rowland Magnum Pistol" = /obj/item/storage/toolbox/guncase/skyrat/pistol/m45a5 ) return selectable_gun_types diff --git a/modular_skyrat/modules/sec_haul/code/misc/packs.dm b/modular_skyrat/modules/sec_haul/code/misc/packs.dm index 43a54d51028..d85ffcd35ea 100644 --- a/modular_skyrat/modules/sec_haul/code/misc/packs.dm +++ b/modular_skyrat/modules/sec_haul/code/misc/packs.dm @@ -21,7 +21,7 @@ /datum/supply_pack/goody/m1911 name = "Authentic SR Sector M1911" desc = "Old but gold, the classic pistol from the golden age of SR, whatever that place is. The M1911 chambered in .460 Ceres. It is sure to give anyone daring to fight you, a second thought. Note that this is a reproduction model by Romulus Federation and may be commonly found in the hand of a Kayit" - contains = list(/obj/item/storage/toolbox/guncase/skyrat/m1911_gold = 1, + contains = list(/obj/item/storage/toolbox/guncase/skyrat/pistol/m1911_gold = 1, ) cost = PAYCHECK_COMMAND * 25 //The pistol is more expensive than rifle because of portability. Not Lethality access_view = ACCESS_WEAPONS @@ -36,4 +36,17 @@ /datum/supply_pack/goody/nt_shotgun name = "NanoTrasen Woodstock Shotgun" desc = "A classic Shotgun used by hunters, police and frontiersmen alike, now at an affordable price." + cost = PAYCHECK_COMMAND * 20 contains = list(/obj/item/gun/ballistic/shotgun/riot, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/hunter) + +/datum/supply_pack/goody/renoster_shotgun + name = "Renoster Single Pack Shotgun" + desc = "When you really need to send the message across. A shotgun favoured by modern Sol Police, now at an affordable price." + cost = PAYCHECK_COMMAND * 20 + contains = list(/obj/item/gun/ballistic/shotgun/riot/sol, /obj/item/storage/pouch/ammo, /obj/item/storage/belt/bandolier, /obj/item/ammo_box/advanced/s12gauge/rubber) + +//OVerride the price +/datum/supply_pack/goody/double_barrel + name = "Double-barreled Shotgun Single-Pack" + desc = "Lost your beloved bunny to a demonic invasion? Clown broke in and stole your beloved gun? No worries! Get a new gun as long as you can pay the absurd fees." + cost = PAYCHECK_COMMAND * 12 diff --git a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm index 3c67e3ebfae..9a2f8262abf 100644 --- a/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm +++ b/modular_skyrat/modules/shotgunrebalance/code/shotgun.dm @@ -231,22 +231,22 @@ icon = 'modular_skyrat/modules/shotgunrebalance/icons/projectiles.dmi' icon_state = "stardust" damage = 15 - stamina = 10 + stamina = 33 damage_falloff_tile = 0.2 stamina_falloff_tile = 0.3 - wound_bonus = 15 - bare_wound_bonus = 15 + wound_bonus = 40 + bare_wound_bonus = 40 stutter = 3 SECONDS jitter = 5 SECONDS eyeblur = 1 SECONDS sharpness = NONE range = 12 embed_type = /datum/embed_data/shotgun_buckshot/antitide - reflectable = FALSE + reflectable = NONE /datum/embed_data/shotgun_buckshot/antitide embed_chance = 200 - pain_chance = 90 + pain_chance = 95 fall_chance = 10 jostle_chance = 10 ignore_throwspeed_threshold = TRUE