mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 15:47:15 +01:00
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>
This commit is contained in:
co-authored by
Paxilmaniac
parent
879e7fb1b2
commit
1541c3549f
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
+30
@@ -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)
|
||||
+61
@@ -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
|
||||
BIN
Binary file not shown.
|
After Width: | Height: | Size: 803 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 805 B |
BIN
Binary file not shown.
|
After Width: | Height: | Size: 897 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.1 KiB |
Binary file not shown.
@@ -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)
|
||||
+3
-2
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user