From b874c9ce390ec1cc61009032b69a0072b1d20fd2 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 29 Oct 2024 00:30:39 -0700 Subject: [PATCH 1/4] changes the name of the wendigo by request --- .../simple_animal/hostile/megafauna/wendigo.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index a7db852492442..7cec0d8aeb7fe 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -7,8 +7,8 @@ Difficulty: Hard */ /mob/living/simple_animal/hostile/megafauna/wendigo - name = "wendigo" - desc = "A mythological man-eating legendary creature, the sockets of its eyes track you with an unsatiated hunger." + name = "Bambi" //DOPPLER EDIT + desc = "A local fauna with an evocative appearance. Its cervine features have earned it an evocative nickname." //DOPPLER EDIT health = 2500 maxHealth = 2500 icon_state = "wendigo" @@ -197,7 +197,7 @@ Difficulty: Hard exit.set_light(20, 1, COLOR_SOFT_RED) /obj/projectile/colossus/wendigo_shockwave - name = "wendigo shockwave" + name = "bambi shockwave" //DOPPLER EDIT speed = 2 /// If wave movement is enabled var/wave_movement = FALSE @@ -224,7 +224,7 @@ Difficulty: Hard set_angle(original_angle + pixel_moves * wave_speed) /obj/item/wendigo_blood - name = "bottle of wendigo blood" + name = "bottle of bambi blood" //DOPPLER EDIT desc = "A bottle of viscous red liquid... You're not actually going to drink this, are you?" icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "vial" @@ -242,8 +242,8 @@ Difficulty: Hard qdel(src) /obj/item/crusher_trophy/wendigo_horn - name = "wendigo horn" - desc = "A gnarled horn ripped from the skull of a wendigo. Suitable as a trophy for a kinetic crusher." + name = "bambi horn" //DOPPLER EDIT + desc = "A gnarled horn ripped from the skull of a bambi. Suitable as a trophy for a kinetic crusher." //DOPPLER EDIT icon_state = "wendigo_horn" denied_type = /obj/item/crusher_trophy/wendigo_horn @@ -261,8 +261,8 @@ Difficulty: Hard crusher.AddComponent(/datum/component/two_handed, force_wielded=20) /obj/item/wendigo_skull - name = "wendigo skull" - desc = "A bloody skull torn from a murderous beast, the soulless eye sockets seem to constantly track your movement." + name = "bambi skull" // DOPPLER EDIT + desc = "The skull of an exotic xenofauna, named for its cervine appearance." // DOPPLER EDIT icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "wendigo_skull" w_class = WEIGHT_CLASS_TINY From 097be78d9d486f97d8418e92614350f83d54a71a Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:40:11 -0700 Subject: [PATCH 2/4] Revert "changes the name of the wendigo by request" This reverts commit b874c9ce390ec1cc61009032b69a0072b1d20fd2. --- .../simple_animal/hostile/megafauna/wendigo.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm index 7cec0d8aeb7fe..a7db852492442 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/wendigo.dm @@ -7,8 +7,8 @@ Difficulty: Hard */ /mob/living/simple_animal/hostile/megafauna/wendigo - name = "Bambi" //DOPPLER EDIT - desc = "A local fauna with an evocative appearance. Its cervine features have earned it an evocative nickname." //DOPPLER EDIT + name = "wendigo" + desc = "A mythological man-eating legendary creature, the sockets of its eyes track you with an unsatiated hunger." health = 2500 maxHealth = 2500 icon_state = "wendigo" @@ -197,7 +197,7 @@ Difficulty: Hard exit.set_light(20, 1, COLOR_SOFT_RED) /obj/projectile/colossus/wendigo_shockwave - name = "bambi shockwave" //DOPPLER EDIT + name = "wendigo shockwave" speed = 2 /// If wave movement is enabled var/wave_movement = FALSE @@ -224,7 +224,7 @@ Difficulty: Hard set_angle(original_angle + pixel_moves * wave_speed) /obj/item/wendigo_blood - name = "bottle of bambi blood" //DOPPLER EDIT + name = "bottle of wendigo blood" desc = "A bottle of viscous red liquid... You're not actually going to drink this, are you?" icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "vial" @@ -242,8 +242,8 @@ Difficulty: Hard qdel(src) /obj/item/crusher_trophy/wendigo_horn - name = "bambi horn" //DOPPLER EDIT - desc = "A gnarled horn ripped from the skull of a bambi. Suitable as a trophy for a kinetic crusher." //DOPPLER EDIT + name = "wendigo horn" + desc = "A gnarled horn ripped from the skull of a wendigo. Suitable as a trophy for a kinetic crusher." icon_state = "wendigo_horn" denied_type = /obj/item/crusher_trophy/wendigo_horn @@ -261,8 +261,8 @@ Difficulty: Hard crusher.AddComponent(/datum/component/two_handed, force_wielded=20) /obj/item/wendigo_skull - name = "bambi skull" // DOPPLER EDIT - desc = "The skull of an exotic xenofauna, named for its cervine appearance." // DOPPLER EDIT + name = "wendigo skull" + desc = "A bloody skull torn from a murderous beast, the soulless eye sockets seem to constantly track your movement." icon = 'icons/obj/mining_zones/artefacts.dmi' icon_state = "wendigo_skull" w_class = WEIGHT_CLASS_TINY From 1cd132cd45ec359a2632557024e2b9709d80bc52 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Tue, 29 Oct 2024 14:48:06 -0700 Subject: [PATCH 3/4] gay sex --- .../simple_animal/megafauna/wendigo.dm | 17 +++++++++++++++++ tgstation.dme | 1 + 2 files changed, 18 insertions(+) create mode 100644 modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm diff --git a/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm b/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm new file mode 100644 index 0000000000000..50c4c05efdbbb --- /dev/null +++ b/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm @@ -0,0 +1,17 @@ +/mob/living/simple_animal/hostile/megafauna/wendigo + name = "Bambi" + desc = "A local fauna with an evocative appearance. Its cervine features have earned it an evocative nickname." + +/obj/projectile/colossus/wendigo_shockwave + name = "bambi shockwave" + +/obj/item/wendigo_blood + name = "bottle of bambi blood" + +/obj/item/crusher_trophy/wendigo_horn + name = "bambi horn" + desc = "A gnarled horn ripped from the skull of a bambi. Suitable as a trophy for a kinetic crusher." + +/obj/item/wendigo_skull + name = "bambi skull" + desc = "The skull of an exotic xenofauna, named for its cervine appearance." diff --git a/tgstation.dme b/tgstation.dme index 440850f647d56..7454293f96ffa 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6915,6 +6915,7 @@ #include "modular_doppler\modular_medical\wounds\synth\blunt\secures_internals.dm" #include "modular_doppler\modular_mob_spawn\code\mob_spawn.dm" #include "modular_doppler\modular_mobs\simple_animal\bot\secbot_permit_overwrite.dm" +#include "modular_doppler\modular_mobs\simple_animal\megafauna\wendigo.dm" #include "modular_doppler\modular_mood\code\mood_events\brushed.dm" #include "modular_doppler\modular_mood\code\mood_events\dog_wag.dm" #include "modular_doppler\modular_mood\code\mood_events\hotspring.dm" From 224d484e2d3d5cfab0af4ac670020998c17aabb1 Mon Sep 17 00:00:00 2001 From: L <105110468+kittysmooch@users.noreply.github.com> Date: Thu, 31 Oct 2024 01:07:53 -0700 Subject: [PATCH 4/4] its cooler now --- .../simple_animal/megafauna/wendigo.dm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm b/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm index 50c4c05efdbbb..4a54bdd2e1c04 100644 --- a/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm +++ b/modular_doppler/modular_mobs/simple_animal/megafauna/wendigo.dm @@ -1,17 +1,20 @@ /mob/living/simple_animal/hostile/megafauna/wendigo - name = "Bambi" - desc = "A local fauna with an evocative appearance. Its cervine features have earned it an evocative nickname." + name = "Eikþyrnir" + desc = "This wicked creature's striking appearance has earned it the name Eikþyrnir among the Hearthkin, \ + after a mythological stag that eats from Yggdrasil. They have come to associate it with death, and the passage \ + to the afterlife." /obj/projectile/colossus/wendigo_shockwave - name = "bambi shockwave" + name = "Eikþyrnir shockwave" /obj/item/wendigo_blood - name = "bottle of bambi blood" + name = "bottle of Eikþyrnir's blood" /obj/item/crusher_trophy/wendigo_horn - name = "bambi horn" - desc = "A gnarled horn ripped from the skull of a bambi. Suitable as a trophy for a kinetic crusher." + name = "Eikþyrnir's horn" + desc = "A gnarled horn ripped from the skull of Eikþyrnir. Suitable as a trophy for a kinetic crusher." /obj/item/wendigo_skull - name = "bambi skull" - desc = "The skull of an exotic xenofauna, named for its cervine appearance." + name = "Eikþyrnir's skull" + desc = "The skull of the great beast Eikþyrnir. The bare flesh of its face gives way to old edges of gnarled \ + flesh."