]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
The medical beret is real (#25176)
authoricekot8 <93311212+icekot8@users.noreply.github.com>
Tue, 13 Feb 2024 21:37:23 +0000 (00:37 +0300)
committerGitHub <noreply@github.com>
Tue, 13 Feb 2024 21:37:23 +0000 (16:37 -0500)
* 1

* 2

* button is real.

Resources/Prototypes/Catalog/VendingMachines/Inventories/medidrobe.yml
Resources/Prototypes/Entities/Clothing/Head/hats.yml
Resources/Prototypes/Recipes/Lathes/clothing.yml
Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png [new file with mode: 0644]
Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json [new file with mode: 0644]

index 6dc19964794987b5c1e5e661877dff7c3733851f..a511b08d6537d878ed219fc5dddcf68eaec12ef9 100644 (file)
@@ -7,6 +7,7 @@
     ClothingUniformJumpsuitMedicalDoctor: 4\r
     ClothingUniformJumpskirtMedicalDoctor: 4\r
     ClothingEyesEyepatchHudMedical: 1\r
+    ClothingHeadHatBeretMedic: 4\r
     ClothingHeadNurseHat: 4\r
     ClothingOuterCoatLab: 4\r
     ClothingShoesColorWhite: 4\r
index 9b0e9583ee6f75c6cf5ae63388b9db32cb170145..7609f65d9b937ebb5fa13ff4340440fa94e5c299 100644 (file)
 - 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
       - !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
\ No newline at end of file
index b1d14dbe6c15a45f5b3588f2e9bc79fad4b87982..56f09e5c68aa70fb8e865b98d45de73f5accad11 100644 (file)
     Cloth: 100
     Durathread: 50
 
+- type: latheRecipe
+  id: ClothingHeadHatBeretMedic
+  result: ClothingHeadHatBeretMedic
+  completetime: 2
+  materials:
+    Cloth: 100
+
 - type: latheRecipe
   id: ClothingHeadHatBeretBrigmedic
   result: ClothingHeadHatBeretBrigmedic
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png
new file mode 100644 (file)
index 0000000..13f8eb2
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/equipped-HELMET.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png
new file mode 100644 (file)
index 0000000..46b5ac1
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..fe6d00e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-left.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..6af0e05
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/inhand-right.png differ
diff --git a/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/beret_medic.rsi/meta.json
new file mode 100644 (file)
index 0000000..e119701
--- /dev/null
@@ -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
+    }
+  ]
+}