diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml index 0233072bbf2..8da12adc531 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hoods.yml @@ -10,3 +10,20 @@ sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi - type: Clothing sprite: _NF/Clothing/Head/Hoods/Coat/arcadia.rsi + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHoodRosyCloak + name: rosy the maple mothroach hood + description: The adorable visage of a rosy maple mothroach. You have never felt cuter. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hoods/rosy.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hoods/rosy.rsi + - type: Tag + tags: + - WhitelistChameleon + - type: HideLayerClothing + slots: + - Hair diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml index 35bcdb5cbcb..9a3ee3ce656 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -17,3 +17,23 @@ components: - type: Sprite sprite: _NF/Clothing/Neck/Cloaks/sr.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakRosy + name: rosy the maple mothroach cloak + description: A cloak made of pink and floof and roach. + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/rosy.rsi + - type: ToggleableClothing + clothingPrototype: ClothingHeadHatHoodRosyCloak + requiredSlot: + - neck + slot: head + - type: ContainerContainer + containers: + toggleable-clothing: !type:ContainerSlot {} + - type: Construction + graph: ClothingNeckCloakRosyGraph + node: ClothingNeckCloakRosyNode diff --git a/Resources/Prototypes/_NF/Entities/Materials/materials.yml b/Resources/Prototypes/_NF/Entities/Materials/materials.yml new file mode 100644 index 00000000000..8d2e6e6acdd --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Materials/materials.yml @@ -0,0 +1,12 @@ +- type: entity + parent: MaterialBase + id: MaterialHideRosyMothroach + name: rosy maple mothroach hide + description: A thin layer of rosy maple mothroach hide. + components: + - type: Sprite + sprite: _NF/Objects/Materials/rosymothroach.rsi + state: hiderosymothroach + - type: Tag + tags: + - MaterialHideRosyMothroach diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml index d0e029d0c73..bd9cadbf5b5 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/animals.yml @@ -56,3 +56,10 @@ size: Normal - type: Clothing sprite: _NF/Mobs/Animals/rosy_mothroach.rsi + - type: Butcherable + spawned: + - id: FoodMeatSlime + amount: 2 + - id: MaterialHideRosyMothroach + amount: 1 + prob: 0.3 diff --git a/Resources/Prototypes/_NF/Mail/mail.yml b/Resources/Prototypes/_NF/Mail/mail.yml index be5607c89f1..f2c20a70c49 100644 --- a/Resources/Prototypes/_NF/Mail/mail.yml +++ b/Resources/Prototypes/_NF/Mail/mail.yml @@ -1654,6 +1654,8 @@ orGroup: Clothes - id: ClothingOuterSuitCarp orGroup: Clothes + - id: ClothingNeckCloakRosy + orGroup: Clothes - type: entity categories: [ HideSpawnMenu ] diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml new file mode 100644 index 00000000000..f1cd2f3db5b --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/rosy_graph.yml @@ -0,0 +1,19 @@ +- type: constructionGraph + id: ClothingNeckCloakRosyGraph + start: start + graph: + - node: start + edges: + - to: ClothingNeckCloakRosy + steps: + - tag: MaterialHideRosyMothroach + icon: + sprite: _NF/Objects/Materials/rosymothroach.rsi + state: hiderosymothroach + name: rosy maple mothroach hide + doAfter: 10 + - material: Cloth + amount: 10 + doAfter: 5 + - node: ClothingNeckCloakRosy + entity: ClothingNeckCloakRosy diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml b/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml new file mode 100644 index 00000000000..e253a98bd2e --- /dev/null +++ b/Resources/Prototypes/_NF/Recipes/Crafting/rosy_craft.yml @@ -0,0 +1,12 @@ +- type: construction + name: maple mothroach cloak + id: ClothingNeckCloakRosyRecipe + graph: ClothingNeckCloakRosyGraph + startNode: start + targetNode: ClothingNeckCloakRosy + category: construction-category-clothing + description: As you stare into those lifeless eyes you know this is what you, I mean they, would have wanted. + icon: + sprite: _NF/Clothing/Neck/Cloaks/rosy.rsi + state: icon + objectType: Item diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index a2eeeccf5cd..21b551ec9a8 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -96,9 +96,12 @@ - type: Tag id: BrassKnucklesNF + +- type: Tag + id: MaterialHideRosyMothroach - type: Tag id: Sushi - type: Tag - id: NFVGRoidInterior \ No newline at end of file + id: NFVGRoidInterior diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3e8eaade391 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/icon.png new file mode 100644 index 00000000000..cc03977cf1a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json new file mode 100644 index 00000000000..67ca3e10eb8 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Head/Hoods/rosy.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprites by gentlebutter (discord), edited by dustylens(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png new file mode 100644 index 00000000000..e01be654132 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/equipped-NECK.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/icon.png new file mode 100644 index 00000000000..16bee6d1cae Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png new file mode 100644 index 00000000000..f1c8da2c46a Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png new file mode 100644 index 00000000000..287c4a2dd85 Binary files /dev/null and b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json new file mode 100644 index 00000000000..6a6c4a1a7fa --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/rosy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "sprites by gentlebutter (discord), edited by dustylens(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png b/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png new file mode 100644 index 00000000000..b10cfddc3c9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/hiderosymothroach.png differ diff --git a/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/meta.json b/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/meta.json new file mode 100644 index 00000000000..4d0dc3d1786 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Materials/rosymothroach.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/fulpstation/fulpstation/commit/edb232b692ec9f356ec554ea1971da552b9bc447, edited by dustylens(github)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "hiderosymothroach" + } + ] +}