Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

The medical beret is real #25176

Merged
merged 3 commits into from
Feb 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
ClothingUniformJumpsuitMedicalDoctor: 4
ClothingUniformJumpskirtMedicalDoctor: 4
ClothingEyesEyepatchHudMedical: 1
ClothingHeadHatBeretMedic: 4
ClothingHeadNurseHat: 4
ClothingOuterCoatLab: 4
ClothingShoesColorWhite: 4
Expand Down
12 changes: 11 additions & 1 deletion Resources/Prototypes/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretBrigmedic
name: medical beret
name: brigmedical beret
description: White beret, looks like a cream pie on the head.
components:
- type: Sprite
Expand Down Expand Up @@ -1025,3 +1025,13 @@
- !type:DoActsBehavior
acts: [ "Destruction" ]

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatBeretMedic
name: medical beret
description: White beret that encourages you to be clean.
components:
- type: Sprite
sprite: Clothing/Head/Hats/beret_medic.rsi
- type: Clothing
sprite: Clothing/Head/Hats/beret_medic.rsi
7 changes: 7 additions & 0 deletions Resources/Prototypes/Recipes/Lathes/clothing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1002,6 +1002,13 @@
Cloth: 100
Durathread: 50

- type: latheRecipe
id: ClothingHeadHatBeretMedic
result: ClothingHeadHatBeretMedic
completetime: 2
materials:
Cloth: 100

- type: latheRecipe
id: ClothingHeadHatBeretBrigmedic
result: ClothingHeadHatBeretBrigmedic
Expand Down
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.
26 changes: 26 additions & 0 deletions Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Sprited by Hülle#2562 (Discord), resprite by icekot8",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-HELMET",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
}
]
}
Loading