From 69a01d84ebe04f14b246166b5552dba7a66b1f52 Mon Sep 17 00:00:00 2001 From: Casey Date: Fri, 28 Jan 2022 17:19:51 -0500 Subject: [PATCH 1/3] Makes vulpkanin ingame lore match our actual lore --- code/modules/catalogue/catalogue_data_vr.dm | 8 ++++++++ .../mob/living/carbon/human/species/station/station_vr.dm | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm index 349a48c048..474b6ec8a5 100644 --- a/code/modules/catalogue/catalogue_data_vr.dm +++ b/code/modules/catalogue/catalogue_data_vr.dm @@ -58,11 +58,19 @@ /datum/category_item/catalogue/fauna/vulpkanin name = "Sapients - Vulpkanin" +<<<<<<< HEAD desc = "The vulpkanin are the remnants of an ancient precursor race, residing on a planet called \ “Altam”. Vulpkanin diverged from the precursors due to heavy isolation after the fall, \ presumably due to being a freshly found colony. A lack of material support regressed their technology \ to pre-industrial standards until being found again by humanity. At this point \ they have formed an early spacefaring society and smoothly entered the galacic stage. \ +======= + desc = "The Vulpkanin are the remnants of an ancient precursor which resided in the Coreward Periphery \ + 3000 to 4000 years ago, residing on a planet called “Altam”. Vulpkanin diverged from the precursors due \ + to heavy isolation after the fall, presumably due to being a freshly found colony. A lack of material support \ + regressed their technology to pre-industrial standards, from which they had to recover from in long and hard years. At the point \ + of discovery by human explorers, they have formed an early interplanetary society and accession into the Diaspora went over relatively smoothly. \ +>>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore Vulpkanin are the closest successor to the precursors, genetically, although genelocked devices still do not \ recognize them due to genetic drift." //CHOMpedit value = CATALOGUER_REWARD_TRIVIAL diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 3438f8b0c9..7b194e500c 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -226,6 +226,10 @@ /datum/species/vulpkanin name = SPECIES_VULPKANIN name_plural = "Vulpkanin" + blurb = "Vulpkanin are a species of sapient canine bipeds, who are the descendants of a lost colony during the waning days of a Precursor species, \ + from which their distant cousins, the Zorren, also originate from. Independent and iconoclast, they have abandoned the ideals of their forefathers \ + largely and prefer to look outwards as explorers and scientists to forge their own identity. They speak a guttural language known as 'Canilunzt' \ + which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." icobase = 'icons/mob/human_races/r_vulpkanin.dmi' deform = 'icons/mob/human_races/r_vulpkanin.dmi' // path = /mob/living/carbon/human/vulpkanin @@ -243,6 +247,7 @@ inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/carbon/human/proc/tie_hair) +<<<<<<< HEAD male_scream_sound = null //CHOMPedit female_scream_sound = null //CHOMPedit @@ -254,6 +259,9 @@ //CHOMPStation Removal // wikilink="https://www.yawn.ocry.com/Vulpkanin" +======= + wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin" +>>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore catalogue_data = list(/datum/category_item/catalogue/fauna/vulpkanin) From 822c00975ee7f24001fe8c651cec2ea9743be209 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 29 Jan 2022 17:12:17 -0500 Subject: [PATCH 2/3] powder that makes you say yes --- code/modules/catalogue/catalogue_data_vr.dm | 8 -------- 1 file changed, 8 deletions(-) diff --git a/code/modules/catalogue/catalogue_data_vr.dm b/code/modules/catalogue/catalogue_data_vr.dm index 474b6ec8a5..349a48c048 100644 --- a/code/modules/catalogue/catalogue_data_vr.dm +++ b/code/modules/catalogue/catalogue_data_vr.dm @@ -58,19 +58,11 @@ /datum/category_item/catalogue/fauna/vulpkanin name = "Sapients - Vulpkanin" -<<<<<<< HEAD desc = "The vulpkanin are the remnants of an ancient precursor race, residing on a planet called \ “Altam”. Vulpkanin diverged from the precursors due to heavy isolation after the fall, \ presumably due to being a freshly found colony. A lack of material support regressed their technology \ to pre-industrial standards until being found again by humanity. At this point \ they have formed an early spacefaring society and smoothly entered the galacic stage. \ -======= - desc = "The Vulpkanin are the remnants of an ancient precursor which resided in the Coreward Periphery \ - 3000 to 4000 years ago, residing on a planet called “Altam”. Vulpkanin diverged from the precursors due \ - to heavy isolation after the fall, presumably due to being a freshly found colony. A lack of material support \ - regressed their technology to pre-industrial standards, from which they had to recover from in long and hard years. At the point \ - of discovery by human explorers, they have formed an early interplanetary society and accession into the Diaspora went over relatively smoothly. \ ->>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore Vulpkanin are the closest successor to the precursors, genetically, although genelocked devices still do not \ recognize them due to genetic drift." //CHOMpedit value = CATALOGUER_REWARD_TRIVIAL From 8d547c7de56a17f5a365ebc5dfae3d1af502d789 Mon Sep 17 00:00:00 2001 From: Nadyr <41974248+Darlantanis@users.noreply.github.com> Date: Sat, 29 Jan 2022 17:16:03 -0500 Subject: [PATCH 3/3] powder that makes you say yes --- .../human/species/station/station_vr.dm | 21 ++++++------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 7b194e500c..7299469b1f 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -226,10 +226,11 @@ /datum/species/vulpkanin name = SPECIES_VULPKANIN name_plural = "Vulpkanin" - blurb = "Vulpkanin are a species of sapient canine bipeds, who are the descendants of a lost colony during the waning days of a Precursor species, \ - from which their distant cousins, the Zorren, also originate from. Independent and iconoclast, they have abandoned the ideals of their forefathers \ - largely and prefer to look outwards as explorers and scientists to forge their own identity. They speak a guttural language known as 'Canilunzt' \ - which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." + blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ + dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ + culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \ + to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ + which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." //CHOMPedit icobase = 'icons/mob/human_races/r_vulpkanin.dmi' deform = 'icons/mob/human_races/r_vulpkanin.dmi' // path = /mob/living/carbon/human/vulpkanin @@ -247,21 +248,11 @@ inherent_verbs = list(/mob/living/carbon/human/proc/lick_wounds, /mob/living/carbon/human/proc/tie_hair) -<<<<<<< HEAD male_scream_sound = null //CHOMPedit female_scream_sound = null //CHOMPedit - blurb = "Vulpkanin are a species of sharp-witted canine-pideds residing on the planet Altam just barely within the \ - dual-star Vazzend system. Their politically de-centralized society and independent natures have led them to become a species and \ - culture both feared and respected for their scientific breakthroughs. Discovery, loyalty, and utilitarianism dominates their lifestyles \ - to the degree it can cause conflict with more rigorous and strict authorities. They speak a guttural language known as 'Canilunzt' \ - which has a heavy emphasis on utilizing tail positioning and ear twitches to communicate intent." - //CHOMPStation Removal -// wikilink="https://www.yawn.ocry.com/Vulpkanin" -======= - wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin" ->>>>>>> f2a301858a2... Merge pull request #12100 from Heroman3003/vulplore +// wikilink="https://wiki.vore-station.net/Backstory#Vulpkanin" catalogue_data = list(/datum/category_item/catalogue/fauna/vulpkanin)