diff --git a/Resources/Audio/_CP14/Effects/Footsteps/attributions.yml b/Resources/Audio/_CP14/Effects/Footsteps/attributions.yml index af75cc3fec..274fc957e3 100644 --- a/Resources/Audio/_CP14/Effects/Footsteps/attributions.yml +++ b/Resources/Audio/_CP14/Effects/Footsteps/attributions.yml @@ -2,3 +2,8 @@ license: "CC0-1.0" copyright: "Sound from D.jones: https://freesound.org/people/D.jones/" source: "https://freesound.org/people/D.jones/sounds/527846/" + +- files: ["slippers1.ogg", "slippers2.ogg", "slippers3.ogg"] + license: "CC0-1.0" + copyright: "Sound from brumxyz: https://freesound.org/people/brumxyz/" + source: "https://freesound.org/people/brumxyz/sounds/560728/" diff --git a/Resources/Audio/_CP14/Effects/Footsteps/slippers1.ogg b/Resources/Audio/_CP14/Effects/Footsteps/slippers1.ogg new file mode 100644 index 0000000000..bd10681582 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/Footsteps/slippers1.ogg differ diff --git a/Resources/Audio/_CP14/Effects/Footsteps/slippers2.ogg b/Resources/Audio/_CP14/Effects/Footsteps/slippers2.ogg new file mode 100644 index 0000000000..a427a39e51 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/Footsteps/slippers2.ogg differ diff --git a/Resources/Audio/_CP14/Effects/Footsteps/slippers3.ogg b/Resources/Audio/_CP14/Effects/Footsteps/slippers3.ogg new file mode 100644 index 0000000000..98b865f008 Binary files /dev/null and b/Resources/Audio/_CP14/Effects/Footsteps/slippers3.ogg differ diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml index b12bb5561d..5a0650af78 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Head/head.yml @@ -30,3 +30,29 @@ - type: ContainerContainer containers: storagebase: !type:Container + +- type: entity + parent: + - CP14ClothingHeadBase + - FoodProduceBase + id: CP14ClothingHeadaAgaricHelmet + name: agaric helmet + description: The severed head of a myconid in the form of a headdress. Terrify the mushroom people. + components: + - type: Sprite + sprite: _CP14/Clothing/Head/amanita_helmet.rsi + - type: Clothing + sprite: _CP14/Clothing/Head/amanita_helmet.rsi + - type: BadFood + - type: Extractable + juiceSolution: + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 7 + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 7 diff --git a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml index 86b8fc8f63..bb8250bfb0 100644 --- a/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml +++ b/Resources/Prototypes/_CP14/Entities/Clothing/Shoes/shoes.yml @@ -47,6 +47,12 @@ sprite: _CP14/Clothing/Shoes/sandals.rsi - type: Clothing sprite: _CP14/Clothing/Shoes/sandals.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: CP14Slippers + params: + volume: -8 + variation: 0.07 - type: entity parent: CP14ClothingShoesBase @@ -133,3 +139,22 @@ - type: NoSlip - type: StaticPrice price: 500 + +- type: entity + parent: CP14ClothingShoesBase + id: CP14ClothingShoesPinkSlippers + name: pink slippers + description: Pink slippers made of the rarest pink llama fur. Despite its peculiar appearance, it is a very expensive shoe. + components: + - type: Sprite + sprite: _CP14/Clothing/Shoes/pink_slippers.rsi + - type: Clothing + sprite: _CP14/Clothing/Shoes/pink_slippers.rsi + - type: FootstepModifier + footstepSoundCollection: + collection: CP14Slippers + params: + volume: -9 + variation: 0.07 + - type: StaticPrice + price: 100 diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml index af9f6af612..7063b5d9ea 100644 --- a/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml +++ b/Resources/Prototypes/_CP14/Entities/Mobs/NPC/myconide.yml @@ -66,9 +66,20 @@ - type: Butcherable spawned: - id: CP14AgaricMushroom - amount: 3 + amount: 2 + - id: CP14ClothingHeadaAgaricHelmet + amount: 1 + prob: 0.3 + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: CP14AgaricMushroom + Quantity: 7 - type: Bloodstream - bloodMaxVolume: 60 + bloodMaxVolume: 50 bloodReagent: CP14AgaricMushroom - type: Grammar attributes: @@ -151,9 +162,17 @@ - type: Butcherable spawned: - id: CP14LumiMushroom - amount: 3 + amount: 2 + - type: Food + - type: SolutionContainerManager + solutions: + food: + maxVol: 8 + reagents: + - ReagentId: CP14LumiMushroom + Quantity: 7 - type: Bloodstream - bloodMaxVolume: 60 + bloodMaxVolume: 50 bloodReagent: CP14LumiMushroom - type: Grammar attributes: diff --git a/Resources/Prototypes/_CP14/SoundCollections/footsteps.yml b/Resources/Prototypes/_CP14/SoundCollections/footsteps.yml index 9fa95faad7..82cc3285b6 100644 --- a/Resources/Prototypes/_CP14/SoundCollections/footsteps.yml +++ b/Resources/Prototypes/_CP14/SoundCollections/footsteps.yml @@ -5,5 +5,9 @@ - /Audio/_CP14/Effects/Footsteps/frogs_slippers2.ogg - /Audio/_CP14/Effects/Footsteps/frogs_slippers3.ogg - - +- type: soundCollection + id: CP14Slippers + files: + - /Audio/_CP14/Effects/Footsteps/slippers1.ogg + - /Audio/_CP14/Effects/Footsteps/slippers2.ogg + - /Audio/_CP14/Effects/Footsteps/slippers3.ogg diff --git a/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/equipped-HELMET.png b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/equipped-HELMET.png new file mode 100644 index 0000000000..cfb6add6bb Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/icon.png new file mode 100644 index 0000000000..15b32cad6b Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/meta.json new file mode 100644 index 0000000000..d99ddcdf8e --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Head/amanita_helmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Pelemonk (Github) for CrystallPunk 14", + "size": { + "x": 48, + "y": 48 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/equipped-FEET.png b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/equipped-FEET.png new file mode 100644 index 0000000000..fab23758fe Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/equipped-FEET.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/icon.png b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/icon.png new file mode 100644 index 0000000000..68146356fa Binary files /dev/null and b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/icon.png differ diff --git a/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/meta.json b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/meta.json new file mode 100644 index 0000000000..51da934daa --- /dev/null +++ b/Resources/Textures/_CP14/Clothing/Shoes/pink_slippers.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by Pelemonk (Github) for CrystallPunk 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + } + ] +}