[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 26f08416197bf414c871b08da57515a30e861c32..53707fe2d8f35ce4971b4fec95edae0167078eb7 100644 (file)
--- 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 67e3a3fa3e23b6a4b8b451ffe7c995d7039d860a..3ac3fb126e9be5560b6349751d81e01c25570cb1 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
+++ b/Resources/Prototypes/Entities/Clothing/Neck/medals.yml
@@ -3,13 +3,13 @@
   parent: ClothingNeckBase\r
   id: ClothingNeckBronzeheart\r
   name: bronzeheart medal\r
-  description: Given to crewmates for exemplary bravery in the face of danger. \r
+  description: Given to crewmates for exemplary bravery in the face of danger.\r
   components:\r
   - type: Sprite\r
     sprite: Clothing/Neck/Medals/bronzeheart.rsi\r
   - type: Clothing\r
     sprite: Clothing/Neck/Medals/bronzeheart.rsi\r
-    \r
+\r
 - type: entity\r
   parent: ClothingNeckBase\r
   id: ClothingNeckGoldmedal\r
@@ -19,4 +19,70 @@
   - type: Sprite\r
     sprite: Clothing/Neck/Medals/gold.rsi\r
   - type: Clothing\r
-    sprite: Clothing/Neck/Medals/gold.rsi  
\ No newline at end of file
+    sprite: Clothing/Neck/Medals/gold.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckCargomedal\r
+  name: cargo medal\r
+  description: Given for the best work in the cargo department.\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/cargomedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/cargomedal.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckEngineermedal\r
+  name: engineer medal\r
+  description: Given for the best work in the engineering department.\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/engineermedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/engineermedal.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckMedicalmedal\r
+  name: medical medal\r
+  description: Given for the best work in the medical department.\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/medicalmedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/medicalmedal.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckSciencemedal\r
+  name: science medal\r
+  description: Given for the best work in the science department.\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/sciencemedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/sciencemedal.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckSecuritymedal\r
+  name: security medal\r
+  description: Given for the best work in the security department.\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/securitymedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/securitymedal.rsi\r
+\r
+- type: entity\r
+  parent: ClothingNeckBase\r
+  id: ClothingNeckClownmedal\r
+  name: clown medal\r
+  description: Given for the best joke in the universe. HONK!\r
+  components:\r
+  - type: Sprite\r
+    sprite: Clothing/Neck/Medals/clownmedal.rsi\r
+  - type: Clothing\r
+    sprite: Clothing/Neck/Medals/clownmedal.rsi\r

diff --git a/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml b/Resources/Prototypes/Entities/Objects/Misc/medalcase.yml
new file mode 100644 (file)
index 0000000..4826179
--- /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 (file)
index 0000000..dc7f5ed
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 (file)
index 0000000..b5c4245
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 (file)
index 0000000..1a18a12
--- /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 (file)
index 0000000..78b5566
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 (file)
index 0000000..25aa78b
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 (file)
index 0000000..1a18a12
--- /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 (file)
index 0000000..bc0f6ae
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 (file)
index 0000000..f7f6079
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 (file)
index 0000000..9fe59d7
--- /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 (file)
index 0000000..54f2b18
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 (file)
index 0000000..092a684
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 (file)
index 0000000..1a18a12
--- /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 (file)
index 0000000..9d618bb
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 (file)
index 0000000..f70a8b4
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 (file)
index 0000000..1a18a12
--- /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 (file)
index 0000000..93e1c38
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 (file)
index 0000000..f682bdb
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 (file)
index 0000000..1a18a12
--- /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 (file)
index 0000000..1a3618e
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 (file)
index 0000000..384aae8
--- /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"
+      }
+    ]
+  }