Adds neck UI slot and rearranges inventory UI. (#1130)

* UI Icon * It worked? * Reorganized UI * converted the bedsheet/cloak sprites * backpacks go over cloaks now * Added a couple more neck clothing * Milk Ape
2020-06-21 20:02:18 +00:00
parent 0e92a0c88c
commit 7b98f37f9a
129 changed files with 662 additions and 134 deletions
--- a/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml
+++ b/Resources/Prototypes/Entities/Items/Clothing/cloaks.yml
@@ -13,7 +13,7 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
+    - neck
    sprite: Clothing/cloak.rsi

 - type: entity
@@ -42,7 +42,6 @@
  - type: Clothing
    HeldPrefix: hoscloak

-
 - type: entity
  parent: CloakClothing
  id: CeCloak
@@ -55,7 +54,6 @@
  - type: Clothing
    HeldPrefix: cecloak

-
 - type: entity
  parent: CloakClothing
  id: CmoCloak
@@ -80,7 +78,6 @@
  - type: Clothing
    HeldPrefix: rdcloak

-
 - type: entity
  parent: CloakClothing
  id: QmCloak
@@ -104,3 +101,15 @@
    state: hopcloak
  - type: Clothing
    HeldPrefix: hopcloak
+
+- type: entity
+  parent: CloakClothing
+  id: HeraldCloak
+  name: Herald's cloak
+  components:
+  - type: Sprite
+    state: heraldcloak
+  - type: Icon
+    state: heraldcloak
+  - type: Clothing
+    HeldPrefix: heraldcloak
--- a/Resources/Prototypes/Entities/Items/Clothing/neck.yml
+++ b/Resources/Prototypes/Entities/Items/Clothing/neck.yml
@@ -0,0 +1,134 @@
+- type: entity
+  parent: Clothing
+  id: NeckClothing
+  abstract: true
+  name: neck
+  description:
+  components:
+  - type: Sprite
+    sprite: Clothing/neck.rsi
+  - type: Icon
+    sprite: Clothing/neck.rsi
+  - type: Clothing
+    Size: 10
+    QuickEquip: true
+    Slots:
+    - neck
+    sprite: Clothing/neck.rsi
+
+- type: entity
+  parent: NeckClothing
+  id: HeadPhonesOn
+  name: headphones
+  description:
+  components:
+  - type: Sprite
+    state: headphones_on
+  - type: Icon
+    state: headphones_on
+  - type: Clothing
+    HeldPrefix: headphones_on
+
+- type: entity
+  parent: NeckClothing
+  id: RedTie
+  name: red-tie
+  description:
+  components:
+  - type: Sprite
+    state: redtie
+  - type: Icon
+    state: redtie
+  - type: Clothing
+    HeldPrefix: redtie
+
+- type: entity
+  parent: NeckClothing
+  id: DetTie
+  name: detective's tie
+  description:
+  components:
+  - type: Sprite
+    state: dettie
+  - type: Icon
+    state: dettie
+  - type: Clothing
+    HeldPrefix: dettie
+
+- type: entity
+  parent: NeckClothing
+  id: Stethoscope
+  name: stethoscope
+  description:
+  components:
+  - type: Sprite
+    state: stethoscope
+  - type: Icon
+    state: stethoscope
+  - type: Clothing
+    HeldPrefix: stethoscope
+
+- type: entity
+  parent: NeckClothing
+  id: StripedRedScarf
+  name: striped red scarf
+  description:
+  components:
+  - type: Sprite
+    state: stripedredscarf
+  - type: Icon
+    state: stripedredscarf
+  - type: Clothing
+    HeldPrefix: stripedredscarf
+
+- type: entity
+  parent: NeckClothing
+  id: StripedBlueScarf
+  name: striped blue scarf
+  description:
+  components:
+  - type: Sprite
+    state: stripedbluescarf
+  - type: Icon
+    state: stripedbluescarf
+  - type: Clothing
+    HeldPrefix: stripedbluescarf
+
+- type: entity
+  parent: NeckClothing
+  id: StripedGreenScarf
+  name: striped green scarf
+  description:
+  components:
+  - type: Sprite
+    state: stripedgreenscarf
+  - type: Icon
+    state: stripedgreenscarf
+  - type: Clothing
+    HeldPrefix: stripedgreenscarf
+
+- type: entity
+  parent: NeckClothing
+  id: ZebraScarf
+  name: zebra scarf
+  description:
+  components:
+  - type: Sprite
+    state: zebrascarf
+  - type: Icon
+    state: zebrascarf
+  - type: Clothing
+    HeldPrefix: zebrascarf
+
+- type: entity
+  parent: NeckClothing
+  id: Bling
+  name: bling
+  description:
+  components:
+  - type: Sprite
+    state: bling
+  - type: Icon
+    state: bling
+  - type: Clothing
+    HeldPrefix: bling
--- a/Resources/Prototypes/Entities/Items/Consumables/food.yml
+++ b/Resources/Prototypes/Entities/Items/Consumables/food.yml
@@ -2988,3 +2988,22 @@
    sprite: Objects/Food/stew.rsi
  - type: Icon
    sprite: Objects/Food/stew.rsi
+
+- type: entity
+  parent: FoodBase
+  id: MilkApe
+  name: Milk Ape
+# Milk Ape's a proper noun you fuck
+  description: He sighed for your grins.
+  components:
+  - type: Food
+    trash: TrashSnackBowl
+  - type: Solution
+    contents:
+      reagents:
+      - ReagentId: chem.Nutriment
+        Quantity: 20
+  - type: Sprite
+    sprite: Objects/Food/milkape.rsi
+  - type: Icon
+    sprite: Objects/Food/milkape.rsi
--- a/Resources/Prototypes/Entities/Items/bedsheets.yml
+++ b/Resources/Prototypes/Entities/Items/bedsheets.yml
@@ -28,8 +28,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetblack

 - type: entity
@@ -45,8 +45,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetblue

 - type: entity
@@ -62,8 +62,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetbrown

 - type: entity
@@ -79,8 +79,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetcaptain

 - type: entity
@@ -96,8 +96,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetce

 - type: entity
@@ -113,8 +113,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetcentcom

 - type: entity
@@ -130,9 +130,9 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
-    HeldPrefix: sheetclown
+    - neck
+    sprite: Clothing/neck.rsi
+    HeldPrefix: sheetrainbow

 - type: entity
  id: BedsheetCMO
@@ -147,8 +147,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetcmo

 - type: entity
@@ -164,8 +164,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetcosmos

 - type: entity
@@ -181,8 +181,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetcult

 - type: entity
@@ -198,8 +198,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetgreen

 - type: entity
@@ -215,8 +215,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetgrey

 - type: entity
@@ -232,8 +232,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheethop

 - type: entity
@@ -249,8 +249,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheethos

 - type: entity
@@ -266,8 +266,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetian

 - type: entity
@@ -283,8 +283,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetmedical

 - type: entity
@@ -300,8 +300,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetmime

 - type: entity
@@ -317,8 +317,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetNT

 - type: entity
@@ -334,8 +334,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetorange

 - type: entity
@@ -351,8 +351,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetpurple

 - type: entity
@@ -368,8 +368,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetqm

 - type: entity
@@ -385,8 +385,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetrainbow

 - type: entity
@@ -402,8 +402,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetrd

 - type: entity
@@ -419,8 +419,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetred

 - type: entity
@@ -436,8 +436,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetsyndie

 - type: entity
@@ -453,8 +453,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetUSA

 - type: entity
@@ -470,8 +470,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetwhite

 - type: entity
@@ -487,8 +487,8 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetwiz

 - type: entity
@@ -504,6 +504,6 @@
    Size: 10
    QuickEquip: true
    Slots:
-    - back
-    sprite: Clothing/back.rsi
+    - neck
+    sprite: Clothing/neck.rsi
    HeldPrefix: sheetyellow
--- a/Resources/Prototypes/Entities/Mobs/human.yml
+++ b/Resources/Prototypes/Entities/Mobs/human.yml
@@ -87,6 +87,7 @@
    - map: ["enum.Slots.OUTERCLOTHING"]
    - map: ["enum.Slots.EYES"]
    - map: ["enum.Slots.BELT"]
+    - map: ["enum.Slots.NECK"]
    - map: ["enum.Slots.BACKPACK"]
    - map: ["enum.HumanoidVisualLayers.FacialHair"]
      state: shaved
@@ -227,6 +228,7 @@
      - map: ["enum.Slots.OUTERCLOTHING"]
      - map: ["enum.Slots.EYES"]
      - map: ["enum.Slots.BELT"]
+      - map: ["enum.Slots.NECK"]
      - map: ["enum.Slots.BACKPACK"]
      - map: ["enum.HumanoidVisualLayers.FacialHair"]
        state: shaved