diff --git a/Resources/Locale/en-US/_DV/ghost/roles/christmas_kobold.ftl b/Resources/Locale/en-US/_DV/ghost/roles/christmas_kobold.ftl new file mode 100644 index 00000000000..68a08f52231 --- /dev/null +++ b/Resources/Locale/en-US/_DV/ghost/roles/christmas_kobold.ftl @@ -0,0 +1,3 @@ +ghost-role-information-christmas-kobold-name = Christmas Kobold +ghost-role-information-christmas-kobold-description = Defender of the sacred Yule Tree. You have been called upon to avenge it. +ghost-role-information-christmas-kobold-rules = Someone cut down The Tree of Gifts. Find them and teach them to be jolly by any means necessary. diff --git a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml index 4161fde0c3c..8675ab6f871 100644 --- a/Resources/Prototypes/Entities/Objects/Decoration/flora.yml +++ b/Resources/Prototypes/Entities/Objects/Decoration/flora.yml @@ -333,6 +333,38 @@ receivedPopup: christmas-tree-got-gift deniedPopup: christmas-tree-no-gift requiredHoliday: FestiveSeason + # Start Delta V - Add Christmas kobold mob spawn. Plan to remove when we have our own tree variant + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 400 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 50 + behaviors: + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/tree_fell.ogg + params: + volume: 5 + variation: 0.05 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:SpawnEntitiesBehavior + spawn: + Log: + min: 2 + max: 8 + - !type:SpawnEntitiesBehavior + spawn: + MobChristmasKobold: + min: 4 + max: 8 + # End Delta V - Spawn Christmas kobold. - type: entity parent: FloraTreeChristmas02 diff --git a/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml new file mode 100644 index 00000000000..b98f1048c0c --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Mobs/NPCs/christmas_kobold.yml @@ -0,0 +1,28 @@ +- type: entity + id: MobChristmasKobold + parent: MobBaseKobold + suffix: Christmas Kobold + components: + - type: CombatMode + - type: HTN + rootTask: + task: SimpleHostileCompound + - type: MobThresholds + thresholds: + 0: Alive + 100: Critical + 200: Dead + - type: NpcFactionMember + factions: + - SimpleHostile + - type: Bloodstream + bloodMaxVolume: 150 + bloodReagent: Eggnog + - type: Loadout + prototypes: [ ElfGearMonkey ] + - type: GhostRole + prob: 0.05 + makeSentient: true + name: ghost-role-information-christmas-kobold-name + description: ghost-role-information-christmas-kobold-description + rules: ghost-role-information-christmas-kobold-rules diff --git a/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/candy_spear.yml b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/candy_spear.yml new file mode 100644 index 00000000000..3b7f703d0a0 --- /dev/null +++ b/Resources/Prototypes/_DV/Entities/Objects/Weapons/Melee/candy_spear.yml @@ -0,0 +1,8 @@ +- type: entity + name: candy spear + parent: Spear + id: SpearCandy + description: A spear made with a hardened sugar. + components: + - type: Sprite + sprite: _DV/Objects/Weapons/Melee/candy_spear.rsi diff --git a/Resources/Prototypes/_DV/Recipes/Cooking/Microwave/candy_spear.yml b/Resources/Prototypes/_DV/Recipes/Cooking/Microwave/candy_spear.yml new file mode 100644 index 00000000000..08ff12a4c4d --- /dev/null +++ b/Resources/Prototypes/_DV/Recipes/Cooking/Microwave/candy_spear.yml @@ -0,0 +1,11 @@ +- type: microwaveMealRecipe + id: RecipeCandySpear + name: candy spear recipe + result: SpearCandy + secretRecipe: true + time: 20 + group: Secret + reagents: + Sugar: 20 + solids: + PartRodMetal1: 1 diff --git a/Resources/Prototypes/_DV/Roles/Antags/christmas_kobold.yml b/Resources/Prototypes/_DV/Roles/Antags/christmas_kobold.yml new file mode 100644 index 00000000000..f00a3ee0048 --- /dev/null +++ b/Resources/Prototypes/_DV/Roles/Antags/christmas_kobold.yml @@ -0,0 +1,8 @@ +- type: startingGear + id: ElfGearMonkey + equipment: + head: ClothingHeadHatElf + jumpsuit: ClothingUniformElf +# shoes: ClothingShoesMiscElf #todo needs displacement and inventory template to wear shoes + inhand: + - SpearCandy diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-BACKPACK.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-BACKPACK.png new file mode 100644 index 00000000000..f2fd585bcb5 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-BACKPACK.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-SUITSTORAGE.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-SUITSTORAGE.png new file mode 100644 index 00000000000..f2fd585bcb5 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-SUITSTORAGE.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-back-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-back-fill-1.png new file mode 100644 index 00000000000..db23cdc2a4f Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-back-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-suitstorage-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-suitstorage-fill-1.png new file mode 100644 index 00000000000..db23cdc2a4f Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/equipped-suitstorage-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left-fill-1.png new file mode 100644 index 00000000000..87a1358a8ce Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left.png new file mode 100644 index 00000000000..e7aaa420459 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right-fill-1.png new file mode 100644 index 00000000000..4d0d61d0c17 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right.png new file mode 100644 index 00000000000..b2adbe76a3a Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/inhand-right.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/meta.json b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/meta.json new file mode 100644 index 00000000000..3d834ef8a12 --- /dev/null +++ b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/meta.json @@ -0,0 +1,65 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by Stxcking", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "spear" + }, + { + "name": "spear1" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-left-fill-1", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "inhand-right-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4 + }, + { + "name": "wielded-inhand-left-fill-1", + "directions": 4 + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-right-fill-1", + "directions": 4 + }, + { + "name": "equipped-BACKPACK", + "directions": 4 + }, + { + "name": "equipped-back-fill-1", + "directions": 4 + }, + { + "name": "equipped-SUITSTORAGE", + "directions": 4 + }, + { + "name": "equipped-suitstorage-fill-1", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear.png new file mode 100644 index 00000000000..0717d4bc1e4 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear1.png new file mode 100644 index 00000000000..fec362ac728 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/spear1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left-fill-1.png new file mode 100644 index 00000000000..e50787d3f94 Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..3c36fc41c6a Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right-fill-1.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right-fill-1.png new file mode 100644 index 00000000000..0a78a494a7c Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right-fill-1.png differ diff --git a/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right.png b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..91ede5593fe Binary files /dev/null and b/Resources/Textures/_DV/Objects/Weapons/Melee/candy_spear.rsi/wielded-inhand-right.png differ