diff --git a/modular_skyrat/modules/blueshield/code/closet.dm b/modular_skyrat/modules/blueshield/code/closet.dm index 9de62924fff..53b77308c35 100644 --- a/modular_skyrat/modules/blueshield/code/closet.dm +++ b/modular_skyrat/modules/blueshield/code/closet.dm @@ -34,6 +34,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/sindano(src) FF EDIT: DELETION - BLUESHIELD-REARM + // new /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo(src) FF EDIT: DELETION - BLUESHIELD-REARM 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 0df662cd959..adc25d80147 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 @@ -65,6 +65,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 00000000000..84252992131 Binary files /dev/null and b/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_lefthand.dmi differ 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 00000000000..9c6048ad655 Binary files /dev/null and b/modular_skyrat/modules/modular_weapons/icons/mob/company_and_or_faction_based/xhihao_light_arms/guns_righthand.dmi differ 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 00000000000..84f2df32322 Binary files /dev/null and b/modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/xhihao_light_arms/guns32x.dmi differ diff --git a/modular_skyrat/modules/modular_weapons/icons/obj/gunsets.dmi b/modular_skyrat/modules/modular_weapons/icons/obj/gunsets.dmi index 098a8f30481..a80ebc5c5a4 100644 Binary files a/modular_skyrat/modules/modular_weapons/icons/obj/gunsets.dmi and b/modular_skyrat/modules/modular_weapons/icons/obj/gunsets.dmi differ diff --git a/modular_skyrat/modules/modular_weapons/sounds/smg_heavy.ogg b/modular_skyrat/modules/modular_weapons/sounds/smg_heavy.ogg new file mode 100644 index 00000000000..77a11a524a7 Binary files /dev/null and b/modular_skyrat/modules/modular_weapons/sounds/smg_heavy.ogg differ diff --git a/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm b/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm index a80509edf41..75f4180108d 100644 --- a/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm +++ b/tff_modular/modules/blueshield-rearm/code/weapon_beacon.dm @@ -15,6 +15,7 @@ // а доставкой прилетит набор с оружием. /obj/item/gun/energy/blueshield = /obj/item/storage/belt/holster/energy/blueshield, /obj/item/gun/ballistic/automatic/sol_smg = /obj/item/storage/toolbox/guncase/skyrat/carwo_large_case/sindano, + /obj/item/gun/ballistic/automatic/xhihao_smg = /obj/item/storage/toolbox/guncase/skyrat/xhihao_large_case/bogseo, ) for(var/obj/item/weapon as anything in possible_weapons) blueshield_weapons[initial(weapon.name)] = possible_weapons[weapon] diff --git a/tgstation.dme b/tgstation.dme index b907f2b4752..ca33f1a6550 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -7554,7 +7554,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"