diff --git a/Resources/Prototypes/Backmen/Adminbuse/centcomm_officers.yml b/Resources/Prototypes/Backmen/Adminbuse/centcomm_officers.yml index 9cd01090c8a..16eed9708ab 100644 --- a/Resources/Prototypes/Backmen/Adminbuse/centcomm_officers.yml +++ b/Resources/Prototypes/Backmen/Adminbuse/centcomm_officers.yml @@ -86,16 +86,6 @@ - type: Stunbaton energyPerUse: 10 -- type: entity - name: станнер спецсил - parent: WeaponDisabler - id: WeaponDisablerSuper - description: Оружие для самозащиты, которое изнуряет органические цели, пока они не свалятся с ног. - components: - - type: ProjectileBatteryAmmoProvider - proto: BulletDisabler - fireCost: 10 - - type: entity name: пояс охраны спецсил description: Может вмещать различное снаряжение службы безопасности, такое как наручники и вспышки. diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/Energy/energy.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/Energy/energy.yml index 05b9585a160..0cdbb29d731 100644 --- a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/Energy/energy.yml +++ b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/Energy/energy.yml @@ -53,3 +53,61 @@ damage: types: Heat: 22 + +- type: entity + name: 45MW.TRG + parent: BaseWeaponBatterySmall + id: WeaponDominatorNT + description: Nanotrasen's first attempt to remake the Antique Laser Gun. Has more firing modes on offer but lacks the ability to self-recharge. + components: + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-unshaded-0 + map: ["enum.GunVisualLayers.MagUnshaded"] + shader: unshaded + - type: Clothing + sprite: Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi + - type: Gun + fireRate: 2 + projectileSpeed: 75 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/laser.ogg + - type: Item + size: SmallNormal + - type: ProjectileBatteryAmmoProvider + proto: X01Attack + fireCost: 200 + - type: BatteryWeaponFireModes + fireModes: + - proto: X01Attack + fireCost: 200 + - proto: BulletDisabler + fireCost: 100 + - type: Battery + maxCharge: 2400 + startingCharge: 2400 + - type: MagazineVisuals + magState: mag + steps: 1 + zeroVisible: true + - type: Appearance + - type: StaticPrice + price: 60000 + +- type: entity + name: 45MW.TRG Super + parent: WeaponDominatorNT + id: WeaponDisablerSuper + components: + - type: BatteryWeaponFireModes + fireModes: + - proto: X01Attack + fireCost: 10 + - proto: BulletDisabler + fireCost: 10 diff --git a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml index 6962fb2da52..92c1b7570e1 100644 --- a/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml +++ b/Resources/Prototypes/Backmen/Entities/Weapons/Guns/guns64.yml @@ -1099,6 +1099,22 @@ - type: UseDelay delay: 1.5 +- type: entity + parent: WeaponRifleM28 + id: WeaponRifleM28Rubber + components: + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineRifleRubber + insertSound: /Audio/Weapons/Guns64/Rifles/m28_reload.ogg + ejectSound: /Audio/Weapons/Guns64/Rifles/m28_unload.ogg + priority: 2 + whitelist: + tags: + - MagazineRifle + - type: entity name: STG 44 parent: BaseWeaponRifle @@ -2381,6 +2397,138 @@ delay: 1.3 - type: GunRequiresWield +- type: entity + name: M-81 + parent: BaseWeaponPistol + id: WeaponLauncherM81 + suffix: Гранатомёт + description: A lightweight single-shot grenade launcher used by the UEG for area blockades and large explosions or riot police units. + components: + - type: Sprite + sprite: Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - type: Gun + fireRate: 1 + selectedMode: SemiAuto + availableModes: + - SemiAuto + soundGunshot: + path: /Audio/Weapons/Guns/Gunshots/grenade_launcher.ogg + - type: ChamberMagazineAmmoProvider + autoCycle: false + - type: ItemSlots + slots: + gun_chamber: + name: Chamber + priority: 1 + whitelist: + tags: + - Grenade + - type: ContainerContainer + containers: + gun_chamber: !type:ContainerSlot + +- type: entity + name: grenade box + parent: BoxCardboard + id: BoxGrenadeNonLetal + components: + - type: StorageFill + contents: + - id: GrenadeNonletal + amount: 4 + +- type: entity + name: grenade box + parent: BoxCardboard + id: BoxGrenadeTearGas + components: + - type: StorageFill + contents: + - id: GrenadeTearGas + amount: 4 + +- type: entity + id: GrenadeTearGas + name: tear gas grenade + parent: BaseGrenade + components: + - type: CartridgeAmmo + proto: BulletGrenadeTearGas + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: baton + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: baton + suffix: false + +- type: entity + id: BulletGrenadeTearGas + name: tear gas grenade + parent: BaseBulletTrigger + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: Projectile + deleteOnCollide: false + damage: + types: + Blunt: 1 + soundHit: + path: /Audio/Effects/gen_hit.ogg + - type: SmokeOnTrigger + duration: 10 + spreadAmount: 30 + solution: + reagents: + - ReagentId: TearGas + Quantity: 50 + +- type: entity + id: GrenadeNonletal + name: non letal grenade + parent: BaseGrenade + components: + - type: CartridgeAmmo + proto: BulletGrenadeNonletal + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi + layers: + - state: flash + map: ["enum.AmmoVisualLayers.Base"] + - type: Appearance + - type: SpentAmmoVisuals + state: flash + suffix: false + +- type: entity + id: BulletGrenadeNonletal + name: non letal grenade + parent: BaseBulletTrigger + noSpawn: true + components: + - type: Sprite + sprite: Objects/Weapons/Guns/Projectiles/projectiles2.rsi + layers: + - state: grenade + - type: FlashOnTrigger + range: 7 + - type: SpawnOnTrigger + proto: GrenadeFlashEffect + - type: ActiveTimerTrigger + timeRemaining: 0.3 + - type: DeleteOnTrigger + - type: StaminaDamageOnCollide + damage: 80 + - type: entity name: RL-5 parent: BaseWeaponLauncher @@ -2414,7 +2562,7 @@ - type: MagazineVisuals magState: mag steps: 2 - zeroVisible: true + zeroVisible: false - type: Appearance - type: Wieldable - type: UseDelay @@ -2728,6 +2876,9 @@ - type: GunRequiresWield - type: Gun fireRate: 1 + - type: Tag + tags: + - WeaponShotgunKammerer - type: entity name: Dragunov diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml index 091501b7fda..dbc1cb3ee25 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_security.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_security.yml @@ -24,7 +24,7 @@ sprite: Objects/Weapons/Guns/Battery/disabler.rsi state: base product: CrateSecurityNonlethal - cost: 4000 + cost: 5500 #Backmen category: Security group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/security.yml b/Resources/Prototypes/Catalog/Fills/Crates/security.yml index c3448657d08..b15ba4e7022 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/security.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/security.yml @@ -35,6 +35,10 @@ - id: BoxFlashbang - id: Flash amount: 3 + - id: WeaponShotgun39NonLethal #Backmen Rebalance Start + amount: 2 + - id: BoxBeanbag + amount: 2 #Backmen Rebalance End # - Pepperspray # - GrenadeTeargas @@ -50,10 +54,12 @@ amount: 2 - id: ClothingHeadHelmetRiot amount: 2 - - id: WeaponShotgun39NonLethal + - id: WeaponLauncherM81 #Backmen Rebalance Start amount: 2 - - id: BoxBeanbag + - id: BoxGrenadeTearGas amount: 2 + - id: BoxGrenadeNonLetal + amount: 2 #Backmen Rebalance End - id: RiotShield amount: 2 # - SecGasmask diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index b794e42ff7d..05faa2a069a 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -36,13 +36,13 @@ thresholds: - trigger: !type:DamageTrigger - damage: 80 + damage: 200 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] - trigger: !type:DamageTrigger - damage: 40 #This is probably enough damage before it breaks + damage: 180 #This is probably enough damage before it breaks behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] @@ -206,7 +206,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 40 + damage: 100 behaviors: - !type:DoActsBehavior acts: [ "Destruction" ] diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml index 152de7e92f2..9a7f4eacd62 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/explosives.yml @@ -122,7 +122,7 @@ - type: SpentAmmoVisuals state: frag suffix: false - + - type: entity id: GrenadeEMP name: EMP grenade @@ -154,7 +154,7 @@ - type: Item size: Small - type: Sprite - + - type: entity id: CannonBall name: cannonball diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml index fcbceb594b8..39458ad362c 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/shotgun_cabinet.yml @@ -34,7 +34,7 @@ components: - type: ItemCabinet cabinetSlot: - startingItem: WeaponShotgunKammerer + startingItem: WeaponShotguntrenchgun4034 ejectOnInteract: true whitelist: tags: diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/base.png new file mode 100644 index 00000000000..d5d7cac0a9b Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/base.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon.png new file mode 100644 index 00000000000..31cb1da4190 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon2.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon2.png new file mode 100644 index 00000000000..39ef8198ca1 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/icon2.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-left.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-left.png new file mode 100644 index 00000000000..452a4983ea1 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-left.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-right.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-right.png new file mode 100644 index 00000000000..77f4a48414a Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/inhand-right.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/mag-unshaded-0.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/mag-unshaded-0.png new file mode 100644 index 00000000000..8c5da5ab9d1 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/mag-unshaded-0.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/meta.json new file mode 100644 index 00000000000..5490f2af2b5 --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Battery/Dominator.rsi/meta.json @@ -0,0 +1,31 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by discord: sosiska_v_smekte", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon2" + }, + { + "name": "base" + }, + { + "name": "mag-unshaded-0" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/base.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/base.png new file mode 100644 index 00000000000..9065fe1c2dc Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/base.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/bolt-open.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/bolt-open.png new file mode 100644 index 00000000000..d322e56b493 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/bolt-open.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/equipped-BACKPACK.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f3504f2a993 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-left.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-left.png new file mode 100644 index 00000000000..96b0ab592c4 Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-left.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-right.png b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-right.png new file mode 100644 index 00000000000..1a4319c22da Binary files /dev/null and b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/inhand-right.png differ diff --git a/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/meta.json b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/meta.json new file mode 100644 index 00000000000..2dff9a9bd3c --- /dev/null +++ b/Resources/Textures/Backmen/Objects/Weapons/Gunsx64/Launchers/m81.rsi/meta.json @@ -0,0 +1,29 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by idk", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "bolt-open" + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/migration.yml b/Resources/migration.yml index 3a7fbd18fa7..f02a7a08f91 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -361,3 +361,7 @@ Observationskit: null # 2024-02-26 CrateBaseWeldable: CrateGenericSteel + +# 2024-09-03 Backmen +WeaponRifleLecterRubber: WeaponRifleM28Rubber +WeaponTaser: WeaponDominatorNT