diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index f1389c854d..c03c73b72b 100644 --- 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 8f6dd5ac15..a1e79d52aa 100644 --- 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 cd89dbeb16..b55ddbfa31 100644 --- 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 addf952555..e00920b339 100644 --- 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 1c42cfd298..0b8b5289a1 100644 --- 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 3668e173b7..c8b0e2d1f8 100644 --- 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 index 0000000000..6201d1e75f 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 index 0000000000..6201d1e75f 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 index 0000000000..e5deee09d9 --- /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 index 0000000000..1d707db963 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 index 0000000000..a8f65c32a6 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 6a30a0956c..c50a8f0ece 100644 --- 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 index 0000000000..fd8f4fe804 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 index 0000000000..68b66f78fe 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 index 0000000000..9fec974d07 Binary files /dev/null and b/Resources/Textures/Objects/Consumable/Food/candy.rsi/swirl_lollipop.png differ