From 1541c3549f06d21be8a3ee254a6d0d3df7cd3fa3 Mon Sep 17 00:00:00 2001 From: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Date: Wed, 6 Dec 2023 12:20:02 -0700 Subject: [PATCH] Cherry Pick: Gives blueshields a new shoulder-bruising "submachinegun" (Early Balance Changes) (#768) https://github.com/Skyrat-SS13/Skyrat-tg/pull/24640 I want to make balance changes before our next upstream merge which will add this gun to the codebase. ## About The Pull Request TTK on an unarmored with the lethal ammo is 4 hits. But the gun itself is limited to six shots and it gives your screen a seizer plus a large spread. I'm going to test merge this. ## Why It's Good For The Game It's better then a WT-550 --------- Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> --- .../modules/blueshield/code/closet.dm | 2 +- .../code/armament_datums/sol_defense.dm | 5 ++ .../xhihao_light_arms/gunsets.dm | 30 +++++++++ .../xhihao_light_arms/{guns.dm => rifle.dm} | 0 .../xhihao_light_arms/submachinegun.dm | 61 ++++++++++++++++++ .../xhihao_light_arms/guns_lefthand.dmi | Bin 0 -> 803 bytes .../xhihao_light_arms/guns_righthand.dmi | Bin 0 -> 805 bytes .../xhihao_light_arms/guns32x.dmi | Bin 0 -> 897 bytes .../modular_weapons/icons/obj/gunsets.dmi | Bin 1833 -> 2129 bytes .../modular_weapons/sounds/smg_heavy.ogg | Bin 0 -> 27917 bytes .../game/objects/items/storage/guncases.dm | 12 ---- tgstation.dme | 5 +- 12 files changed, 100 insertions(+), 15 deletions(-) create mode 100644 modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/gunsets.dm rename modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/{guns.dm => rifle.dm} (100%) create mode 100644 modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm create mode 100644 modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_lefthand.dmi create mode 100644 modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_righthand.dmi create mode 100644 modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns32x.dmi create mode 100644 modular_skyrat/modules/modular_weapons/sounds/smg_heavy.ogg delete mode 100644 modular_zubbers/code/game/objects/items/storage/guncases.dm diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm index 05d0c216f43..fbd9495b635 100644 --- a/modular_skyrat/modules/blueshield/code/closet.dm +++ b/modular_skyrat/modules/blueshield/code/closet.dm @@ -29,6 +29,6 @@ new /obj/item/restraints/handcuffs(src) new /obj/item/clothing/glasses/hud/security/sunglasses(src) new /obj/item/storage/medkit/tactical/blueshield(src) - new /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550(src) // Bubberstation Edit + new /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo(src) new /obj/item/storage/bag/garment/blueshield(src) new /obj/item/mod/control/pre_equipped/blueshield(src) diff --git a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm index bed31b5e501..2a9c8647241 100644 --- a/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm +++ b/modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm @@ -67,6 +67,11 @@ item_type = /obj/item/gun/ballistic/automatic/sol_rifle/marksman cost = PAYCHECK_COMMAND * 12 +/datum/armament_entry/company_import/sol_defense/longarm/bogseo + item_type = /obj/item/gun/ballistic/automatic/xhihao_smg + cost = PAYCHECK_COMMAND * 10 + contraband = TRUE + /datum/armament_entry/company_import/sol_defense/longarm/infanterie item_type = /obj/item/gun/ballistic/automatic/sol_rifle cost = PAYCHECK_COMMAND * 14 diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/gunsets.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/gunsets.dm new file mode 100644 index 00000000000..62d24c15cbf --- /dev/null +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/gunsets.dm @@ -0,0 +1,30 @@ +// Base yellow carwo case + +/obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case + + icon = 'modular_skyrat/modules/modular_weapons/icons/obj/gunsets.dmi' + icon_state = "case_xhihao" + +// Empty version of the case + +/obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/empty + +/obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/empty/PopulateContents() + return + +// Contains the Bogseo submachinegun, excellent for breaking shoulders + +/obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo + name = "\improper Xhihao 'Bogseo' gunset" + + weapon_to_spawn = /obj/item/gun/ballistic/automatic/xhihao_smg/no_mag + extra_to_spawn = /obj/item/ammo_box/magazine/c585trappiste_pistol + +/obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo/PopulateContents() + new weapon_to_spawn (src) + + generate_items_inside(list( + /obj/item/ammo_box/c585trappiste/incapacitator = 1, + /obj/item/ammo_box/c585trappiste = 1, + /obj/item/ammo_box/magazine/c585trappiste_pistol/spawns_empty = 3, + ), src) diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/guns.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm similarity index 100% rename from modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/guns.dm rename to modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/rifle.dm diff --git a/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm new file mode 100644 index 00000000000..8ef4e450ec9 --- /dev/null +++ b/modular_skyrat/modules/modular_weapons/code/company_and_or_faction_based/xhihao_light_arms/submachinegun.dm @@ -0,0 +1,61 @@ +// Evil .585 smg that blueshields spawn with that will throw your screen like hell but itll sure kill whoever threatens a head really good + +/obj/item/gun/ballistic/automatic/xhihao_smg + name = "\improper Xhihao 'Bogseo' Submachinegun" + desc = "A weapon that could hardly be called a 'sub' machinegun, firing the monstrous .585 cartridge. \ + It provides enough kick to bruise a shoulder pretty bad if used without protection." + + icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns32x.dmi' + icon_state = "bogseo" + + lefthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_lefthand.dmi' + righthand_file = 'modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_righthand.dmi' + inhand_icon_state = "bogseo" + + special_mags = FALSE + + bolt_type = BOLT_TYPE_STANDARD + + w_class = WEIGHT_CLASS_BULKY + weapon_weight = WEAPON_HEAVY + slot_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_BELT + + accepted_magazine_type = /obj/item/ammo_box/magazine/c585trappiste_pistol + + fire_sound = 'modular_skyrat/modules/modular_weapons/sounds/smg_heavy.ogg' + can_suppress = TRUE + + can_bayonet = FALSE + + suppressor_x_offset = 9 + + burst_size = 1 + fire_delay = 0.15 SECONDS + actions_types = list() + + // Because we're firing a lot of these really fast, we want a lot less wound chance + projectile_wound_bonus = -20 + spread = 12.5 + // Hope you didn't need to see anytime soon + recoil = 2 + +/obj/item/gun/ballistic/automatic/xhihao_smg/give_manufacturer_examine() + AddElement(/datum/element/manufacturer_examine, COMPANY_XHIHAO) + AddComponent(/datum/component/automatic_fire, fire_delay) + +/obj/item/gun/ballistic/automatic/xhihao_smg/examine_more(mob/user) + . = ..() + + . += "The Bogseo submachinegun is seen in highly different lights based on \ + who you ask. Ask a Jovian, and they'll go off all day about how they \ + love the thing so. A big weapon for shooting big targets, like the \ + fuel-stat raiders in their large suits of armor. Ask a space pirate, however \ + and you'll get a different story. That is thanks to many SolFed anti-piracy \ + units picking the Bogseo as their standard boarding weapon. What better \ + to ruin a brigand's day than a bullet large enough to turn them into \ + mist at full auto, after all?" + + return . + +/obj/item/gun/ballistic/automatic/xhihao_smg/no_mag + spawnwithmagazine = FALSE diff --git a/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_lefthand.dmi b/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_lefthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..84252992131a0bf2a96df7690bdd3185b2c596d1 GIT binary patch literal 803 zcmV+;1Kj+HP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJeg_I5l61i!&v&s2HS+i!-e#F*g;&Hsn%PaP@Nmn+pI~>l%%< zGyM(#00MJKL_t(|ob8&yPZL2D#;3-+grsuwP%u_KlO-lX&=_NaSi=z_lo*j431R;P zF!ks~FG39-2@Mxxj1V{&8qXj`>|J}P|H0C4$lELvwmZAHw3_diG&8&V-n=(&Hr>Pf zlp=%>LI@#*5JDok#vIXIzd~J|qcXv-JiKewKA%qY@2qA#nh>C%~(VIc%bmN~%jpid6xmSO4Jtgoh5X+<*6eC4*{Z7l!* literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_righthand.dmi b/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_righthand.dmi new file mode 100644 index 0000000000000000000000000000000000000000..9c6048ad655d0b93208e151c8c086cddfd7a0f05 GIT binary patch literal 805 zcmV+=1KRwFP)V=-0C=2JR&a84_w-Y6@%7{?OD!tS%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+ z(=$pSoZ^zil2jm5DJeg_I5l61i!&v&s2HS+i!-e#F*g;&Hsn%PaP@Nmn+pI~>l%%< zGyM(#00MPML_t(|ob8&=OB+EH$H(H`BBb6tq$!ETtE>o3X^Rv=G~!XIQKYsvp)`L& zTeim@tVPsFJO-l(B4SH(C=H(dQJUu7?jijTR=z`L*>1CDcilB9em@XqCOh-q+cz_N zd0!z2A%qY@2qAF@i z`9pu@!;);1$$shVYvtIQi$1Q!Wv)ihb%;sD;04z!;5^cQvS_MjZ}hkF|IEagY?t5b zqEuX$&(_xRa%{gMesQkzvioWsHssUcM^XP>Z#v)e2>{!>MfqEJmXjHN{py`4ZSBZD z{_DEgD_ejhWG1uXN9`=oRS3FH`S*(J322l(94}-TPI9?98Q|W2!8y%3y4Z!Q1}AS& z%Zmq(9?Eg$=pY=!`0C?cq7BDlG(;9(cXv3K)0Q#8IEGQ%!_S9Ot9e{Ft>Q2(~spba7Qv$I2s1}bro;LUP z3)Ty4Y_4}8+hJ-2?2?=Lr_aTpcF$UisxMIfpa5|u6fyd#2>a3pG$L%R0OnvW)+qbR z7Hq=@d?`Pd#nTDE?rQ_XvgY1E4-mRmz&;m!oI0m%jCFnWpATW^x`2ylhjMvKVrVz5 j0AisofDl3mA;c%=OaXpir7Gf(00000NkvXXu0mjfgO7I& literal 0 HcmV?d00001 diff --git a/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns32x.dmi b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns32x.dmi new file mode 100644 index 0000000000000000000000000000000000000000..84f2df323220c8fffa5b56b04261161a6466d49c GIT binary patch literal 897 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 delta 1716 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 literal 0 HcmV?d00001 diff --git a/modular_zubbers/code/game/objects/items/storage/guncases.dm b/modular_zubbers/code/game/objects/items/storage/guncases.dm deleted file mode 100644 index ca57baaae3b..00000000000 --- a/modular_zubbers/code/game/objects/items/storage/guncases.dm +++ /dev/null @@ -1,12 +0,0 @@ -/obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550 - name = "WT-550 Gun Case" - - weapon_to_spawn = /obj/item/gun/ballistic/automatic/wt550 - extra_to_spawn = /obj/item/ammo_box/magazine/wt550m9 - -/obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/wt550/PopulateContents() // The gun and two extra mags - new weapon_to_spawn (src) - - generate_items_inside(list( - /obj/item/ammo_box/magazine/wt550m9 = 2, - ), src) diff --git a/tgstation.dme b/tgstation.dme index cbc35fcd30b..985d998e35b 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7556,7 +7556,9 @@ #include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\pistol.dm" #include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\trappiste_fabriek\revolver.dm" #include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\xhihao_light_arms\ammo.dm" -#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\xhihao_light_arms\guns.dm" +#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\xhihao_light_arms\gunsets.dm" +#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\xhihao_light_arms\rifle.dm" +#include "modular_skyrat\modules\modular_weapons\code\company_and_or_faction_based\xhihao_light_arms\submachinegun.dm" #include "modular_skyrat\modules\mold\code\_mold_defines.dm" #include "modular_skyrat\modules\mold\code\mold.dm" #include "modular_skyrat\modules\mold\code\mold_controller.dm" @@ -8018,7 +8020,6 @@ #include "modular_zubbers\code\game\objects\items\stacks\medical.dm" #include "modular_zubbers\code\game\objects\items\storage\boxes.dm" #include "modular_zubbers\code\game\objects\items\storage\briefcase.dm" -#include "modular_zubbers\code\game\objects\items\storage\guncases.dm" #include "modular_zubbers\code\game\objects\structures\trash_pile.dm" #include "modular_zubbers\code\game\objects\structures\beds_chairs\sofa.dm" #include "modular_zubbers\code\game\objects\structures\crates_lockers\closets\secure\scientist.dm"