Port outerclothing from discordia (#382)
Inhand sprites are half-scaled of the sprite
@@ -30,7 +30,7 @@ namespace Content.Server.GameObjects.Components.Items.Storage.Fill
|
|||||||
|
|
||||||
if (random.Prob(0.4f))
|
if (random.Prob(0.4f))
|
||||||
{
|
{
|
||||||
Spawn("HazardVestClothing");
|
Spawn("OuterclothingHazard");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (random.Prob(0.7f))
|
if (random.Prob(0.7f))
|
||||||
|
|||||||
@@ -194,7 +194,7 @@ entities:
|
|||||||
- !type:PhysShapeAabb
|
- !type:PhysShapeAabb
|
||||||
bounds: -0.15,-0.3,0.2,0.3
|
bounds: -0.15,-0.3,0.2,0.3
|
||||||
type: Collidable
|
type: Collidable
|
||||||
- type: SecurityVestClothing
|
- type: OuterclothingVest
|
||||||
uid: 8
|
uid: 8
|
||||||
components:
|
components:
|
||||||
- grid: 0
|
- grid: 0
|
||||||
@@ -1710,7 +1710,7 @@ entities:
|
|||||||
pos: -3.5,-8.5
|
pos: -3.5,-8.5
|
||||||
rot: -1.5707963267949 rad
|
rot: -1.5707963267949 rad
|
||||||
type: Transform
|
type: Transform
|
||||||
- type: SecurityVestClothing
|
- type: OuterclothingVest
|
||||||
uid: 145
|
uid: 145
|
||||||
components:
|
components:
|
||||||
- grid: 0
|
- grid: 0
|
||||||
@@ -3024,7 +3024,7 @@ entities:
|
|||||||
mask: 5
|
mask: 5
|
||||||
bounds: -0.25,-0.25,0.25,0.25
|
bounds: -0.25,-0.25,0.25,0.25
|
||||||
type: Collidable
|
type: Collidable
|
||||||
- type: HazardVestClothing
|
- type: OuterclothingVest
|
||||||
uid: 260
|
uid: 260
|
||||||
components:
|
components:
|
||||||
- grid: 0
|
- grid: 0
|
||||||
|
|||||||
1845
Resources/Prototypes/Entities/items/clothing/OuterClothing.yml
Normal file
@@ -1,60 +0,0 @@
|
|||||||
- type: entity
|
|
||||||
parent: Clothing
|
|
||||||
id: SuitBase
|
|
||||||
abstract: true
|
|
||||||
components:
|
|
||||||
- type: Clothing
|
|
||||||
Slots: [outerclothing]
|
|
||||||
|
|
||||||
|
|
||||||
- type: entity
|
|
||||||
parent: SuitBase
|
|
||||||
id: SecurityVestClothing
|
|
||||||
name: Security Vest
|
|
||||||
description: Bulletproof vest, more or less
|
|
||||||
components:
|
|
||||||
- type: Sprite
|
|
||||||
sprite: Clothing/armor.rsi
|
|
||||||
state: armor
|
|
||||||
|
|
||||||
- type: Icon
|
|
||||||
sprite: Clothing/armor.rsi
|
|
||||||
state: armor
|
|
||||||
|
|
||||||
- type: Clothing
|
|
||||||
sprite: Clothing/armor.rsi
|
|
||||||
|
|
||||||
|
|
||||||
- type: entity
|
|
||||||
parent: SuitBase
|
|
||||||
id: HazardVestClothing
|
|
||||||
name: Hazard Vest
|
|
||||||
description: Prevents accidents
|
|
||||||
components:
|
|
||||||
- type: Sprite
|
|
||||||
sprite: Clothing/vest_hazard.rsi
|
|
||||||
state: hazard
|
|
||||||
|
|
||||||
- type: Icon
|
|
||||||
sprite: Clothing/vest_hazard.rsi
|
|
||||||
state: hazard
|
|
||||||
|
|
||||||
- type: Clothing
|
|
||||||
sprite: Clothing/vest_hazard.rsi
|
|
||||||
|
|
||||||
- type: entity
|
|
||||||
parent: SuitBase
|
|
||||||
id: ChefApronClothing
|
|
||||||
name: Chef's Apron
|
|
||||||
description: An apron used by a high class chef.
|
|
||||||
components:
|
|
||||||
- type: Sprite
|
|
||||||
sprite: Clothing/chef_apron.rsi
|
|
||||||
state: apron
|
|
||||||
|
|
||||||
- type: Icon
|
|
||||||
sprite: Clothing/chef_apron.rsi
|
|
||||||
state: apron
|
|
||||||
|
|
||||||
- type: Clothing
|
|
||||||
sprite: Clothing/chef_apron.rsi
|
|
||||||
|
After Width: | Height: | Size: 1.6 KiB |
BIN
Resources/Textures/Clothing/OuterClothing/acolyte.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 690 B |
|
After Width: | Height: | Size: 772 B |
|
After Width: | Height: | Size: 795 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 838 B |
|
After Width: | Height: | Size: 723 B |
|
After Width: | Height: | Size: 744 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
BIN
Resources/Textures/Clothing/OuterClothing/apron.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 472 B |
|
After Width: | Height: | Size: 384 B |
|
After Width: | Height: | Size: 366 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 590 B |
BIN
Resources/Textures/Clothing/OuterClothing/apronchef.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 311 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 261 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 773 B |
BIN
Resources/Textures/Clothing/OuterClothing/armor.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 287 B |
|
After Width: | Height: | Size: 288 B |
|
After Width: | Height: | Size: 314 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 1.1 KiB |
|
After Width: | Height: | Size: 507 B |
|
After Width: | Height: | Size: 415 B |
|
After Width: | Height: | Size: 411 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 646 B |
BIN
Resources/Textures/Clothing/OuterClothing/armorsec.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 291 B |
|
After Width: | Height: | Size: 284 B |
|
After Width: | Height: | Size: 294 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 939 B |
|
After Width: | Height: | Size: 402 B |
|
After Width: | Height: | Size: 348 B |
|
After Width: | Height: | Size: 349 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 961 B |
BIN
Resources/Textures/Clothing/OuterClothing/bedsheet.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 499 B |
|
After Width: | Height: | Size: 532 B |
|
After Width: | Height: | Size: 532 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.4 KiB |
BIN
Resources/Textures/Clothing/OuterClothing/bio.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 900 B |
|
After Width: | Height: | Size: 767 B |
|
After Width: | Height: | Size: 725 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.1 KiB |
BIN
Resources/Textures/Clothing/OuterClothing/bio_cmo.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 790 B |
|
After Width: | Height: | Size: 687 B |
|
After Width: | Height: | Size: 654 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.0 KiB |
|
After Width: | Height: | Size: 723 B |
|
After Width: | Height: | Size: 668 B |
|
After Width: | Height: | Size: 618 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 802 B |
|
After Width: | Height: | Size: 751 B |
|
After Width: | Height: | Size: 729 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.3 KiB |
|
After Width: | Height: | Size: 795 B |
|
After Width: | Height: | Size: 722 B |
|
After Width: | Height: | Size: 681 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 819 B |
|
After Width: | Height: | Size: 723 B |
|
After Width: | Height: | Size: 703 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 2.2 KiB |
|
After Width: | Height: | Size: 779 B |
|
After Width: | Height: | Size: 691 B |
|
After Width: | Height: | Size: 638 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 1.0 KiB |
|
After Width: | Height: | Size: 394 B |
|
After Width: | Height: | Size: 415 B |
|
After Width: | Height: | Size: 417 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 1006 B |
|
After Width: | Height: | Size: 366 B |
|
After Width: | Height: | Size: 395 B |
|
After Width: | Height: | Size: 399 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 1001 B |
BIN
Resources/Textures/Clothing/OuterClothing/bluetag.rsi/icon.png
Normal file
|
After Width: | Height: | Size: 381 B |
|
After Width: | Height: | Size: 341 B |
|
After Width: | Height: | Size: 351 B |
@@ -0,0 +1 @@
|
|||||||
|
{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "https://github.com/discordia-space/CEV-Eris/raw/d71760fe0c0e9ea3a9aa8e9e794daf7e7f892d8c/icons/inventory/suit/mob.dmi", "states": [{"name": "equipped-OUTERCLOTHING", "directions": 4}, {"name": "icon", "directions": 1, "delays": [[1.0]]}, {"name": "inhand-left", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "inhand-right", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}]}
|
||||||
|
After Width: | Height: | Size: 933 B |