diff --git a/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml b/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml index 08eb0405446..2e438d4b56f 100644 --- a/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml +++ b/Resources/Maps/_Sunrise/Nonstations/transit_hub.yml @@ -20056,7 +20056,7 @@ entities: rot: -1.5707963267948966 rad pos: 13.5,12.5 parent: 1 -- proto: WeaponLaserCannon +- proto: WeaponEarthGovLaserSniper entities: - uid: 106 components: @@ -20073,7 +20073,7 @@ entities: - type: Transform pos: 8.51783,7.583647 parent: 1 -- proto: WeaponRifleLecter +- proto: WeaponRifleFamas entities: - uid: 1625 components: diff --git a/Resources/Maps/_Sunrise/Shuttles/cburn_ert_shuttle.yml b/Resources/Maps/_Sunrise/Shuttles/cburn_ert_shuttle.yml index 484d8f0cb71..f2cdbd57232 100644 --- a/Resources/Maps/_Sunrise/Shuttles/cburn_ert_shuttle.yml +++ b/Resources/Maps/_Sunrise/Shuttles/cburn_ert_shuttle.yml @@ -1800,7 +1800,7 @@ entities: - type: Transform pos: 2.5,0.5 parent: 1 -- proto: WeaponLaserCannon +- proto: WeaponEarthGovLaserSniper entities: - uid: 166 components: diff --git a/Resources/Maps/_Sunrise/Shuttles/emergency_delta.yml b/Resources/Maps/_Sunrise/Shuttles/emergency_delta.yml index dd0a1bbaeca..3ae4579b434 100644 --- a/Resources/Maps/_Sunrise/Shuttles/emergency_delta.yml +++ b/Resources/Maps/_Sunrise/Shuttles/emergency_delta.yml @@ -8993,7 +8993,7 @@ entities: rot: 1.5707963267948966 rad pos: -17.5,-12.5 parent: 410 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 438 components: diff --git a/Resources/Maps/_Sunrise/Shuttles/prison.yml b/Resources/Maps/_Sunrise/Shuttles/prison.yml index 8c428b6ef8d..3d174ae6388 100644 --- a/Resources/Maps/_Sunrise/Shuttles/prison.yml +++ b/Resources/Maps/_Sunrise/Shuttles/prison.yml @@ -3050,7 +3050,7 @@ entities: rot: 3.141592653589793 rad pos: 4.5,-2.5 parent: 1 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 419 components: diff --git a/Resources/Maps/_Sunrise/Shuttles/security.yml b/Resources/Maps/_Sunrise/Shuttles/security.yml index ecb00c5b681..46bd40249a0 100644 --- a/Resources/Maps/_Sunrise/Shuttles/security.yml +++ b/Resources/Maps/_Sunrise/Shuttles/security.yml @@ -3771,7 +3771,7 @@ entities: - type: Transform pos: 0.5,-5.5 parent: 44868 -- proto: WeaponLaserCarbine +- proto: WeaponEarthGovLaserCarbine entities: - uid: 44971 components: diff --git a/Resources/Maps/_Sunrise/Station/box.yml b/Resources/Maps/_Sunrise/Station/box.yml index b7db81ac815..cc74adf9a2f 100644 --- a/Resources/Maps/_Sunrise/Station/box.yml +++ b/Resources/Maps/_Sunrise/Station/box.yml @@ -123179,7 +123179,7 @@ entities: - type: Transform pos: -52.5,5.5 parent: 8364 -- proto: MagazinePistolSubMachineGunTopMounted +- proto: MagazineM16A4 entities: - uid: 534 components: @@ -169224,7 +169224,7 @@ entities: - type: Transform pos: -2.5,38.5 parent: 8364 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 8819 components: @@ -169295,7 +169295,7 @@ entities: - type: Transform pos: 21.462696,34.988297 parent: 8364 -- proto: WeaponSubMachineGunWt550 +- proto: WeaponRifleM16A4 entities: - uid: 536 components: diff --git a/Resources/Maps/_Sunrise/Station/centcomm.yml b/Resources/Maps/_Sunrise/Station/centcomm.yml index 8263d003acf..bd40016a491 100644 --- a/Resources/Maps/_Sunrise/Station/centcomm.yml +++ b/Resources/Maps/_Sunrise/Station/centcomm.yml @@ -27533,7 +27533,7 @@ entities: - type: Transform pos: 6.5,-9.5 parent: 1668 -- proto: MagazinePistolSubMachineGunTopMounted +- proto: MagazineM16A4 entities: - uid: 3896 components: @@ -41380,7 +41380,7 @@ entities: - type: Transform pos: 24.5,-9.5 parent: 1668 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 4697 components: @@ -41443,7 +41443,7 @@ entities: - type: Transform pos: 13.481927,32.663063 parent: 1668 -- proto: WeaponRevolverMateba +- proto: WeaponRevolverMatebaNew entities: - uid: 1436 components: @@ -41465,7 +41465,7 @@ entities: - type: Transform pos: 16.628334,30.272438 parent: 1668 -- proto: WeaponSniperHristov +- proto: WeaponRifleBR64 entities: - uid: 3138 components: @@ -41479,7 +41479,7 @@ entities: - type: Transform pos: 8.51666,29.42835 parent: 1668 -- proto: WeaponSubMachineGunWt550 +- proto: WeaponRifleM16A4 entities: - uid: 3895 components: diff --git a/Resources/Maps/_Sunrise/Station/fland.yml b/Resources/Maps/_Sunrise/Station/fland.yml index ab44b83f6bf..127bd677316 100644 --- a/Resources/Maps/_Sunrise/Station/fland.yml +++ b/Resources/Maps/_Sunrise/Station/fland.yml @@ -220888,7 +220888,7 @@ entities: - type: Transform pos: 35.504837,-33.413353 parent: 13329 -- proto: WeaponPistolMk58 +- proto: WeaponPistolACP14 entities: - uid: 10639 components: @@ -220905,7 +220905,7 @@ entities: - type: Transform pos: 17.56414,13.463523 parent: 13329 -- proto: WeaponRifleAk +- proto: WeaponAKMSRifle entities: - uid: 10496 components: @@ -220913,7 +220913,7 @@ entities: rot: 1.5707963267948966 rad pos: 35.367424,20.732126 parent: 13329 -- proto: WeaponRifleLecter +- proto: WeaponRifleFamas entities: - uid: 10666 components: @@ -220930,7 +220930,7 @@ entities: - type: Transform pos: 19.43914,12.321453 parent: 13329 -- proto: WeaponShotgunEnforcer +- proto: WeaponShotgunSPAS12 entities: - uid: 10632 components: @@ -220955,7 +220955,7 @@ entities: rot: -1.5707963267948966 rad pos: -39.140755,78.51152 parent: 13329 -- proto: WeaponSubMachineGunDrozd +- proto: WeaponSubMachineGunMP7 entities: - uid: 1348 components: diff --git a/Resources/Maps/_Sunrise/Station/marathon.yml b/Resources/Maps/_Sunrise/Station/marathon.yml index f92bdd7264a..a23c7c26d19 100644 --- a/Resources/Maps/_Sunrise/Station/marathon.yml +++ b/Resources/Maps/_Sunrise/Station/marathon.yml @@ -100165,7 +100165,7 @@ entities: - type: Transform pos: -20.370735,-69.56265 parent: 30 -- proto: MagazinePistolSubMachineGunTopMounted +- proto: MagazineM16A4 entities: - uid: 1999 components: @@ -138193,7 +138193,7 @@ entities: parent: 30 - type: Physics canCollide: False -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 1563 components: @@ -138259,7 +138259,7 @@ entities: - type: Transform pos: -38.316597,60.345554 parent: 30 -- proto: WeaponShotgunKammerer +- proto: WeaponShotgunTrenchgun4034 entities: - uid: 1978 components: @@ -138285,7 +138285,7 @@ entities: - type: Transform pos: -41.445473,54.621906 parent: 30 -- proto: WeaponSubMachineGunWt550 +- proto: WeaponRifleM16A4 entities: - uid: 2000 components: diff --git a/Resources/Maps/_Sunrise/Station/origin.yml b/Resources/Maps/_Sunrise/Station/origin.yml index 7f008fa3c2f..ad9635a639a 100644 --- a/Resources/Maps/_Sunrise/Station/origin.yml +++ b/Resources/Maps/_Sunrise/Station/origin.yml @@ -142075,7 +142075,7 @@ entities: - type: Transform pos: 29.030212,32.493073 parent: 2 -- proto: MagazinePistolSubMachineGunTopMounted +- proto: MagazineM16A4 entities: - uid: 21624 components: @@ -198129,7 +198129,7 @@ entities: - type: Transform pos: -16.5,-21.5 parent: 2 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 31158 components: @@ -198146,7 +198146,7 @@ entities: - type: Transform pos: 12.453639,21.54209 parent: 2 -- proto: WeaponLaserCarbine +- proto: WeaponEarthGovLaserCarbine entities: - uid: 31161 components: @@ -198163,7 +198163,7 @@ entities: - type: Transform pos: 27.55704,27.505564 parent: 2 -- proto: WeaponPistolMk58 +- proto: WeaponPistolACP14 entities: - uid: 31164 components: @@ -198199,7 +198199,7 @@ entities: - type: Transform pos: 23.444613,-35.267536 parent: 2 -- proto: WeaponShotgunKammerer +- proto: WeaponShotgunTrenchgun4034 entities: - uid: 31170 components: @@ -198216,7 +198216,7 @@ entities: - type: Transform pos: 26.709015,32.580257 parent: 2 -- proto: WeaponSubMachineGunDrozd +- proto: WeaponSubMachineGunMP7 entities: - uid: 31173 components: @@ -198238,7 +198238,7 @@ entities: - type: Transform pos: 28.25588,32.289948 parent: 2 -- proto: WeaponSubMachineGunWt550 +- proto: WeaponRifleM16A4 entities: - uid: 31177 components: diff --git a/Resources/Maps/_Sunrise/planet_prison.yml b/Resources/Maps/_Sunrise/planet_prison.yml index 2efe09c0a96..7ea19ee4d32 100644 --- a/Resources/Maps/_Sunrise/planet_prison.yml +++ b/Resources/Maps/_Sunrise/planet_prison.yml @@ -127337,7 +127337,7 @@ entities: rot: -1.5707963267948966 rad pos: 115.3729,72.07151 parent: 2 -- proto: WeaponDisabler +- proto: WeaponEnergyGunMini entities: - uid: 15556 components: @@ -127405,7 +127405,7 @@ entities: - type: Transform pos: 85.46081,-16.284866 parent: 2 -- proto: WeaponLaserCarbine +- proto: WeaponEarthGovLaserCarbine entities: - uid: 15568 components: @@ -127486,7 +127486,7 @@ entities: - type: Transform pos: 98.35489,5.5269833 parent: 2 -- proto: WeaponPistolMk58 +- proto: WeaponPistolACP14 entities: - uid: 13795 components: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index c85f376cec7..42c3a8b2837 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -35,6 +35,7 @@ containers: ballistic-ammo: !type:Container ents: [] + - type: ZoomableGun - type: StaticPrice price: 500 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml index a43b18056fe..7c547dcd5b3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/light_rifle.yml @@ -45,39 +45,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazineP90 - name: P90 magazine - parent: BaseItem - components: - - type: Tag - tags: - - MagazineP90 - - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgeLightRifle # 57x28 - whitelist: - tags: - - CartridgeLightRifle # 57x28 - capacity: 50 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/p90.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 6 - zeroVisible: false - - type: Appearance - - type: entity id: MagazineMP38 name: MP38 magazine @@ -111,72 +78,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazineMP7 - name: MP7 magazine - parent: BaseItem - components: - - type: Tag - tags: - - MagazineMP7 - - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgeLightRifle # 57x28 - whitelist: - tags: - - CartridgeLightRifle # 57x28 - capacity: 45 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/mp7.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineMP5 - name: MP5 magazine - parent: BaseItem - components: - - type: Tag - tags: - - MagazineMP5 - - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgeLightRifle # 57x28 - whitelist: - tags: - - CartridgeLightRifle # 57x28 - capacity: 45 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/mp5.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - - type: entity id: MagazineScorpion name: Scorpion magazine @@ -460,39 +361,6 @@ zeroVisible: false - type: Appearance -- type: entity - id: MagazinePPSH41 - name: PPSH magazine - parent: BaseItem - components: - - type: Tag - tags: - - MagazinePPSH41 - - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgeLightRifle # 57x28 - whitelist: - tags: - - CartridgeLightRifle # 57x28 - capacity: 71 - - type: Item - size: Small - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/ppsh41.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - - type: entity id: MagazineSTG44 name: STG44 magazine diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml index 27684a466c3..96318029d98 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/pistol.yml @@ -27,60 +27,27 @@ map: ["enum.GunVisualLayers.Mag"] - type: entity - id: MagazineFamas - name: Famas magazine + id: MagazineP90 + name: P90 magazine parent: BaseItem components: - type: Tag tags: - - MagazineFamas - - type: Item - size: Small + - MagazineP90 - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgePistol # 556 + proto: CartridgePistol whitelist: tags: - - CartridgePistol # 556 - capacity: 25 - - type: ContainerContainer - containers: - ballistic-ammo: !type:Container - - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/famas.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-1 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 2 - zeroVisible: false - - type: Appearance - -- type: entity - id: MagazineG36 - name: G36 magazine - parent: BaseItem - components: - - type: Tag - tags: - - MagazineG36 + - CartridgePistol + capacity: 50 - type: Item size: Small - - type: BallisticAmmoProvider - mayTransfer: true - proto: CartridgePistol # 556 - whitelist: - tags: - - CartridgePistol # 556 - capacity: 25 - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/g36.rsi + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/p90.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -88,32 +55,32 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 6 zeroVisible: false - type: Appearance - type: entity - id: MagazineM28 - name: M28 magazine + id: MagazineMP7 + name: MP7 magazine parent: BaseItem components: - type: Tag tags: - - MagazineM28 - - type: Item - size: Small + - MagazineMP7 - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgePistol # 556 + proto: CartridgePistol whitelist: tags: - - CartridgePistol # 556 - capacity: 25 + - CartridgePistol + capacity: 45 + - type: Item + size: Small - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/m28.rsi + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/mp7.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -126,27 +93,27 @@ - type: Appearance - type: entity - id: MagazineAR18 - name: AR18 magazine + id: MagazineMP5 + name: MP5 magazine parent: BaseItem components: - type: Tag tags: - - MagazineAR18 - - type: Item - size: Small + - MagazineMP5 - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgePistol # 556 + proto: CartridgePistol whitelist: tags: - - CartridgePistol # 556 - capacity: 25 + - CartridgePistol + capacity: 45 + - type: Item + size: Small - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/ar18.rsi + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/mp5.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] @@ -159,27 +126,27 @@ - type: Appearance - type: entity - id: MagazineM16A4 - name: M16A4 magazine + id: MagazinePPSH41 + name: PPSH magazine parent: BaseItem components: - type: Tag tags: - - MagazineM16A4 - - type: Item - size: Small + - MagazinePPSH41 - type: BallisticAmmoProvider mayTransfer: true - proto: CartridgePistol # 556 + proto: CartridgeLightRifle # 57x28 whitelist: tags: - - CartridgePistol # 556 - capacity: 25 + - CartridgeLightRifle # 57x28 + capacity: 71 + - type: Item + size: Small - type: ContainerContainer containers: ballistic-ammo: !type:Container - type: Sprite - sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/m16a4.rsi + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/ppsh41.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml index ffd5bcceefa..2b9498ef7ba 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/rifle.yml @@ -44,4 +44,169 @@ magState: mag steps: 2 zeroVisible: false - - type: Appearance \ No newline at end of file + - type: Appearance + +- type: entity + id: MagazineFamas + name: Famas magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineFamas + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeRifle + whitelist: + tags: + - CartridgeRifle + capacity: 25 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/famas.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineG36 + name: G36 magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineG36 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeRifle + whitelist: + tags: + - CartridgeRifle + capacity: 25 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/g36.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineM28 + name: M28 magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineM28 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeRifle # 556 + whitelist: + tags: + - CartridgeRifle # 556 + capacity: 25 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/m28.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineAR18 + name: AR18 magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineAR18 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeRifle # 556 + whitelist: + tags: + - CartridgeRifle # 556 + capacity: 25 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/ar18.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance + +- type: entity + id: MagazineM16A4 + name: M16A4 magazine + parent: BaseItem + components: + - type: Tag + tags: + - MagazineM16A4 + - type: Item + size: Small + - type: BallisticAmmoProvider + mayTransfer: true + proto: CartridgeLightRifle # 556 + whitelist: + tags: + - CartridgeLightRifle # 556 + capacity: 25 + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Sprite + sprite: _Sunrise/Entities/Objects/Weapons/Guns/Magazines/m16a4.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-1 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml index e2ebd015777..f62d711e02c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Ammunition/Magazines/sniper.yml @@ -47,10 +47,10 @@ - type: BallisticAmmoProvider mayTransfer: true capacity: 20 - proto: CartridgeMagnum # 062 + proto: CartridgeAntiMateriel # 062 whitelist: tags: - - CartridgeMagnum # 062 + - CartridgeAntiMateriel # 062 - type: ContainerContainer containers: ballistic-ammo: !type:Container diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index 90223a167bf..1c73963cee0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -370,7 +370,7 @@ fireCost: 50 - type: Wieldable - type: UseDelay - delay: 1.5 + delay: 0.5 - type: entity name: EarthGov laser carbine @@ -466,7 +466,7 @@ fireCost: 50 - type: Wieldable - type: UseDelay - delay: 2.5 + delay: 0.5 - type: entity name: EarthGov Experemental X-Ray @@ -512,7 +512,7 @@ fireCost: 100 - type: Wieldable - type: UseDelay - delay: 2.5 + delay: 0.5 - type: entity name: EarthGov heavy laser rifle @@ -557,7 +557,7 @@ fireCost: 100 - type: Wieldable - type: UseDelay - delay: 2.5 + delay: 0.5 - type: ZoomableGun - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml index 1d0ed566603..ceb588e62a3 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/HMGs/hmgs.yml @@ -27,7 +27,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 2.3 + delay: 0.5 - type: GunRequiresWield - type: entity diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml index 48848beaf76..ed9a4a61a2c 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/LMGs/lmgs.yml @@ -55,7 +55,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.9 + delay: 0.5 - type: GunRequiresWield - type: ChamberMagazineAmmoProvider soundRack: @@ -116,7 +116,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.9 + delay: 0.5 - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/_Sunrise/Weapons/Guns/LMGs/cocked.ogg @@ -178,7 +178,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.9 + delay: 0.5 - type: GunRequiresWield - type: ChamberMagazineAmmoProvider soundRack: diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml index 1a5e74580ba..423731650f0 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Launchers/launchers.yml @@ -67,7 +67,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: GunRequiresWield - type: entity @@ -109,5 +109,5 @@ path: /Audio/Weapons/Guns/MagIn/batrifle_magin.ogg - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: GunRequiresWield diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index 4921e863140..15392602a91 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -144,7 +144,6 @@ soundRack: path: /Audio/_Sunrise/Weapons/Guns/Pistols/glock22/glock22_cocked.ogg - - type: entity name: Glock-22 parent: BaseWeaponPistol diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index 9f5e8116988..f5c5139338e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -45,7 +45,7 @@ - type: Gun minAngle: 24 maxAngle: 45 - fireRate: 5 # 10 в секунду - реалистично. 5, так как сс14 + fireRate: 7 # 10 в секунду - реалистично. 5, так как сс14 soundGunshot: collection: ak47 - type: ItemSlots @@ -77,7 +77,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_cocked.ogg @@ -157,6 +157,7 @@ - type: Gun minAngle: 24 maxAngle: 45 + fireRate: 7 soundGunshot: collection: famas - type: ItemSlots @@ -170,14 +171,14 @@ whitelist: tags: - MagazineFamas - - MagazinePistolSubMachineGun + - MagazineRifle gun_chamber: name: Chamber - startingItem: CartridgePistol # 556 + startingItem: CartridgeRifle priority: 1 whitelist: tags: - - CartridgePistol # 556 + - CartridgeRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -189,7 +190,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.5 + delay: 0.5 - type: ChamberMagazineAmmoProvider soundRack: path: /Audio/_Sunrise/Weapons/Guns/Rifles/Famas/famas_cocked.ogg @@ -216,6 +217,7 @@ - type: Gun minAngle: 24 maxAngle: 45 + fireRate: 6 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Rifles/g36/g36_shot.ogg - type: ItemSlots @@ -229,14 +231,14 @@ whitelist: tags: - MagazineG36 - - MagazinePistolSubMachineGun + - MagazineRifle gun_chamber: name: Chamber - startingItem: CartridgePistol # 556 + startingItem: CartridgeRifle priority: 1 whitelist: tags: - - CartridgePistol # 556 + - CartridgeRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -248,7 +250,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: entity name: M-28 @@ -272,6 +274,7 @@ - type: Gun minAngle: 24 maxAngle: 45 + fireRate: 6 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Rifles/m28/m28.ogg - type: ItemSlots @@ -285,14 +288,14 @@ whitelist: tags: - MagazineM28 - - MagazinePistolSubMachineGun + - MagazineRifle gun_chamber: name: Chamber - startingItem: CartridgePistol # 556 + startingItem: CartridgeRifle priority: 1 whitelist: tags: - - CartridgePistol # 556 + - CartridgeRifle - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -304,7 +307,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.5 + delay: 0.5 - type: entity name: AR-18 @@ -328,6 +331,7 @@ - type: Gun minAngle: 24 maxAngle: 45 + fireRate: 6 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Rifles/ar18/ar18_shot.ogg - type: ItemSlots @@ -341,14 +345,14 @@ whitelist: tags: - MagazineAR18 - - MagazinePistolSubMachineGun + - MagazineRifle gun_chamber: name: Chamber - startingItem: CartridgePistol # 556 + startingItem: CartridgeRifle # 556 priority: 1 whitelist: tags: - - CartridgePistol # 556 + - CartridgeRifle # 556 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -360,7 +364,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: entity name: M16A4 @@ -384,20 +388,21 @@ - type: Gun minAngle: 24 maxAngle: 45 - fireRate: 5 + fireRate: 6 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Rifles/m16a4/m16a4_shot.ogg - type: ItemSlots slots: gun_magazine: name: Magazine - startingItem: MagazineLightRifle + startingItem: MagazineM16A4 insertSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_reload.ogg ejectSound: /Audio/_Sunrise/Weapons/Guns/Rifles/AK/ak_unload.ogg priority: 2 whitelist: tags: - MagazineLightRifle + - MagazineM16A4 gun_chamber: name: Chamber startingItem: CartridgeLightRifle # 556 @@ -416,7 +421,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.5 + delay: 0.5 - type: entity name: STG 44 @@ -474,7 +479,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: entity name: V-31 assault rifle @@ -527,4 +532,4 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 03367c974fb..bdaa88f64a4 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -86,11 +86,11 @@ - MagazineP90 gun_chamber: name: Chamber - startingItem: CartridgeLightRifle # 57x28 + startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgeLightRifle # 57x28 + - CartridgePistol - type: MagazineVisuals magState: mag steps: 6 @@ -153,7 +153,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: entity name: MP7 @@ -191,13 +191,14 @@ whitelist: tags: - MagazineMP7 + - MagazinePistolSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgeLightRifle # 57x28 + startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgeLightRifle # 57x28 + - CartridgePistol - type: MagazineVisuals magState: mag steps: 1 @@ -245,13 +246,14 @@ whitelist: tags: - MagazineMP5 + - MagazinePistolSubMachineGun gun_chamber: name: Chamber - startingItem: CartridgeLightRifle # 57x28 + startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgeLightRifle # 57x28 + - CartridgePistol - type: MagazineVisuals magState: mag steps: 1 @@ -331,7 +333,7 @@ - type: Gun minAngle: 24 maxAngle: 45 - fireRate: 14 + fireRate: 7 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/SMGs/new_vector/vector_shot.ogg - type: ItemSlots @@ -359,7 +361,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: entity name: PPSH-41 @@ -403,11 +405,11 @@ - MagazinePPSH41 gun_chamber: name: Chamber - startingItem: CartridgeLightRifle # 57x28 + startingItem: CartridgePistol priority: 1 whitelist: tags: - - CartridgeLightRifle # 57x28 + - CartridgePistol - type: MagazineVisuals magState: mag steps: 1 @@ -415,7 +417,7 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: entity name: MS-42 @@ -470,7 +472,7 @@ steps: 1 zeroVisible: true - type: Appearance - + - type: entity name: AJ-100 parent: BaseWeaponSubMachineGun @@ -526,7 +528,7 @@ steps: 1 zeroVisible: true - type: Appearance - + - type: entity name: Пистолет-пулёмет SIAR-52 parent: BaseWeaponSubMachineGun @@ -577,4 +579,4 @@ magState: mag steps: 1 zeroVisible: true - - type: Appearance \ No newline at end of file + - type: Appearance diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 08cd55a8863..454dfbef81d 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -13,10 +13,10 @@ capacity: 10 - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: GunRequiresWield - type: Gun - fireRate: 1 + fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/XM1014/xm1014_shot.ogg # SUNRISE sounds @@ -39,7 +39,7 @@ path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/insert.ogg - type: Wieldable - type: UseDelay - delay: 0.1 + delay: 0.5 - type: GunRequiresWield - type: Gun fireRate: 2.5 @@ -63,10 +63,10 @@ capacity: 10 - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: GunRequiresWield - type: Gun - fireRate: 1 + fireRate: 2 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Shotguns/spas_12/spas12_shot.ogg @@ -89,10 +89,10 @@ path: /Audio/_Sunrise/Weapons/Guns/Shotguns/Different/insert.ogg - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: GunRequiresWield - type: Gun - fireRate: 2 + fireRate: 1 - type: entity name: Zauer @@ -112,5 +112,7 @@ sprite: _Sunrise/Entities/Objects/Weapons/Guns/Shotguns/zauer/tiny.rsi - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: GunRequiresWield + - type: Gun + fireRate: 2 diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index c18bc4230ff..ce15a9aa43e 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -1,6 +1,6 @@ - type: entity name: Dragunov - parent: BaseWeaponRifle + parent: [ BaseWeaponRifle, BaseGunWieldable ] id: WeaponSniperDragunov components: - type: Sprite @@ -23,7 +23,7 @@ - SemiAuto minAngle: 24 maxAngle: 45 - fireRate: 1.25 + fireRate: 1.5 soundGunshot: path: /Audio/_Sunrise/Weapons/Guns/Snipers/Dragunov/dragunov_shot.ogg params: @@ -54,20 +54,18 @@ containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - ballistic-ammo: !type:Container - type: MagazineVisuals magState: mag steps: 1 zeroVisible: true - type: Appearance - - type: Wieldable - - type: UseDelay - delay: 1.5 - type: ZoomableGun + - type: UseDelay + delay: 0.5 - type: entity name: BR-64 - parent: BaseWeaponRifle + parent: [ BaseWeaponRifle, BaseGunWieldable ] id: WeaponRifleBR64 components: - type: Sprite @@ -94,10 +92,6 @@ volume: -3 soundEmpty: path: /Audio/_Sunrise/Weapons/Guns/Snipers/Different/empty.ogg - - type: MagazineAmmoProvider - - type: ChamberMagazineAmmoProvider - autoEject: true - boltClosed: null - type: ItemSlots slots: gun_magazine: @@ -109,6 +103,13 @@ whitelist: tags: - MagazineBR64 + gun_chamber: + name: Chamber + startingItem: CartridgeAntiMateriel # 062 + priority: 1 + whitelist: + tags: + - CartridgeAntiMateriel # 062 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot @@ -120,12 +121,15 @@ - type: Appearance - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: ZoomableGun + - type: ChamberMagazineAmmoProvider + autoEject: true + boltClosed: null - type: entity name: SR-127 Bauer bolt action rifle - parent: BaseWeaponRifle + parent: [ BaseWeaponRifle, BaseGunWieldable ] id: WeaponRifleBauer127 components: - type: Sprite @@ -167,11 +171,17 @@ whitelist: tags: - MagazineBauer127 + gun_chamber: + name: Chamber + startingItem: CartridgeAntiMateriel # 062 + priority: 1 + whitelist: + tags: + - CartridgeAntiMateriel # 062 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - ballistic-ammo: !type:Container - type: MagazineVisuals magState: mag steps: 1 @@ -180,7 +190,7 @@ - type: GunRequiresWield - type: Wieldable - type: UseDelay - delay: 1.3 + delay: 0.5 - type: ZoomableGun - type: entity @@ -204,9 +214,8 @@ path: /Audio/_Sunrise/Weapons/Guns/Snipers/garand/garand_empty.ogg - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: GunRequiresWield - - type: ZoomableGun - type: entity name: Kardashev-Mosin @@ -223,6 +232,5 @@ fireRate: 0.8 - type: Wieldable - type: UseDelay - delay: 0.8 + delay: 0.5 - type: GunRequiresWield - - type: ZoomableGun diff --git a/Resources/migration.yml b/Resources/migration.yml index 74911934a98..77f0646ce78 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -401,3 +401,17 @@ AirlockExternalGlassShuttleArrivals: AirlockExternalGlassShuttleArrivalsLocked AirlockHatchSyndicate: AirlockHatchSyndicateLocked SurveillanceCameraWirelessRouterBase: SurveillanceCameraWirelessRouterConstructed CryogenicSleepUnitSpawner: CryogenicSleepUnitSpawnerLateJoin +WeaponLaserCannon: WeaponEarthGovLaserSniper +WeaponRifleLecter: WeaponRifleFamas +WeaponDisabler: WeaponEnergyGunMini +MagazinePistolSubMachineGunTopMounted: MagazineM16A4 +WeaponSubMachineGunWt550: WeaponRifleM16A4 +WeaponRevolverMateba: WeaponRevolverMatebaNew +WeaponSniperHristov: WeaponRifleBR64 +WeaponLaserCarbine: WeaponEarthGovLaserCarbine +WeaponPistolMk58: WeaponPistolACP14 +WeaponRifleAk: WeaponAKMSRifle +WeaponRifleM90GrenadeLauncher: WeaponRifleM28 +WeaponShotgunEnforcer: WeaponShotgunSPAS12 +WeaponShotgunKammerer: WeaponShotgunTrenchgun4034 +WeaponSubMachineGunDrozd: WeaponSubMachineGunMP7