From f987cb557c4662e45cd8ebe150cbd1c410745f7d Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Sun, 15 Oct 2023 00:13:25 +1300 Subject: [PATCH] Konyang: Jeweler Cockatoo & Nest (#17574) * jeweler cockatoo nest * ruin can actually spawn * changelog --- aurorastation.dme | 2 + .../modules/maps/planet_types/lore/konyang.dm | 2 +- .../hostile/retaliate/konyang.dm | 27 + html/changelogs/RustingWithYou - jeweler.yml | 41 ++ icons/mob/npc/jeweler_cockatoo.dmi | Bin 0 -> 3451 bytes .../exoplanets/konyang/jeweler_nest.dm | 8 + .../exoplanets/konyang/jeweler_nest.dmm | 565 ++++++++++++++++++ 7 files changed, 644 insertions(+), 1 deletion(-) create mode 100644 code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm create mode 100644 html/changelogs/RustingWithYou - jeweler.yml create mode 100644 icons/mob/npc/jeweler_cockatoo.dmi create mode 100644 maps/random_ruins/exoplanets/konyang/jeweler_nest.dm create mode 100644 maps/random_ruins/exoplanets/konyang/jeweler_nest.dmm diff --git a/aurorastation.dme b/aurorastation.dme index 4d49d2bd2ca..167e38b00a3 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -2600,6 +2600,7 @@ #include "code\modules\mob\living\simple_animal\hostile\retaliate\cavern.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\clown.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\exoplanet.dm" +#include "code\modules\mob\living\simple_animal\hostile\retaliate\konyang.dm" #include "code\modules\mob\living\simple_animal\hostile\retaliate\retaliate.dm" #include "code\modules\mob\living\simple_animal\hostile\toy\mech.dm" #include "code\modules\mob\living\simple_animal\mechanical\mechanical.dm" @@ -3682,6 +3683,7 @@ #include "maps\random_ruins\exoplanets\crashed_pod\crashed_pod.dm" #include "maps\random_ruins\exoplanets\desert\desert.dm" #include "maps\random_ruins\exoplanets\grove\grove.dm" +#include "maps\random_ruins\exoplanets\konyang\jeweler_nest.dm" #include "maps\random_ruins\exoplanets\konyang\landing_zone.dm" #include "maps\random_ruins\exoplanets\lava\lava.dm" #include "maps\random_ruins\exoplanets\raskara\pra_exploration_drone.dm" diff --git a/code/modules/maps/planet_types/lore/konyang.dm b/code/modules/maps/planet_types/lore/konyang.dm index c4f17a7a799..c015e3f7786 100644 --- a/code/modules/maps/planet_types/lore/konyang.dm +++ b/code/modules/maps/planet_types/lore/konyang.dm @@ -18,7 +18,7 @@ plant_colors = null//pre colored generated_name = FALSE ruin_planet_type = PLANET_LORE - ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/konyang_landing_zone) + ruin_type_whitelist = list(/datum/map_template/ruin/exoplanet/konyang_landing_zone, /datum/map_template/ruin/exoplanet/konyang_jeweler_nest) possible_themes = list(/datum/exoplanet_theme/konyang) place_near_main = list(1,0) diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm new file mode 100644 index 00000000000..07145a70be3 --- /dev/null +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/konyang.dm @@ -0,0 +1,27 @@ +/mob/living/simple_animal/hostile/retaliate/jewelercockatoo + name = "jeweler cockatoo" + desc = "An enormous and endangered bird native to Konyang, known for its habit of decorating its nest with pearls and gems of all sorts." + icon = 'icons/mob/npc/jeweler_cockatoo.dmi' + icon_state = "birb" + icon_living = "birb" + icon_dead = "birb_dead" + turns_per_move = 5 + speak_emote = list("squawks", "chirps") + emote_hear = list("squawks", "bawks") + emote_see = list("flutters its wings", "digs in the dirt") + a_intent = I_HURT + stop_automated_movement_when_pulled = 0 + mob_size = 12 + organ_names = list("torso", "left wing", "right wing", "head") + + maxHealth = 150 + health = 150 + + melee_damage_lower = 20 + melee_damage_upper = 30 + armor_penetration = 20 + attacktext = "clawed" + attack_sound = 'sound/weapons/slice.ogg' + + meat_amount = 8 + faction = "Konyang" diff --git a/html/changelogs/RustingWithYou - jeweler.yml b/html/changelogs/RustingWithYou - jeweler.yml new file mode 100644 index 00000000000..866537ac6a8 --- /dev/null +++ b/html/changelogs/RustingWithYou - jeweler.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the Konyang Jeweler Cockatoo and associated away site." diff --git a/icons/mob/npc/jeweler_cockatoo.dmi b/icons/mob/npc/jeweler_cockatoo.dmi new file mode 100644 index 0000000000000000000000000000000000000000..3066398bf88e12828835fa52c2a515265290d8ec GIT binary patch literal 3451 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