diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 123896240d9deb..97145a0f00d8ca 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -791,6 +791,21 @@ coefficients: Blunt: 0.95 +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatHolyWatermelon + name: watermelon halo + description: Holy moly. + components: + - type: Sprite + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Clothing + sprite: Clothing/Head/Hats/holyhatmelon.rsi + - type: Armor + modifiers: + coefficients: + Caustic: 0.95 + - type: entity parent: [ClothingHeadBase, BaseSyndicateContraband] id: ClothingHeadHatSyndie diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml index 42fd0967ff190f..7434481ac21e43 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml @@ -2088,6 +2088,10 @@ - type: SliceableFood count: 5 slice: FoodHolymelonSlice + - type: Butcherable + butcheringType: Knife + spawned: + - id: ClothingHeadHatHolyWatermelon - type: Tag tags: - Fruit diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png new file mode 100644 index 00000000000000..d23c59ef64de86 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png new file mode 100644 index 00000000000000..6161c05f120867 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/icon.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png new file mode 100644 index 00000000000000..6f8c72da91e5bc Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-left.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png new file mode 100644 index 00000000000000..6a4eb8bbe3a3c7 Binary files /dev/null and b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/inhand-right.png differ diff --git a/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json new file mode 100644 index 00000000000000..4d35c0187d504f --- /dev/null +++ b/Resources/Textures/Clothing/Head/Hats/holyhatmelon.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/vgstation-coders/vgstation13/commit/b459ea3fdee965bdc3e93e7983ad7fa610d05c12 and https://github.com/tgstation/tgstation/commit/ead6d8d59753ef033efdfad17f337df268038ff3 and modified by ravage", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}