From 779aa3a93553367238cb242bf8de85bc3195e012 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 08:01:48 +1000 Subject: [PATCH 01/27] Update snipers.yml Signed-off-by: Raikyr0 --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 7a8dd8f2267..e2e15f9432f 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -17,11 +17,15 @@ path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - type: BallisticAmmoProvider # autoCycle: true - capacity: 5 + capacity: 8 proto: CartridgeLightRifle whitelist: tags: - CartridgeLightRifle + - type: ChamberMagazineAmmoProvider + autoEject: true + soundAutoEject: + path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg - type: entity name: ceremonial rifle From a13f55f9b793ee7fa318bd821da2e9646726d28b Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 08:02:21 +1000 Subject: [PATCH 02/27] Add files via upload Signed-off-by: Raikyr0 --- .../Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg | Bin 0 -> 15734 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg diff --git a/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg new file mode 100644 index 0000000000000000000000000000000000000000..8fe66c4cef240007895b6a67c8718d2aebc8dabb GIT binary patch literal 15734 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 B-9G>T literal 0 HcmV?d00001 From 1cbd576b531663670a74b79be08120ae1b7f798d Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 08:28:26 +1000 Subject: [PATCH 03/27] Update snipers.yml Signed-off-by: Raikyr0 --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index e2e15f9432f..5f27491f0ef 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -46,8 +46,12 @@ path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - type: BallisticAmmoProvider # autoCycle: true - capacity: 5 + capacity: 8 proto: CartridgeLightRifle whitelist: tags: - CartridgeLightRifle + - type: ChamberMagazineAmmoProvider + autoEject: true + soundAutoEject: + path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg From 9abecf83f27421a46e221de46f4abaaf502b4d6e Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 08:32:09 +1000 Subject: [PATCH 04/27] Update snipers.yml Signed-off-by: Raikyr0 --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 5f27491f0ef..1da05e257f9 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -23,7 +23,6 @@ tags: - CartridgeLightRifle - type: ChamberMagazineAmmoProvider - autoEject: true soundAutoEject: path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg @@ -52,6 +51,5 @@ tags: - CartridgeLightRifle - type: ChamberMagazineAmmoProvider - autoEject: true soundAutoEject: path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg From 5b75f24c0d18c4b0048442a749273a08b23b207f Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 08:53:08 +1000 Subject: [PATCH 05/27] Update snipers.yml Signed-off-by: Raikyr0 --- .../Entities/Objects/Weapons/Guns/Snipers/snipers.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 1da05e257f9..5f27491f0ef 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -23,6 +23,7 @@ tags: - CartridgeLightRifle - type: ChamberMagazineAmmoProvider + autoEject: true soundAutoEject: path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg @@ -51,5 +52,6 @@ tags: - CartridgeLightRifle - type: ChamberMagazineAmmoProvider + autoEject: true soundAutoEject: path: /Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg From dc34f72c21ba62f6d3f4bec43d86aaaa06f82157 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 09:36:42 +1000 Subject: [PATCH 06/27] Rename M1_empty_alarm.ogg to M1_empty_alarm2.ogg Signed-off-by: Raikyr0 --- .../{M1_empty_alarm.ogg => M1_empty_alarm2.ogg} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Audio/Weapons/Guns/EmptyAlarm/{M1_empty_alarm.ogg => M1_empty_alarm2.ogg} (100%) diff --git a/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm2.ogg similarity index 100% rename from Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg rename to Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm2.ogg From 3cb9abbadfd7d73630baafd80869462d1766527a Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 09:37:06 +1000 Subject: [PATCH 07/27] Add files via upload Signed-off-by: Raikyr0 --- .../Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg | Bin 0 -> 34015 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg diff --git a/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg b/Resources/Audio/Weapons/Guns/EmptyAlarm/M1_empty_alarm.ogg new file mode 100644 index 0000000000000000000000000000000000000000..c5e6118e9014c09803ee98cb00e4b7603f1d3470 GIT binary patch literal 34015 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

