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 00000000000..3066398bf88
Binary files /dev/null and b/icons/mob/npc/jeweler_cockatoo.dmi differ
diff --git a/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm
new file mode 100644
index 00000000000..f5e991fd905
--- /dev/null
+++ b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dm
@@ -0,0 +1,8 @@
+/datum/map_template/ruin/exoplanet/konyang_jeweler_nest
+	name = "Jeweler Cockatoo Nest"
+	id = "konyang_jeweler_nest"
+	description = "The well-decorated nest of the rare Konyang Jeweler Cockatoo."
+
+	template_flags = TEMPLATE_FLAG_NO_RUINS|TEMPLATE_FLAG_RUIN_STARTS_DISALLOWED
+	sectors = list(SECTOR_HANEUNIM)
+	suffixes = list("konyang/jeweler_nest.dmm")
diff --git a/maps/random_ruins/exoplanets/konyang/jeweler_nest.dmm b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dmm
new file mode 100644
index 00000000000..ac6b4dbd48c
--- /dev/null
+++ b/maps/random_ruins/exoplanets/konyang/jeweler_nest.dmm
@@ -0,0 +1,565 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/simulated/floor/exoplanet/konyang,
+/area/exoplanet/grass/konyang)
+"c" = (
+/obj/structure/flora/rock/konyang/small,
+/turf/simulated/floor/exoplanet/konyang,
+/area/exoplanet/grass/konyang)
+"g" = (
+/obj/item/ore/silver,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"h" = (
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
+/area/exoplanet/grass/konyang)
+"i" = (
+/obj/structure/flora/rock/konyang/small,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"l" = (
+/mob/living/simple_animal/hostile/retaliate/jewelercockatoo,
+/obj/structure/flora/rock/konyang,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"q" = (
+/obj/structure/flora/tree/konyang/spring,
+/turf/simulated/floor/exoplanet/konyang,
+/area/exoplanet/grass/konyang)
+"v" = (
+/obj/item/ore/osmium,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"D" = (
+/obj/structure/flora/ausbushes/ppflowers,
+/turf/simulated/floor/exoplanet/konyang,
+/area/exoplanet/grass/konyang)
+"E" = (
+/obj/structure/pit,
+/obj/item/ore/osmium,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"G" = (
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"L" = (
+/obj/structure/flora/bush/konyang_reeds,
+/turf/simulated/floor/exoplanet/konyang,
+/area/exoplanet/grass/konyang)
+"M" = (
+/obj/item/ore/gold,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"O" = (
+/obj/item/clothing/accessory/necklace/chain,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"P" = (
+/obj/item/ore/diamond,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"T" = (
+/obj/structure/pit,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"U" = (
+/obj/item/stack/material/diamond,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+"W" = (
+/obj/structure/flora/bush/konyang_reeds/water,
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
+/area/exoplanet/grass/konyang)
+"X" = (
+/obj/structure/flora/rock/konyang/water,
+/turf/simulated/floor/exoplanet/water/shallow/konyang,
+/area/exoplanet/grass/konyang)
+"Y" = (
+/obj/item/ore/gold,
+/obj/item/ore/osmium,
+/turf/simulated/floor/exoplanet/dirt_konyang,
+/area/exoplanet/grass/konyang)
+
+(1,1,1) = {"
+a
+a
+a
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+L
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+h
+a
+h
+h
+h
+h
+a
+a
+L
+a
+a
+a
+a
+L
+L
+L
+L
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+h
+W
+h
+W
+h
+h
+h
+L
+L
+D
+D
+D
+a
+a
+a
+L
+L
+L
+a
+a
+"}
+(4,1,1) = {"
+a
+h
+h
+h
+X
+h
+h
+h
+L
+a
+a
+a
+a
+D
+a
+a
+a
+a
+a
+q
+a
+"}
+(5,1,1) = {"
+a
+a
+W
+h
+h
+h
+h
+a
+a
+a
+a
+a
+a
+a
+a
+a
+D
+a
+a
+a
+a
+"}
+(6,1,1) = {"
+a
+h
+h
+h
+W
+a
+a
+a
+a
+a
+G
+G
+M
+G
+a
+a
+a
+L
+a
+a
+a
+"}
+(7,1,1) = {"
+a
+h
+h
+h
+h
+D
+a
+a
+G
+i
+G
+M
+v
+G
+a
+a
+a
+L
+L
+a
+a
+"}
+(8,1,1) = {"
+L
+L
+h
+a
+a
+a
+a
+M
+M
+g
+U
+G
+P
+g
+a
+a
+a
+a
+L
+L
+a
+"}
+(9,1,1) = {"
+a
+L
+a
+a
+a
+a
+a
+G
+v
+G
+M
+E
+U
+i
+G
+a
+a
+a
+a
+L
+a
+"}
+(10,1,1) = {"
+a
+a
+a
+a
+a
+G
+U
+i
+T
+G
+G
+G
+M
+G
+T
+a
+a
+a
+a
+a
+a
+"}
+(11,1,1) = {"
+a
+a
+D
+a
+a
+G
+G
+g
+M
+G
+O
+G
+G
+P
+G
+G
+a
+a
+a
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+a
+a
+a
+G
+M
+P
+T
+G
+l
+G
+G
+M
+G
+G
+a
+a
+a
+c
+a
+"}
+(13,1,1) = {"
+a
+a
+L
+a
+a
+i
+G
+U
+G
+G
+G
+M
+G
+G
+i
+G
+a
+a
+a
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+L
+a
+a
+G
+M
+P
+M
+G
+G
+G
+G
+U
+G
+a
+a
+a
+a
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+L
+L
+a
+a
+G
+T
+v
+G
+Y
+v
+g
+G
+a
+a
+a
+a
+a
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+L
+L
+a
+a
+a
+G
+G
+M
+G
+P
+T
+G
+a
+a
+D
+a
+a
+L
+L
+"}
+(17,1,1) = {"
+a
+a
+a
+L
+c
+a
+a
+G
+G
+i
+G
+G
+G
+a
+a
+a
+a
+a
+a
+L
+a
+"}
+(18,1,1) = {"
+a
+q
+a
+L
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+L
+L
+a
+"}
+(19,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+D
+a
+a
+a
+a
+a
+L
+L
+a
+a
+L
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+D
+a
+a
+a
+a
+a
+a
+a
+c
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+D
+a
+a
+a
+a
+a
+a
+a
+"}