Add propeller hat & swirl lollipop (#38260)

diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
index f1389c854d82637b1d6063ad4c5537014d28f9bd..c03c73b72bb26990e35c327404ea65716b860935 100644 (file)
--- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
+++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
@@ -32,7 +32,7 @@
     sprite: Objects/Specific/Service/vending_machine_restock.rsi
     state: base
   product: CrateVendingMachineRestockClothesFilled
-  cost: 2480
+  cost: 2500
   category: cargoproduct-category-name-service
   group: market
 

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
index 8f6dd5ac151b128d4082ebdb690e38cf1e815186..a1e79d52aaa7e49743af7767a8e7fa8ad5c0345a 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml
@@ -79,6 +79,7 @@
     ClothingHeadHatCorpsoft: 2
     ClothingHeadFishCap: 2
     ClothingHeadRastaHat: 2
+    ClothingHeadPropellerHat: 2
     ClothingBeltStorageWaistbag: 3
     ClothingEyesGlasses: 6
     ClothingHandsGlovesColorBlack: 4

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
index cd89dbeb167db9cd27f75404dc956122e5803c5a..b55ddbfa31abb393865fd4b6f322bbadec3bd580 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml
@@ -8,4 +8,5 @@
     FoodSnackSus: 3
     FoodSnackSemki: 3
   contrabandInventory:
+    FoodSnackSwirlLollipop: 2
     FoodSnackSyndi: 3

diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
index addf952555bd66a7fb5d024fbc859014ab4d553c..e00920b3399f84aa342d7be59b5e24ae2bcc2acb 100644 (file)
--- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml
+++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml
@@ -1316,3 +1316,36 @@
     sprite: Clothing/Head/Hats/solidheadband.rsi
   - type: Clothing
     sprite: Clothing/Head/Hats/solidheadband.rsi
+
+- type: entity
+  parent: ClothingHeadBase
+  id: ClothingHeadPropellerHat
+  name: propeller hat
+  description: You're the bestest boy.
+  components:
+  - type: Sprite
+    sprite: Clothing/Head/Hats/propellerhat.rsi
+    layers:
+    - state: icon
+      map: [ "enum.ToggleableVisuals.Layer" ]
+  - type: Clothing
+    equippedPrefix: off
+    sprite: Clothing/Head/Hats/propellerhat.rsi
+  - type: ToggleableVisuals
+    spriteLayer: enum.ToggleableVisuals.Layer
+    clothingVisuals:
+      head:
+      - state: on-equipped-HELMET
+  - type: Appearance
+  - type: GenericVisualizer
+    visuals:
+      enum.ToggleableVisuals.Enabled:
+        enum.ToggleableVisuals.Layer:
+          True: {state: icon-on}
+          False: {state: icon}
+  - type: ItemToggle
+    predictable: true
+    soundActivate:
+      path: /Audio/Items/flashlight_on.ogg
+    soundDeactivate:
+      path: /Audio/Items/flashlight_off.ogg

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
index 1c42cfd2984498648df84669e0cff7764b9da7cb..0b8b5289a1e7f44aaef90884b74834367f33bb5b 100644 (file)
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/Food_Drinks/food_snacks.yml
@@ -51,3 +51,4 @@
     - id: FoodSnackSemki
     - id: FoodSnackSus
     - id: FoodSnackSyndi
+    - id: FoodSnackSwirlLollipop

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
index 3668e173b7a770ec43c7ea38c4aeba6fff248a09..c8b0e2d1f85618527bfc888ba479086147d806ed 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml
@@ -520,6 +520,41 @@
         - ReagentId: Theobromine
           Quantity: 3
 
+- type: entity
+  name: swirl lollipop
+  parent: FoodSnackBase
+  id: FoodSnackSwirlLollipop
+  description: A swirly circle of pure concentrated sugar. Who's the biggest kid on the playground now?
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Food/candy.rsi
+    state: swirl_lollipop
+  - type: Item
+    sprite: Objects/Consumable/Food/candy.rsi
+    heldPrefix: swirl_lollipop
+    size: Small
+  - type: Tag
+    tags:
+    - FoodSnack
+    - ReptilianFood
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 20 # Room for extra condiments
+        reagents:
+        - ReagentId: Sugar
+          Quantity: 15
+  - type: FlavorProfile
+    flavors:
+    - sweet
+  - type: MeleeWeapon
+    wideAnimationRotation: -135
+    damage:
+      types:
+        Blunt: 2
+    soundHit:
+      collection: WeakHit
+
 # Trash
 
 - type: entity

diff --git a/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon-on.png b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon-on.png
new file mode 100644 (file)
index 0000000..6201d1e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon-on.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon.png
new file mode 100644 (file)
index 0000000..6201d1e
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/icon.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/meta.json
new file mode 100644 (file)
index 0000000..e5deee0
--- /dev/null
+++ b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/meta.json
@@ -0,0 +1,51 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/9bfce7e50375ac0b347c0236aa282de77c001767",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "on-equipped-HELMET",
+      "directions": 4,
+      "delays": [
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ],
+        [
+          0.1,
+          0.1,
+          0.1,
+          0.1
+        ]
+      ]
+    },
+    {
+      "name": "off-equipped-HELMET",
+      "directions": 4
+    },
+    {
+      "name": "icon"
+    },
+    {
+      "name": "icon-on"
+    }
+  ]
+}

diff --git a/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/off-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/off-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..1d707db
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/off-equipped-HELMET.png differ

diff --git a/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/on-equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/on-equipped-HELMET.png
new file mode 100644 (file)
index 0000000..a8f65c3
Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/propellerhat.rsi/on-equipped-HELMET.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
index 6a30a0956c27bd5bce5f4443548cbb9e36bc9f74..c50a8f0ece590471afddd49e87738f59d23a5eaa 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
+++ b/Resources/Textures/Objects/Consumable/Food/candy.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, swirl_lollipop taken from tgstation at https://github.com/tgstation/tgstation/commit/9bfce7e50375ac0b347c0236aa282de77c001767",
   "size": {
     "x": 32,
     "y": 32
@@ -41,6 +41,17 @@
     },
     {
       "name": "orange"
+    },
+    {
+      "name": "swirl_lollipop"
+    },
+    {
+      "name": "swirl_lollipop-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "swirl_lollipop-inhand-left",
+      "directions": 4
     }
   ]
 }

diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-left.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-left.png
new file mode 100644 (file)
index 0000000..fd8f4fe
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-right.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-right.png
new file mode 100644 (file)
index 0000000..68b66f7
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop.png b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop.png
new file mode 100644 (file)
index 0000000..9fec974
Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop.png differ