diff --git a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml index 18bac6f837..0739060835 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/toolboxes.yml @@ -76,7 +76,7 @@ - id: Multitool - id: Wirecutter - id: ClothingHandsGlovesCombat - - id: ClothingBeltMilitaryWebbing + - id: ClothingBeltSyndieHolster - id: ClothingMaskGasSyndicate - type: entity diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index c8f82e3c06..9f05adaf2c 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -158,6 +158,15 @@ icon: /Textures/Objects/Misc/guardian_info.rsi/icon.png price: 14 +- type: uplinkListing + id: UplinkHolster + category: Utility + itemId: ClothingBeltSyndieHolster + listingName: Syndicate Shoulder Holster + description: A deep shoulder holster capable of holding many types of ballistics. + icon: /Textures/Clothing/Belt/syndieholster.rsi/icon.png + price: 2 + - type: uplinkListing id: UplinkEmag category: Utility @@ -406,6 +415,12 @@ itemId: ClothingBackpackDuffelSyndicatePyjamaBundle price: 4 +- type: uplinkListing + id: UplinkOutlawHat + category: Misc + itemId: ClothingHeadHatOutlawHat + price: 1 + - type: uplinkListing id: UplinkCatEars category: Misc diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 11bc837875..d89c258742 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -437,6 +437,25 @@ - type: Storage capacity: 20 +- type: entity + parent: ClothingBeltStorageBase + id: ClothingBeltSyndieHolster + name: syndicate shoulder holster + description: A deep shoulder holster capable of holding many types of ballistics. + components: + - type: Sprite + sprite: Clothing/Belt/syndieholster.rsi + - type: Clothing + sprite: Clothing/Belt/syndieholster.rsi + - type: Storage + capacity: 60 + whitelist: + components: + - Gun + - MeeleeWeapon + - BallisticAmmoProvider + - CartridgeAmmo + - type: entity parent: ClothingBeltStorageBase id: ClothingBeltSecurityWebbing diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index bc16137775..8961cec609 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -169,6 +169,17 @@ - type: Clothing sprite: Clothing/Head/Hats/hoshat.rsi +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatOutlawHat + name: outlaw's hat + description: A hat that makes you look like you carry a notched pistol, numbered one and nineteen more. + components: + - type: Sprite + sprite: Clothing/Head/Hats/outlawhat.rsi + - type: Clothing + sprite: Clothing/Head/Hats/outlawhat.rsi + - type: entity parent: ClothingHeadBase id: ClothingHeadHatWitch1 diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png new file mode 100644 index 0000000000..372ce46fe7 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/equipped-BELT.png differ diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png new file mode 100644 index 0000000000..c38f59b4a4 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png new file mode 100644 index 0000000000..f5dfaee4b5 Binary files /dev/null and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png b/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png new file mode 100644 index 0000000000..5f443cc24c Binary files /dev/null and b/Resources/Textures/Clothing/Belt/syndieholster.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json b/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json new file mode 100644 index 0000000000..af733b1b9d --- /dev/null +++ b/Resources/Textures/Clothing/Belt/syndieholster.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/94daddb1ac6625e2a7f7a88d62235ee44a480b5e", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-BELT", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..429417d444 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/icon.png new file mode 100644 index 0000000000..20c04e2401 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png new file mode 100644 index 0000000000..fca4fad17f Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png new file mode 100644 index 0000000000..d96d6f196c Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json new file mode 100644 index 0000000000..e0ee93d642 --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/outlawhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from cev-eris at commit https://github.com/discordia-space/CEV-Eris/commit/a75dee2e6d236612dbd403dd5f8687ca930c01f1", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}