From: AsikKEsel <115815982+AsikKEsel@users.noreply.github.com>
Date: Thu, 20 Apr 2023 23:54:31 +0000 (+0300)
Subject: [Entity] Add new medals (#15577)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=dce680065d5af1a7b7e15f246c205a7ccca4306b;p=space-station-14.git

[Entity] Add new medals (#15577)

* Add 6 new medals

* Update medalcase.yml

* Update medals.yml

* Update medalcase.yml
---

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
index 26f0841619..53707fe2d8 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
@@ -55,11 +55,10 @@
       - id: ClothingNeckCloakCapFormal
       - id: ClothingUniformJumpsuitCapFormal
       - id: ClothingUniformJumpskirtCapFormalDress
-      - id: ClothingNeckBronzeheart
-      - id: ClothingNeckGoldmedal
       - id: RubberStampCaptain
       - id: WeaponAntiqueLaser
       - id: JetpackCaptainFilled
+      - id: MedalCase
 
 - type: entity
   id: LockerHeadOfPersonnelFilled
diff --git a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
index 67e3a3fa3e..3ac3fb126e 100644
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -3,13 +3,13 @@
   parent: ClothingNeckBase
   id: ClothingNeckBronzeheart
   name: bronzeheart medal
-  description: Given to crewmates for exemplary bravery in the face of danger. 
+  description: Given to crewmates for exemplary bravery in the face of danger.
   components:
   - type: Sprite
     sprite: Clothing/Neck/Medals/bronzeheart.rsi
   - type: Clothing
     sprite: Clothing/Neck/Medals/bronzeheart.rsi
-    
+
 - type: entity
   parent: ClothingNeckBase
   id: ClothingNeckGoldmedal
@@ -19,4 +19,70 @@
   - type: Sprite
     sprite: Clothing/Neck/Medals/gold.rsi
   - type: Clothing
-    sprite: Clothing/Neck/Medals/gold.rsi  
\ No newline at end of file
+    sprite: Clothing/Neck/Medals/gold.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckCargomedal
+  name: cargo medal
+  description: Given for the best work in the cargo department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/cargomedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/cargomedal.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckEngineermedal
+  name: engineer medal
+  description: Given for the best work in the engineering department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/engineermedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/engineermedal.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckMedicalmedal
+  name: medical medal
+  description: Given for the best work in the medical department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/medicalmedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/medicalmedal.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckSciencemedal
+  name: science medal
+  description: Given for the best work in the science department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/sciencemedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/sciencemedal.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckSecuritymedal
+  name: security medal
+  description: Given for the best work in the security department.
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/securitymedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/securitymedal.rsi
+
+- type: entity
+  parent: ClothingNeckBase
+  id: ClothingNeckClownmedal
+  name: clown medal
+  description: Given for the best joke in the universe. HONK!
+  components:
+  - type: Sprite
+    sprite: Clothing/Neck/Medals/clownmedal.rsi
+  - type: Clothing
+    sprite: Clothing/Neck/Medals/clownmedal.rsi
diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
new file mode 100644
index 0000000000..4826179114
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
@@ -0,0 +1,23 @@
+- type: entity
+  id: MedalCase
+  name: medal case
+  description: Case with medals.
+  parent: BaseStorageItem
+  components:
+  - type: Sprite
+    sprite: Objects/Storage/medalcase.rsi
+  - type: Item
+    sprite: Objects/Storage/medalcase.rsi
+    size: 80
+  - type: Storage
+    capacity: 80
+  - type: StorageFill
+    contents:
+    - id: ClothingNeckGoldmedal
+    - id: ClothingNeckBronzeheart
+    - id: ClothingNeckCargomedal
+    - id: ClothingNeckEngineermedal
+    - id: ClothingNeckMedicalmedal
+    - id: ClothingNeckSciencemedal
+    - id: ClothingNeckSecuritymedal
+    - id: ClothingNeckClownmedal
diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..dc7f5ed4ea
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png
new file mode 100644
index 0000000000..b5c4245c2a
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json
new file mode 100644
index 0000000000..1a18a12dbf
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/cargomedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..78b556680a
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png
new file mode 100644
index 0000000000..25aa78b0b5
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/meta.json
new file mode 100644
index 0000000000..1a18a12dbf
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/clownmedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..bc0f6ae248
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png
new file mode 100644
index 0000000000..f7f607915c
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/meta.json
new file mode 100644
index 0000000000..9fe59d7c4f
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/engineermedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "made by AsikKEsel",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "equipped-NECK",
+      "directions": 4
+    }
+  ]
+}
\ No newline at end of file
diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..54f2b18c01
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png
new file mode 100644
index 0000000000..092a6843e9
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json
new file mode 100644
index 0000000000..1a18a12dbf
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/medicalmedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..9d618bbc57
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png
new file mode 100644
index 0000000000..f70a8b4b9b
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/meta.json
new file mode 100644
index 0000000000..1a18a12dbf
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/sciencemedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png
new file mode 100644
index 0000000000..93e1c3847f
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/equipped-NECK.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png
new file mode 100644
index 0000000000..f682bdbccb
Binary files /dev/null and b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/icon.png differ
diff --git a/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json
new file mode 100644
index 0000000000..1a18a12dbf
--- /dev/null
+++ b/Resources/Textures/Clothing/Neck/Medals/securitymedal.rsi/meta.json
@@ -0,0 +1,18 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      },
+      {
+        "name": "equipped-NECK",
+        "directions": 4
+      }
+    ]
+  }
diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/icon.png b/Resources/Textures/Objects/Storage/medalcase.rsi/icon.png
new file mode 100644
index 0000000000..1a3618ef0b
Binary files /dev/null and b/Resources/Textures/Objects/Storage/medalcase.rsi/icon.png differ
diff --git a/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
new file mode 100644
index 0000000000..384aae8a73
--- /dev/null
+++ b/Resources/Textures/Objects/Storage/medalcase.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Made by AsikKEsel",
+    "size": {
+      "x": 32,
+      "y": 32
+    },
+    "states": [
+      {
+        "name": "icon"
+      }
+    ]
+  }