diff --git a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml index be690e8ef3..a386ca2a7c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/backpacks.yml @@ -130,4 +130,5 @@ shader: unshaded - type: Clothing sprite: Clothing/Back/Backpacks/holding.rsi - HeldPrefix: holding + - type: Storage + capacity: 10000 diff --git a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml index b9a4cfee00..c1a85e11e0 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/duffel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/duffel.yml @@ -81,3 +81,21 @@ sprite: Clothing/Back/Duffels/syndicate.rsi - type: Clothing sprite: Clothing/Back/Duffels/syndicate.rsi + +- type: entity + parent: ClothingBackpackDuffel + id: ClothingBackpackDuffelHolding + name: duffelbag of holding + description: A duffelbag that opens into a localized pocket of bluespace. + components: + - type: Sprite + sprite: Clothing/Back/Duffels/holding.rsi + state: icon + layers: + - state: icon + - state: icon-unlit + shader: unshaded + - type: Clothing + sprite: Clothing/Back/Duffels/holding.rsi + - type: Storage + capacity: 10000 diff --git a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml index 25ee88fc3b..093a23f874 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/satchel.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/satchel.yml @@ -92,3 +92,21 @@ sprite: Clothing/Back/Satchels/hydroponics.rsi - type: Clothing sprite: Clothing/Back/Satchels/hydroponics.rsi + +- type: entity + parent: ClothingBackpackSatchel + id: ClothingBackpackSatchelHolding + name: satchel of holding + description: A satchel that opens into a localized pocket of bluespace. + components: + - type: Sprite + sprite: Clothing/Back/Satchels/holding.rsi + state: icon + layers: + - state: icon + - state: icon-unlit + shader: unshaded + - type: Clothing + sprite: Clothing/Back/Satchels/holding.rsi + - type: Storage + capacity: 10000 diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-left.png deleted file mode 100644 index 79c90fc3cb..0000000000 Binary files a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-left.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-right.png deleted file mode 100644 index 95b5b9abec..0000000000 Binary files a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/holding-inhand-right.png and /dev/null differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-left.png new file mode 100644 index 0000000000..a0dc828771 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-right.png new file mode 100644 index 0000000000..65683df20d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json index c3bb350c47..10b79435ee 100644 --- a/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json +++ b/Resources/Textures/Clothing/Back/Backpacks/holding.rsi/meta.json @@ -86,12 +86,88 @@ "directions": 1 }, { - "name": "holding-inhand-left", - "directions": 4 + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] }, { - "name": "holding-inhand-right", - "directions": 4 + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] } ] } diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-left.png new file mode 100644 index 0000000000..5b701c7119 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-right.png new file mode 100644 index 0000000000..3628dd4343 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken.png new file mode 100644 index 0000000000..1dd07071d4 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/broken.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..fe36acb012 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png new file mode 100644 index 0000000000..363f156aed Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon-unlit.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png new file mode 100644 index 0000000000..ede6d76675 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-left.png new file mode 100644 index 0000000000..a0dc828771 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-right.png new file mode 100644 index 0000000000..65683df20d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json new file mode 100644 index 0000000000..dfb945ceb9 --- /dev/null +++ b/Resources/Textures/Clothing/Back/Duffels/holding.rsi/meta.json @@ -0,0 +1,175 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/0a4a0fadb32e3245f8bc2ee03f88d776de1852b5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "icon-unlit", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "broken", + "directions": 1, + }, + { + "name": "equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "broken-inhand-left", + "directions": 4, + }, + { + "name": "broken-inhand-right", + "directions": 4, + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-left.png new file mode 100644 index 0000000000..5b701c7119 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-right.png new file mode 100644 index 0000000000..3628dd4343 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken-inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken.png new file mode 100644 index 0000000000..ef4b54ddc0 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/broken.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/equipped-BACKPACK.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/equipped-BACKPACK.png new file mode 100644 index 0000000000..3ec36a18e1 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon-unlit.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon-unlit.png new file mode 100644 index 0000000000..ba4477c296 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon-unlit.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon.png new file mode 100644 index 0000000000..138a6ab3d6 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-left.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-left.png new file mode 100644 index 0000000000..a0dc828771 Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-right.png b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-right.png new file mode 100644 index 0000000000..65683df20d Binary files /dev/null and b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Back/Satchels/holding.rsi/meta.json b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/meta.json new file mode 100644 index 0000000000..18ad2f284d --- /dev/null +++ b/Resources/Textures/Clothing/Back/Satchels/holding.rsi/meta.json @@ -0,0 +1,179 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Citadelstation at commit https://github.com/Citadel-Station-13/Citadel-Station-13/commit/0a4a0fadb32e3245f8bc2ee03f88d776de1852b5", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "icon-unlit", + "directions": 1, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "broken", + "directions": 1, + }, + { + "name": "equipped-BACKPACK", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "broken-inhand-left", + "directions": 4, + }, + { + "name": "broken-inhand-right", + "directions": 4, + }, + { + "name": "inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-right", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +}