From b91023e3d59d87fc2fdc97670731f9872e6f0f16 Mon Sep 17 00:00:00 2001 From: FireFoxPhoenix <171633349+FireFoxPhoenix@users.noreply.github.com> Date: Sat, 7 Dec 2024 14:12:36 +1000 Subject: [PATCH] =?UTF-8?q?Reapply=20"=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5?= =?UTF-8?q?=D0=BB=D0=BA=D0=B0"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit a0ac03a1ff31abd24b6cc5a5a8b389b71780be82. --- .../Corvax/Recipes/Lathes/security.yml | 12 +----------- .../Objects/Weapons/Guns/Pistols/pistols.yml | 2 +- .../Objects/Weapons/Guns/Rifles/rifles.yml | 1 - .../Inventories/weaponryworks.yml | 16 ++++++++-------- .../Spawners/Random/dungeon_items_weapons.yml | 4 ++-- .../_NF/Entities/Structures/Machines/lathe.yml | 2 +- .../Prototypes/_NF/Recipes/Lathes/security.yml | 10 ++++++++++ 7 files changed, 23 insertions(+), 24 deletions(-) diff --git a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml index e4207e2af62..01d36b32d7f 100644 --- a/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/Corvax/Recipes/Lathes/security.yml @@ -33,14 +33,4 @@ category: Ammo completetime: 3 materials: - Steel: 160 - -- type: latheRecipe - id: WeaponPistolPollock - result: WeaponPistolPollock - category: Weapons - completetime: 3 - materials: - Steel: 1000 - Plastic: 1200 - Plasteel: 1200 \ No newline at end of file + Steel: 160 \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index f832d9f04c4..42788c31739 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -5,7 +5,7 @@ description: The Mark 32 Offensive Handgun, produced by NanoTrasen's Small Arms Division. Uses .45 magnum ammo. # DeltaV - update Mk32 components: - type: Sprite - sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi # + sprite: DeltaV/Objects/Weapons/Guns/Pistols/universal.rsi layers: - state: base map: ["enum.GunVisualLayers.Base"] diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index edab1d0286b..bc9582e147f 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -87,7 +87,6 @@ parent: [BaseWeaponRifle, BaseGunWieldable, BaseC3Contraband] id: WeaponRifleJackdaw description: The beginning of the end is heralded by the song of a Jackdaw. Uses .25 caseless ammo. - suffix: Deathsquad components: - type: Item size: Large diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml index 90abb734fa4..531773b2899 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/weaponryworks.yml @@ -8,10 +8,10 @@ WeaponRifleNovaliteC1: 1 WeaponShotgunDoubleBarreled: 1 WeaponRevolverArgenti: 1 - WeaponPistolPollock: 3 # Corvax-Frontier - WeaponRifleVulcan: 3 # Corvax-Frontier - WeaponRevolverFitz: 3 # Corvax-Frontier - WeaponRevolverFaith: 3 # Corvax-Frontier + WeaponPistolPollock: 3 + WeaponRifleVulcan: 3 + WeaponRevolverFitz: 3 + WeaponRevolverFaith: 3 BoxShotgunSlug: 1 BoxLethalshot: 1 BoxBeanbag: 1 @@ -39,10 +39,10 @@ WeaponRifleNovaliteC1: 4294967295 WeaponShotgunDoubleBarreled: 4294967295 WeaponRevolverArgenti: 4294967295 - WeaponPistolPollock: 4294967295 # Corvax-Frontier - WeaponRifleVulcan: 4294967295 # Corvax-Frontier - WeaponRevolverFitz: 4294967295 # Corvax-Frontier - WeaponRevolverFaith: 4294967295 # Corvax-Frontier + WeaponPistolPollock: 4294967295 + WeaponRifleVulcan: 4294967295 + WeaponRevolverFitz: 4294967295 + WeaponRevolverFaith: 4294967295 BoxShotgunSlug: 4294967295 BoxLethalshot: 4294967295 BoxBeanbag: 4294967295 diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml index eda83824147..ef202d52356 100644 --- a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml +++ b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_weapons.yml @@ -59,8 +59,8 @@ #- WeaponCaseLongShotgunDoubleBarreledExpedition - WeaponCaseShortSawnExpedition - WeaponCaseLongMosinExpedition - - WeaponSniperCeremonial # Corvax-Frontier - - WeaponRevolverLucky # Corvax-Frontier + - WeaponSniperCeremonial + - WeaponRevolverLucky chance: 1.0 offset: 0.0 rarePrototypes: diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml index d80df10b7f9..b450482502d 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml @@ -669,7 +669,7 @@ ## Weapons - CombatKnife - WeaponLaserSvalinn # After the changes made to windows shouldn't be that much of an issue now if it's widely available - - WeaponPistolPollock # Corvax-Frontier + - WeaponPistolPollock - WeaponLaserPistolNF # After the changes made to windows shouldn't be that much of an issue now if it's widely available - WeaponRevolverArgenti - WeaponPistolMk58NF diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml index 6375216d624..bc9710c3e3e 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/security.yml @@ -124,3 +124,13 @@ Glass: 5 Plasma: 10 Silver: 5 + +- type: latheRecipe + id: WeaponPistolPollock + result: WeaponPistolPollock + category: Weapons + completetime: 3 + materials: + Steel: 1000 + Plastic: 1200 + Plasteel: 1200 \ No newline at end of file