From 88e0e996d5e7d352298890019e948af2e82526a3 Mon Sep 17 00:00:00 2001 From: terezi4real Date: Sat, 12 Aug 2023 18:16:44 -0500 Subject: [PATCH 1/2] melee weapons on back/suit storage slot --- .../Objects/Weapons/Melee/baseball_bat.yml | 1 + .../Objects/Weapons/Melee/fireaxe.yml | 2 ++ .../Entities/Objects/Weapons/Melee/mining.yml | 10 +++++++ .../Objects/Weapons/Melee/pickaxe.yml | 5 ++++ .../Entities/Objects/Weapons/Melee/spear.yml | 4 +++ .../Entities/Objects/Weapons/Melee/sword.yml | 27 ++++++++++++++++++- 6 files changed, 48 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml index c8134180bcc..72925bbc508 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/baseball_bat.yml @@ -22,6 +22,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: WoodenBat node: bat diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml index 9e747328f94..289f6a24c60 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/fireaxe.yml @@ -33,6 +33,7 @@ quickEquip: false slots: - back + - suitStorage - type: Tool qualities: - Prying @@ -55,3 +56,4 @@ quickEquip: false slots: - back + - suitStorage diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index 5c9c997e771..4da05ece3f2 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -63,6 +63,11 @@ - type: Tool qualities: - Prying + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: crusher dagger @@ -109,3 +114,8 @@ size: 150 - type: StaticPrice price: 285 + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml index 413acce1619..9f80bfaf2dc 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/pickaxe.yml @@ -25,6 +25,11 @@ sprite: Objects/Weapons/Melee/pickaxe.rsi - type: StaticPrice price: 15.5 + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: mining drill diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml index 8936f786b2b..9fdbab50658 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/spear.yml @@ -27,6 +27,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: Spear node: spear @@ -106,6 +107,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: SpearReinforced node: spear @@ -185,6 +187,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: SpearPlasma node: spear @@ -266,6 +269,7 @@ quickEquip: false slots: - back + - suitStorage - type: Construction graph: SpearUranium node: spear diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 3ced854c5a0..d1954229a75 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -18,7 +18,7 @@ - type: Reflect enabled: true reflectProb: .5 - spread: 90 + spread: 90 - type: Item size: 15 sprite: Objects/Weapons/Melee/captain_sabre.rsi @@ -26,6 +26,11 @@ tags: - CaptainSabre - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: katana @@ -50,6 +55,11 @@ size: 15 sprite: Objects/Weapons/Melee/katana.rsi - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: machete @@ -74,6 +84,11 @@ size: 15 sprite: Objects/Weapons/Melee/machete.rsi - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: claymore @@ -99,6 +114,11 @@ slots: - back - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage - type: entity name: cutlass @@ -123,3 +143,8 @@ size: 15 sprite: Objects/Weapons/Melee/cutlass.rsi - type: DisarmMalus + - type: Clothing + quickEquip: false + slots: + - back + - suitStorage From 8251176afaa84560f4b57abf50ba004d2f6e6311 Mon Sep 17 00:00:00 2001 From: terezi4real Date: Sat, 12 Aug 2023 18:21:02 -0500 Subject: [PATCH 2/2] hey this one you could already wear on your back --- .../Prototypes/Entities/Objects/Weapons/Melee/sword.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index d1954229a75..aefb6b119a7 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -113,12 +113,8 @@ sprite: Objects/Weapons/Melee/claymore.rsi slots: - back - - type: DisarmMalus - - type: Clothing - quickEquip: false - slots: - - back - suitStorage + - type: DisarmMalus - type: entity name: cutlass