diff --git a/Resources/Prototypes/Catalog/Fills/backpack.yml b/Resources/Prototypes/Catalog/Fills/backpack.yml index 052000f62d..2b1fbcd9bb 100644 --- a/Resources/Prototypes/Catalog/Fills/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/backpack.yml @@ -14,7 +14,7 @@ components: - type: StorageFill contents: - - name: BoxSurvival + - name: BoxHug - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml index 9efecea57d..e570d028ec 100644 --- a/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml +++ b/Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml @@ -102,3 +102,16 @@ - type: Storage capacity: 15 size: 15 + +- type: entity + name: box of hugs + parent: BoxSurvival + id: BoxHug + description: A special box for sensitive people. + components: + - type: Sprite + layers: + - state: box_hug + - state: heart + - type: Item + HeldPrefix: hug diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png new file mode 100644 index 0000000000..f9f0e4dbf3 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/clown.png b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png new file mode 100644 index 0000000000..d4f0527018 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/clown.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/heart.png b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png new file mode 100644 index 0000000000..1cbf686782 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/heart.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png new file mode 100644 index 0000000000..a4633be563 Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png new file mode 100644 index 0000000000..c2b8f34a9c Binary files /dev/null and b/Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png differ diff --git a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json index c2a70f35aa..bce379dc40 100644 --- a/Resources/Textures/Objects/Storage/boxes.rsi/meta.json +++ b/Resources/Textures/Objects/Storage/boxes.rsi/meta.json @@ -1,299 +1,151 @@ { "version": 1, + "license": "CC-BY-SA 3", + "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/17dc39d12005f3279a90212b5c61a781c08693a5", "size": { "x": 32, "y": 32 }, - "license": "CC-BY-SA 3", - "copyright": "https://github.com/discordia-space/CEV-Eris/commit/9216a1754b1e1d25b8f771b15fbaf4e086fcade9", "states": [ { "name": "beaker", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "bodybags", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 + }, + { + "name": "clown", + "directions": 1 + }, + { + "name": "heart", + "directions": 1 }, { "name": "meson", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "sechud", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "box", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 + }, + { + "name": "box_hug", + "directions": 1 }, { "name": "box_donk_pocket", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "box_id", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "box_of_doom", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "box_of_doom_big", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "box_security", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "circuit", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "disk", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "flashbang", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "glasses", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "handcuff", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "implant", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "latex", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "light", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "lightmixed", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "lighttube", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "mousetraps", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "pda", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "pillbox", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "solution_trays", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "sterile", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "syringe", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "writing", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "writing_of_doom", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "directions": 1 }, { "name": "inhand-left", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "inhand-right", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 + }, + { + "name": "hug-inhand-left", + "directions": 4 + }, + { + "name": "hug-inhand-right", + "directions": 4 } ] }