!oFO0+1*p;u8|&csvOCA>SMi00F)M*ljUT;k9&+ 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 Date: Sun, 4 May 2025 09:39:16 +1000 Subject: [PATCH 08/27] Update and rename snipers.yml to rifles.yml Signed-off-by: Raikyr0 --- .../Guns/Snipers/{snipers.yml => rifles.yml} | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) rename Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/{snipers.yml => rifles.yml} (78%) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/rifles.yml similarity index 78% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml rename to Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/rifles.yml index 5f27491f0ef..c642a645001 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/rifles.yml @@ -1,11 +1,14 @@ - type: entity name: mark 1 rifle - parent: BaseWeaponSniper + parent: BaseWeaponRifle id: WeaponSniperGrand description: A heavy and reliable self-loading rifle, utilising a modified version of a centuries-old design. Uses .30 rifle ammo. components: - type: Sprite sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi - type: Gun @@ -15,13 +18,6 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - - type: BallisticAmmoProvider -# autoCycle: true - capacity: 8 - proto: CartridgeLightRifle - whitelist: - tags: - - CartridgeLightRifle - type: ChamberMagazineAmmoProvider autoEject: true soundAutoEject: @@ -29,12 +25,15 @@ - type: entity name: ceremonial rifle - parent: BaseWeaponSniper + parent: BaseWeaponRifle id: WeaponSniperCeremonial description: A ceremonial variant of the Mark 1 Rifle, in tasteful blue and white. Uses .30 rifle ammo. components: - type: Sprite sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] - type: Clothing sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/ceremonial_grand.rsi - type: Gun @@ -44,13 +43,6 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg - - type: BallisticAmmoProvider -# autoCycle: true - capacity: 8 - proto: CartridgeLightRifle - whitelist: - tags: - - CartridgeLightRifle - type: ChamberMagazineAmmoProvider autoEject: true soundAutoEject: From 9e0e56b31736a65e70a29a11f58fa87f5c706edf Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 09:40:45 +1000 Subject: [PATCH 09/27] Rename rifles.yml to snipers.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Snipers/{rifles.yml => snipers.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/{rifles.yml => snipers.yml} (100%) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/rifles.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/rifles.yml rename to Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml From a85ca00f20be03c67268f1b1e7abd97e37fa2b4c Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:07:06 +1000 Subject: [PATCH 10/27] Create markone Signed-off-by: Raikyr0 --- .../Weapons/Guns/Ammunition/Magazine/markone | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone new file mode 100644 index 00000000000..6b0675e7206 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone @@ -0,0 +1,40 @@ +- type: entity + id: MagazineLightRifleMarkOneEmpty + name: "Mark 1 Rifle En-bloc (.30 rifle any)" + suffix: empty + parent: MagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + +- type: entity + id: MagazineLightRifleMarkOne + name: "Mark 1 Rifle En-bloc (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] From e4fe7c9bb9c3e62ce09eb63e9058acaf710769d2 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:07:47 +1000 Subject: [PATCH 11/27] Delete Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone Signed-off-by: Raikyr0 --- .../Weapons/Guns/Ammunition/Magazine/markone | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone deleted file mode 100644 index 6b0675e7206..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone +++ /dev/null @@ -1,40 +0,0 @@ -- type: entity - id: MagazineLightRifleMarkOneEmpty - name: "Mark 1 Rifle En-bloc (.30 rifle any)" - suffix: empty - parent: MagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: null - capacity: 8 - - type: Item - size: Tiny - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-4 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - -- type: entity - id: MagazineLightRifleMarkOne - name: "Mark 1 Rifle En-bloc (.30 rifle)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifle - capacity: 8 - - type: Item - size: Tiny - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-4 - map: ["enum.GunVisualLayers.Mag"] From 62498078a16f2c50604ce13405c2732ff55ba5aa Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:10:26 +1000 Subject: [PATCH 12/27] Add files via upload Signed-off-by: Raikyr0 --- .../Guns/Ammunition/Magazine/markone.yaml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml new file mode 100644 index 00000000000..c0e395011fe --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml @@ -0,0 +1,48 @@ +- type: entity + id: MagazineLightRifleMarkOneEmpty + name: "Mark 1 Rifle En-bloc (.30 rifle any)" + suffix: empty + parent: MagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: null + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - tags: + - MagazineMarkOne + +- type: entity + id: MagazineLightRifleMarkOne + name: "Mark 1 Rifle En-bloc (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 5 + zeroVisible: false + - tags: + - MagazineMarkOne \ No newline at end of file From 23c54b1c4cdcd07ba3149a4a24d872aa19843e32 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:19:19 +1000 Subject: [PATCH 13/27] Update tags.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/tags.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 5f7ace66722..085b79fed47 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1529,5 +1529,8 @@ - type: Tag id: SiliconEmotes +- type: tag + id: MagazineMarkOne + - type: Tag id: UnathiEmotes From 5703e60f5ab3485a6449b8af440241fbde56ff22 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:24:37 +1000 Subject: [PATCH 14/27] Delete Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml Signed-off-by: Raikyr0 --- .../Guns/Ammunition/Magazine/markone.yaml | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml deleted file mode 100644 index c0e395011fe..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yaml +++ /dev/null @@ -1,48 +0,0 @@ -- type: entity - id: MagazineLightRifleMarkOneEmpty - name: "Mark 1 Rifle En-bloc (.30 rifle any)" - suffix: empty - parent: MagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: null - capacity: 8 - - type: Item - size: Tiny - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-4 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - - tags: - - MagazineMarkOne - -- type: entity - id: MagazineLightRifleMarkOne - name: "Mark 1 Rifle En-bloc (.30 rifle)" - parent: BaseMagazineLightRifle - components: - - type: BallisticAmmoProvider - proto: CartridgeLightRifle - capacity: 8 - - type: Item - size: Tiny - - type: Sprite - sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi - layers: - - state: base - map: ["enum.GunVisualLayers.Base"] - - state: mag-4 - map: ["enum.GunVisualLayers.Mag"] - - type: MagazineVisuals - magState: mag - steps: 5 - zeroVisible: false - - tags: - - MagazineMarkOne \ No newline at end of file From 98c352d75fbd8ecb350717073362ba6606ede7ee Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:27:12 +1000 Subject: [PATCH 15/27] Add files via upload Signed-off-by: Raikyr0 --- .../Guns/Ammunition/Magazine/markone.yml | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml new file mode 100644 index 00000000000..ad7894ef945 --- /dev/null +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -0,0 +1,48 @@ +- type: entity + id: MagazineLightRifleMarkOneEmpty + name: "Mark 1 Rifle En-bloc (.30 rifle any)" + suffix: empty + parent: MagazineLightRifle + components: + - type: tag + - MagazineMarkOne + - type: BallisticAmmoProvider + proto: null + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false + +- type: entity + id: MagazineLightRifleMarkOne + name: "Mark 1 Rifle En-bloc (.30 rifle)" + parent: BaseMagazineLightRifle + components: + - type: tag + - MagazineMarkOne + - type: BallisticAmmoProvider + proto: CartridgeLightRifle + capacity: 8 + - type: Item + size: Tiny + - type: Sprite + sprite: Objects/Weapons/Guns/Ammunition/SpeedLoaders/LightRifle/light_rifle_speed_loader.rsi + layers: + - state: base + map: ["enum.GunVisualLayers.Base"] + - state: mag-4 + map: ["enum.GunVisualLayers.Mag"] + - type: MagazineVisuals + magState: mag + steps: 2 + zeroVisible: false From 02c98548aa97983affdf2d2ab37d3e018ed9d0dd Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:28:24 +1000 Subject: [PATCH 16/27] Update tags.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/tags.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml index 085b79fed47..4bff97a564c 100644 --- a/Resources/Prototypes/tags.yml +++ b/Resources/Prototypes/tags.yml @@ -1529,7 +1529,7 @@ - type: Tag id: SiliconEmotes -- type: tag +- type: Tag id: MagazineMarkOne - type: Tag From 72067d62808f54b7a35385c294ef730784703c2a Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:30:30 +1000 Subject: [PATCH 17/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index ad7894ef945..6cc46eed20a 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -1,6 +1,6 @@ - type: entity id: MagazineLightRifleMarkOneEmpty - name: "Mark 1 Rifle En-bloc (.30 rifle any)" + name: Mark 1 Rifle En-bloc (.30 rifle any) suffix: empty parent: MagazineLightRifle components: @@ -25,7 +25,7 @@ - type: entity id: MagazineLightRifleMarkOne - name: "Mark 1 Rifle En-bloc (.30 rifle)" + name: Mark 1 Rifle En-bloc (.30 rifle) parent: BaseMagazineLightRifle components: - type: tag From c674d8bce24bf26c4fbf9ea217ad9e5e6a2b2498 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:33:58 +1000 Subject: [PATCH 18/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index 6cc46eed20a..ad7894ef945 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -1,6 +1,6 @@ - type: entity id: MagazineLightRifleMarkOneEmpty - name: Mark 1 Rifle En-bloc (.30 rifle any) + name: "Mark 1 Rifle En-bloc (.30 rifle any)" suffix: empty parent: MagazineLightRifle components: @@ -25,7 +25,7 @@ - type: entity id: MagazineLightRifleMarkOne - name: Mark 1 Rifle En-bloc (.30 rifle) + name: "Mark 1 Rifle En-bloc (.30 rifle)" parent: BaseMagazineLightRifle components: - type: tag From 744f8ded0b09d599ec544c80c78a45489bb9effe Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:36:17 +1000 Subject: [PATCH 19/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index ad7894ef945..f960a5055ad 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -4,7 +4,7 @@ suffix: empty parent: MagazineLightRifle components: - - type: tag + - type: Tag - MagazineMarkOne - type: BallisticAmmoProvider proto: null @@ -28,7 +28,7 @@ name: "Mark 1 Rifle En-bloc (.30 rifle)" parent: BaseMagazineLightRifle components: - - type: tag + - type: Tag - MagazineMarkOne - type: BallisticAmmoProvider proto: CartridgeLightRifle From 8a1e009aa6ca6f209542f70683ef2d8a22b00669 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:38:48 +1000 Subject: [PATCH 20/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index f960a5055ad..d9bb72a517b 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -5,6 +5,7 @@ parent: MagazineLightRifle components: - type: Tag + tags: - MagazineMarkOne - type: BallisticAmmoProvider proto: null @@ -29,6 +30,7 @@ parent: BaseMagazineLightRifle components: - type: Tag + tags: - MagazineMarkOne - type: BallisticAmmoProvider proto: CartridgeLightRifle From fb87c69ab6cc3a3bd16e8d7db6a84c8e631d90dc Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:52:20 +1000 Subject: [PATCH 21/27] Update snipers.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Snipers/snipers.yml | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index c642a645001..550df3634d7 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -18,6 +18,22 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifleMarkOne + priority: 2 + whitelist: + tags: + - MagazineMarkOne + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle - type: ChamberMagazineAmmoProvider autoEject: true soundAutoEject: @@ -43,6 +59,22 @@ - SemiAuto soundGunshot: path: /Audio/Weapons/Guns/Gunshots/rifle2.ogg + - type: ItemSlots + slots: + gun_magazine: + name: Magazine + startingItem: MagazineLightRifleMarkOne + priority: 2 + whitelist: + tags: + - MagazineMarkOne + gun_chamber: + name: Chamber + startingItem: CartridgeLightRifle + priority: 1 + whitelist: + tags: + - CartridgeLightRifle - type: ChamberMagazineAmmoProvider autoEject: true soundAutoEject: From af52c5399c243d9b1c355fe7222f5a7df75805e1 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 10:52:40 +1000 Subject: [PATCH 22/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index d9bb72a517b..c0cd0ae6f88 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -17,7 +17,7 @@ layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-4 + - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag @@ -42,7 +42,7 @@ layers: - state: base map: ["enum.GunVisualLayers.Base"] - - state: mag-4 + - state: mag-1 map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag From 7af568f6aac54589b7ccf95c68555e0fd0374268 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 11:03:21 +1000 Subject: [PATCH 23/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index c0cd0ae6f88..4ff8a460199 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -21,7 +21,7 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 6 zeroVisible: false - type: entity @@ -46,5 +46,5 @@ map: ["enum.GunVisualLayers.Mag"] - type: MagazineVisuals magState: mag - steps: 2 + steps: 6 zeroVisible: false From f7017ddeb6b0cfb52a0924be2a5ba87e4a060d24 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 11:22:55 +1000 Subject: [PATCH 24/27] Update markone.yml Signed-off-by: Raikyr0 --- .../Objects/Weapons/Guns/Ammunition/Magazine/markone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml index 4ff8a460199..4438283cf48 100644 --- a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml +++ b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Weapons/Guns/Ammunition/Magazine/markone.yml @@ -1,6 +1,6 @@ - type: entity id: MagazineLightRifleMarkOneEmpty - name: "Mark 1 Rifle En-bloc (.30 rifle any)" + name: "mark 1 rifle en-bloc (.30 rifle any)" suffix: empty parent: MagazineLightRifle components: @@ -26,7 +26,7 @@ - type: entity id: MagazineLightRifleMarkOne - name: "Mark 1 Rifle En-bloc (.30 rifle)" + name: "mark 1 rifle en-bloc (.30 rifle)" parent: BaseMagazineLightRifle components: - type: Tag From 5975f9b0f1f5efc9e4bd69ce6ba50d99803e9ccb Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 11:28:41 +1000 Subject: [PATCH 25/27] Update security.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/Recipes/Lathes/security.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml index e3b5de462d0..0719384daea 100644 --- a/Resources/Prototypes/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Recipes/Lathes/security.yml @@ -1446,3 +1446,19 @@ Plasteel: 100 Plastic: 450 Silver: 100 + +- type: latheRecipe + id: MagazineLightRifleMarkOneEmpty + result: MagazineLightRifleMarkOneEmpty + category: Ammo + completetime: 2 + materials: + Steel: 100 + +- type: latheRecipe + id: MagazineLightRifleMarkOne + result: MagazineLightRifleMarkOne + category: Ammo + completetime: 2 + materials: + Steel: 200 From cfdc332c2bd6c68af76451e7c3e3d8bbc7d67021 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 11:32:19 +1000 Subject: [PATCH 26/27] Update lathe.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/Entities/Structures/Machines/lathe.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 9a374f3d0b2..f76e563c78a 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -248,6 +248,8 @@ - RiotShield - SpeedLoaderMagnum - SpeedLoaderMagnumEmpty + - MagazineLightRifleMarkOneEmpty + - MagazineLightRifleMarkOne - GrenadeFlashBang # Goobstation # .35 Caseless Pistol - MagazinePistolCaselessRiflePractice # EE @@ -1032,6 +1034,8 @@ - MagazineUniversalMagnumEmpty - MagazineUniversalMagnum - MagazineUniversalMagnumRubber + - MagazineLightRifleMarkOneEmpty + - MagazineLightRifleMarkOne dynamicRecipes: - Truncheon - Terminus @@ -1237,6 +1241,8 @@ - MagazineBoxCaselessRiflePractice # EE - MagazineBoxCaselessRifle # EE - MagazineBoxCaselessRifleRubber # EE + - MagazineLightRifleMarkOneEmpty + - MagazineLightRifleMarkOne - type: MaterialStorage whitelist: tags: From c5daaa3ef7cd3386dec0504e5c474b39dbaab431 Mon Sep 17 00:00:00 2001 From: Raikyr0 Date: Sun, 4 May 2025 11:33:48 +1000 Subject: [PATCH 27/27] Update armory.yml Signed-off-by: Raikyr0 --- Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml index a4dc8b6a882..472ddf5f6e6 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Crates/armory.yml @@ -6,8 +6,8 @@ contents: - id: WeaponSniperGrand amount: 2 - - id: BoxSpeedLoaderLightRifle - amount: 1 + - id: MagazineLightRifleMarkOne + amount: 4 - type: entity id: CrateArmoryUniversal