Skip to content

Commit

Permalink
Adds hugbox. (#2826)
Browse files Browse the repository at this point in the history 
* Box and sprites

* Added to clowns fills
  • Loading branch information
Swept authored Dec 27, 2020
1 parent d595286 commit 7790f8f
Show file tree
Hide file tree
Showing 8 changed files with 66 additions and 201 deletions.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/backpack.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
components:
- type: StorageFill
contents:
- name: BoxSurvival
- name: BoxHug

- type: entity
abstract: true
Expand Down
13 changes: 13 additions & 0 deletions Resources/Prototypes/Entities/Objects/Boxes/boxes_general.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Binary file added Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Storage/boxes.rsi/clown.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Storage/boxes.rsi/heart.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-left.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Resources/Textures/Objects/Storage/boxes.rsi/hug-inhand-right.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
252 changes: 52 additions & 200 deletions Resources/Textures/Objects/Storage/boxes.rsi/meta.json
View file
Original file line number Diff line number Diff line change
@@ -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
}
]
}

0 comments on commit 7790f8f

Please sign in to comment.