Skip to content

Commit

Permalink
Merge branch 'arumoon-server' into 'arumoon-server'
Browse files Browse the repository at this point in the history
HL cloth

See merge request Workbench-Team/space-station-14!87
  • Loading branch information
AruMoon committed Jul 18, 2023
2 parents 0c87f39 + a98153d commit 084c3dd
Show file tree
Hide file tree
Showing 17 changed files with 94 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,8 @@ ent-ClothingUniformJumpsuitHawaiYellow = yellow hawaiian shirt
ent-ClothingUniformJumpsuitFlannel = flannel jumpsuit
.desc = Smells like someones been grillin'.
.suffix = { "" }
ent-ClothingUniformHECU = HECU uniform
.desc = The HECU jumpsuit is used to protect against foreign environmental factors (besides, real American patriots like to wear it).
.suffix = { "" }
ent-ClothingUniformJumpsuitCitizen = citizen jumpsuit
.desc = Jumpsuit that will definitely make you look like a victim.
Original file line number Diff line number Diff line change
Expand Up @@ -307,3 +307,8 @@ ent-ClothingUniformJumpsuitHawaiYellow = жёлтая гавайская руб
ent-ClothingUniformJumpsuitFlannel = фланелевый комбинезон
.desc = Пахнет так, будто кто-то жарил на гриле.
.suffix = { "" }
ent-ClothingUniformHECU = униформа HECU
.desc = Комбинезон HECU используется для защиты от посторонних факторов внешней среды (к тому же его любят носить настоящие американские патриоты).
.suffix = { "" }
ent-ClothingUniformJumpsuitCitizen = комбинезон гражданского
.desc = Комбинезон, в котором ты точно будешь похожа на жертву.
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
ClothingHeadFishCap: 2
ClothingHeadRastaHat: 2
ClothingBeltStorageWaistbag: 3
ClothingUniformJumpsuitCitizen: 3
contrabandInventory:
ClothingUniformJumpsuitTacticool: 1
ClothingUniformJumpskirtTacticool: 1
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
ClothingOuterWinterSec: 2
ClothingEyesBlindfold: 1
ClothingShoesBootsCombat: 1
ClothingUniformHECU: 1
22 changes: 22 additions & 0 deletions Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1170,3 +1170,25 @@
sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/flannel.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformHECU
name: HECU uniform
description: The HECU jumpsuit is used to protect against foreign environmental factors (besides, real American patriots like to wear it)
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/hecu.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/hecu.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitCitizen
name: Citizen jumpsuit
description: jumpsuit that will definitely make you look like a victim
components:
- type: Sprite
sprite: Clothing/Uniforms/Jumpsuit/civilian.rsi
- type: Clothing
sprite: Clothing/Uniforms/Jumpsuit/civilian.rsi
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Reyen",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 30 additions & 0 deletions Resources/Textures/Clothing/Uniforms/Jumpsuit/hecu.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Made by Reyen",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-INNERCLOTHING",
"directions": 4
},
{
"name": "equipped-INNERCLOTHING-monkey",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}

0 comments on commit 084c3dd

Please sign in to comment.