diff --git a/Resources/Locale/en-US/tools/tool-qualities.ftl b/Resources/Locale/en-US/tools/tool-qualities.ftl index 438935fc1e..921b61bc59 100644 --- a/Resources/Locale/en-US/tools/tool-qualities.ftl +++ b/Resources/Locale/en-US/tools/tool-qualities.ftl @@ -18,3 +18,6 @@ tool-quality-pulsing-tool-name = Multitool tool-quality-slicing-name = Slicing tool-quality-slicing-tool-name = Knife + +tool-quality-sawing-name = Sawing +tool-quality-sawing-tool-name = Saw diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml index 7f72226eac..9e503d2723 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml @@ -5,8 +5,8 @@ components: - type: StorageFill contents: - - id: ClothingOuterArmorBulletproof - - id: WeaponShotgunSawn + - id: ClothingOuterVestKevlar + - id: WeaponShotgunDoubleBarreled - id: DrinkShaker - id: ClothingEyesGlassesBeer - id: DrinkBottleBeer diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml index 4775bc8fc1..b1b7f2bc42 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/bardrobe.yml @@ -11,7 +11,7 @@ ClothingUniformJumpskirtBartender: 2 ClothingUniformJumpsuitBartenderPurple: 2 ClothingShoesColorBlack: 2 - ClothingOuterVestKevlar: 1 - ClothingBeltBandolier: 1 - ClothingEyesGlassesSunglasses: 1 - BoxBeanbag: 1 + ClothingOuterVestKevlar: 2 + ClothingBeltBandolier: 2 + ClothingEyesGlassesSunglasses: 2 + BoxBeanbag: 2 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml index a18c1429f2..3d6e5e329d 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml @@ -151,6 +151,10 @@ - type: Item sprite: Objects/Specific/Medical/Surgery/saw.rsi - type: ItemCooldown + - type: Tool + qualities: + - Sawing + speed: 1.0 # No melee for regular saw because have you ever seen someone use a band saw as a weapon? It's dumb. - type: entity @@ -169,6 +173,10 @@ Brute: 10 hitSound: path: /Audio/Weapons/bladeslice.ogg + - type: Tool + qualities: + - Sawing + speed: 0.5 - type: entity name: circular saw @@ -186,6 +194,10 @@ Brute: 15 hitSound: path: /Audio/Items/drill_hit.ogg + - type: Tool + qualities: + - Sawing + speed: 1.5 - type: entity name: advanced circular saw @@ -203,3 +215,7 @@ Brute: 20 hitSound: path: /Audio/Items/drill_hit.ogg + - type: Tool + qualities: + - Sawing + speed: 2.0 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 81ed3d16d4..4b73e00fd4 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -94,6 +94,9 @@ fireRate: 8 - type: BallisticAmmoProvider capacity: 2 + - type: Construction + graph: ShotgunSawn + node: shotgundoublebarreled - type: entity name: Enforcer @@ -135,3 +138,6 @@ fireRate: 4 - type: BallisticAmmoProvider capacity: 2 + - type: Construction + graph: ShotgunSawn + node: shotgunsawn diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml new file mode 100644 index 0000000000..abaa83183f --- /dev/null +++ b/Resources/Prototypes/Recipes/Construction/Graphs/weapons/shotgunsawn.yml @@ -0,0 +1,12 @@ +- type: constructionGraph + id: ShotgunSawn + start: shotgundoublebarreled + graph: + - node: shotgundoublebarreled + edges: + - to: shotgunsawn + steps: + - tool: Sawing + doAfter: 2 + - node: shotgunsawn + entity: WeaponShotgunSawn diff --git a/Resources/Prototypes/tool_qualities.yml b/Resources/Prototypes/tool_qualities.yml index 94baa3fa32..c5947d4960 100644 --- a/Resources/Prototypes/tool_qualities.yml +++ b/Resources/Prototypes/tool_qualities.yml @@ -46,3 +46,10 @@ toolName: tool-quality-slicing-tool-name spawn: KitchenKnife icon: Objects/Weapons/Melee/kitchen_knife.rsi/icon.png + +- type: tool + id: Sawing + name: tool-quality-sawing-name + toolName: tool-quality-sawing-tool-name + spawn: Saw + icon: Objects/Specific/Medical/Surgery/saw.rsi/saw.png