diff --git a/code/datums/outfits/ert/biesel.dm b/code/datums/outfits/ert/biesel.dm index 11eed6d171a..3a66b67f492 100644 --- a/code/datums/outfits/ert/biesel.dm +++ b/code/datums/outfits/ert/biesel.dm @@ -41,17 +41,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.real_name, " ") - var/surname = fullname[fullname.len] //prefix bumps it up - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) var/obj/item/organ/B = new /obj/item/organ/internal/augment/hiveshield(H) var/obj/item/organ/external/affectedB = H.get_organ(B.parent_organ) B.replaced(H, affectedB) diff --git a/code/datums/outfits/ert/izweski.dm b/code/datums/outfits/ert/izweski.dm index 73b0b41f4a8..c73625a3969 100644 --- a/code/datums/outfits/ert/izweski.dm +++ b/code/datums/outfits/ert/izweski.dm @@ -82,9 +82,6 @@ var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() /obj/outfit/admin/ert/izweski/leader diff --git a/code/datums/outfits/ert/kataphract.dm b/code/datums/outfits/ert/kataphract.dm index 062b270f617..9ac627aad92 100644 --- a/code/datums/outfits/ert/kataphract.dm +++ b/code/datums/outfits/ert/kataphract.dm @@ -68,6 +68,7 @@ var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" + H.update_body() var/uniform_colour = pick("#42b360", "#b68029", "#5574c2") if(H?.w_uniform) @@ -77,11 +78,6 @@ var/obj/item/clothing/shoes/magboots/hegemony/boots = new(H) H.equip_to_slot_if_possible(boots, slot_shoes) - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - H.update_body() - /obj/outfit/admin/ert/kataphract/specialist name = "Kataphract-Hopeful Spec." diff --git a/code/datums/outfits/ert/qukala.dm b/code/datums/outfits/ert/qukala.dm index bba04c76dd4..1f1821d9f63 100644 --- a/code/datums/outfits/ert/qukala.dm +++ b/code/datums/outfits/ert/qukala.dm @@ -45,9 +45,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) var/obj/item/organ/B = new /obj/item/organ/internal/augment/hiveshield/warfare(H) var/obj/item/organ/external/affectedB = H.get_organ(B.parent_organ) B.replaced(H, affectedB) diff --git a/code/datums/outfits/ert/vaurca.dm b/code/datums/outfits/ert/vaurca.dm index 57960628ff6..be40b9c124c 100644 --- a/code/datums/outfits/ert/vaurca.dm +++ b/code/datums/outfits/ert/vaurca.dm @@ -181,9 +181,6 @@ var/obj/item/organ/B = new /obj/item/organ/external/hand/right/vaurca/security(H) var/obj/item/organ/external/affectedB = H.get_organ(B.parent_organ) B.replaced(H, affectedB) - var/obj/item/organ/C = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/affectedC = H.get_organ(C.parent_organ) - C.replaced(H, affectedC) H.update_body() if(H?.shoes) H.shoes.color = "#0e3a11" diff --git a/code/modules/background/origins/_origins.dm b/code/modules/background/origins/_origins.dm index c5e57541752..4004d45da5a 100644 --- a/code/modules/background/origins/_origins.dm +++ b/code/modules/background/origins/_origins.dm @@ -21,15 +21,25 @@ for(var/trait in origin_traits) ADD_TRAIT(H, trait, CULTURE_TRAIT) +/singleton/origin_item/proc/on_remove(var/mob/living/carbon/human/H) + for(var/trait in origin_traits) + REMOVE_TRAIT(H, trait, CULTURE_TRAIT) + /mob/living/carbon/human/proc/set_culture(var/singleton/origin_item/OI) + var/singleton/origin_item/culture/old_culture = culture if(!istype(OI)) crash_with("Invalid culture supplied: [OI]!") culture = OI + if(old_culture && culture != old_culture) + old_culture.on_remove(src) OI.on_apply(src) /mob/living/carbon/human/proc/set_origin(var/singleton/origin_item/OI) + var/singleton/origin_item/origin/old_origin = origin if(!istype(OI)) crash_with("Invalid origin supplied: [OI]!") origin = OI + if(old_origin && origin != old_origin) + old_origin.on_remove(src) OI.on_apply(src) diff --git a/code/modules/background/origins/origins/human/coalition.dm b/code/modules/background/origins/origins/human/coalition.dm index f50dda1e22e..a82c51a821c 100644 --- a/code/modules/background/origins/origins/human/coalition.dm +++ b/code/modules/background/origins/origins/human/coalition.dm @@ -65,8 +65,14 @@ origin_traits_descriptions = list("have a small resistance to radiation", "are more sensitive to bright lights") /singleton/origin_item/origin/gadpathur/on_apply(var/mob/living/carbon/human/H) + . = ..() H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) +/singleton/origin_item/origin/gadpathur/on_remove(mob/living/carbon/human/H) + . = ..() + var/datum/component/armor/armor_component = H.GetComponent(/datum/component/armor) + armor_component.RemoveComponent() + /singleton/origin_item/origin/gadpathur_exile name = "Gadpathurian Exile" desc = "As an exile from Gadpathur you are, above all other things, a failure. A failure to meet the standards of Gadpathurian society found unworthy of defending it from the Solarian imperialists. You are a weakness that the planet and its people cannot afford to keep around, lest you compromise its defense. Stripped over everything that makes you Gadpathurian and cast aside to the Republic of Biesel or Coalition of Colonies, it is now up to you -- and you alone -- to make something of yourself despite your status as a failure. The one certainty is that your home will not take you back, no matter what you do." @@ -77,8 +83,14 @@ origin_traits_descriptions = list("have a small resistance to radiation", "are more sensitive to bright lights") /singleton/origin_item/origin/gadpathur_exile/on_apply(var/mob/living/carbon/human/H) + . = ..() H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) +/singleton/origin_item/origin/gadpathur_exile/on_remove(mob/living/carbon/human/H) + . = ..() + var/datum/component/armor/armor_component = H.GetComponent(/datum/component/armor) + armor_component.RemoveComponent() + /singleton/origin_item/origin/assunzione name = "Republic of Assunzione" desc = "One of the most remote planets colonized by humanity, the Republic of Assunzione is widely known for its lack of a functional sun - which burnt out mysteriously shortly after the planet was colonized - and its unusual native faith, Luceism. Luceism itself is an offshoot of traditional Abrahamic faiths and is centered around the worship of Ennoia, an abstract representation of light. Assunzionii society is quite insular and is centered around the planet's faith, with an overwhelming majority of the planet's residents adhering to Luceism." diff --git a/code/modules/background/origins/origins/unathi/queendom.dm b/code/modules/background/origins/origins/unathi/queendom.dm index 48e4541ae23..0ebf2260c92 100644 --- a/code/modules/background/origins/origins/unathi/queendom.dm +++ b/code/modules/background/origins/origins/unathi/queendom.dm @@ -13,5 +13,11 @@ possible_religions = list(RELIGION_THAKH, RELIGION_SKAKH, RELIGION_SIAKH, RELIGION_OTHER, RELIGION_NONE) origin_traits_descriptions = list("have a small resistance to radiation") //they live in the wasteland -/singleton/origin_item/origin/wastelander/on_apply(var/mob/living/carbon/human/H) +/singleton/origin_item/origin/queendom/on_apply(var/mob/living/carbon/human/H) + . = ..() H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + +/singleton/origin_item/origin/queendom/on_remove(mob/living/carbon/human/H) + . = ..() + var/datum/component/armor/armor_component = H.GetComponent(/datum/component/armor) + armor_component.RemoveComponent() diff --git a/code/modules/background/origins/origins/unathi/traditionalist.dm b/code/modules/background/origins/origins/unathi/traditionalist.dm index 88bef0904a0..672314502c0 100644 --- a/code/modules/background/origins/origins/unathi/traditionalist.dm +++ b/code/modules/background/origins/origins/unathi/traditionalist.dm @@ -63,4 +63,10 @@ origin_traits_descriptions = list("have a small resistance to radiation") /singleton/origin_item/origin/wastelander/on_apply(var/mob/living/carbon/human/H) + . = ..() H.AddComponent(/datum/component/armor, list(rad = ARMOR_RAD_MINOR)) + +/singleton/origin_item/origin/wastelander/on_remove(mob/living/carbon/human/H) + . = ..() + var/datum/component/armor/armor_component = H.GetComponent(/datum/component/armor) + armor_component.RemoveComponent() diff --git a/code/modules/background/origins/origins/vaurca/breeder/cthur.dm b/code/modules/background/origins/origins/vaurca/breeder/cthur.dm index 1c8f17b7158..c1af2aabdd0 100644 --- a/code/modules/background/origins/origins/vaurca/breeder/cthur.dm +++ b/code/modules/background/origins/origins/vaurca/breeder/cthur.dm @@ -6,6 +6,20 @@ /singleton/origin_item/origin/mouv_b, /singleton/origin_item/origin/vytel_b ) + origin_traits_descriptions = list("can speak Nral'malic") + +/singleton/origin_item/culture/cthur_breeder/on_apply(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) + var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) + A.replaced(H, affected) + +/singleton/origin_item/culture/cthur_breeder/on_remove(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/internal/augment/language/cthur/A = locate() in H.internal_organs + if(istype(A)) + A.removed(H) + qdel(A) /singleton/origin_item/origin/cthur_b name = "C'thur Brood" diff --git a/code/modules/background/origins/origins/vaurca/breeder/klax.dm b/code/modules/background/origins/origins/vaurca/breeder/klax.dm index 676dc662bff..5463d57d679 100644 --- a/code/modules/background/origins/origins/vaurca/breeder/klax.dm +++ b/code/modules/background/origins/origins/vaurca/breeder/klax.dm @@ -1,12 +1,26 @@ /singleton/origin_item/culture/klax_breeder name = "K'lax Hive" - desc = "The new High Queen of the K'lax, the Zkaii Brood is often mocked for their eccentric Mother Dream religion. Many still remain within Tret and other Izweski territories." + desc = "Known as 'The Deceivers', it was the second Hive discovered by humanity after their Hiveship, Klo'zxera, appeared in the Unathi system of Uueoa-Esa. K'lax is known as a client state of the Zo'ra, but since the Exodus from Sedantis they have struggled for political independence. Now parting their own ways, both Hives have developed differently. " possible_origins = list( /singleton/origin_item/origin/zkaii_b, /singleton/origin_item/origin/leto_b, /singleton/origin_item/origin/vedhra_b, /singleton/origin_item/origin/tupii_b ) + origin_traits_descriptions = list("can speak Sinta'Unathi") + +/singleton/origin_item/culture/klax_breeder/on_apply(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) + var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) + A.replaced(H, affected) + +/singleton/origin_item/culture/klax_breeder/on_remove(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/internal/augment/language/klax/A = locate() in H.internal_organs + if(istype(A)) + A.removed(H) + qdel(A) /singleton/origin_item/origin/zkaii_b name = "Zkaii Brood" diff --git a/code/modules/background/origins/origins/vaurca/cthur.dm b/code/modules/background/origins/origins/vaurca/cthur.dm index eaf6224ae75..83bf01af57b 100644 --- a/code/modules/background/origins/origins/vaurca/cthur.dm +++ b/code/modules/background/origins/origins/vaurca/cthur.dm @@ -8,6 +8,20 @@ /singleton/origin_item/origin/xetl, /singleton/origin_item/origin/klatxatl ) + origin_traits_descriptions = list("can speak Nral'malic") + +/singleton/origin_item/culture/cthur/on_apply(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) + var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) + A.replaced(H, affected) + +/singleton/origin_item/culture/cthur/on_remove(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/internal/augment/language/cthur/A = locate() in H.internal_organs + if(istype(A)) + A.removed(H) + qdel(A) /singleton/origin_item/origin/cthur name = "C'thur Brood" diff --git a/code/modules/background/origins/origins/vaurca/klax.dm b/code/modules/background/origins/origins/vaurca/klax.dm index bb389b6afae..6042d119e22 100644 --- a/code/modules/background/origins/origins/vaurca/klax.dm +++ b/code/modules/background/origins/origins/vaurca/klax.dm @@ -10,6 +10,20 @@ /singleton/origin_item/origin/mikuetz, /singleton/origin_item/origin/queenless_klax ) + origin_traits_descriptions = list("can speak Sinta'Unathi") + +/singleton/origin_item/culture/klax/on_apply(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) + var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) + A.replaced(H, affected) + +/singleton/origin_item/culture/klax/on_remove(mob/living/carbon/human/H) + . = ..() + var/obj/item/organ/internal/augment/language/klax/A = locate() in H.internal_organs + if(istype(A)) + A.removed(H) + qdel(A) /singleton/origin_item/origin/zkaii name = "Zkaii Brood" diff --git a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm index 7d2de95713d..af0c4db4665 100644 --- a/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm +++ b/code/modules/client/preference_setup/loadout/items/xeno/vaurca.dm @@ -177,22 +177,6 @@ sort_category = "Xenowear - Vaurca" flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION | GEAR_HAS_ACCENT_COLOR_SELECTION -/datum/gear/augment/language_processor - display_name = "language processor" - description = "An augment that allows a vaurca to speak and understand a related language. These are only used by their respective Hives." - path = /obj/item/organ/internal/augment/language/klax - cost = 1 - sort_category = "Xenowear - Vaurca" - whitelisted = list(SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK) - flags = GEAR_NO_SELECTION - -/datum/gear/augment/language_processor/New() - ..() - var/list/language_processors = list() - language_processors["K'laxan [LANGUAGE_UNATHI] language processor"] = /obj/item/organ/internal/augment/language/klax - language_processors["C'thur [LANGUAGE_SKRELLIAN] language processor"] = /obj/item/organ/internal/augment/language/cthur - gear_tweaks += new /datum/gear_tweak/path(language_processors) - /datum/gear/augment/auxiliary_processor display_name = "secondary language processor" description = "An augment that allows a vaurca to speak and understand a related language. These are only used by their respective groups, and act as an auxiliary to the hive's main language processor." diff --git a/code/modules/mob/living/carbon/human/species/species.dm b/code/modules/mob/living/carbon/human/species/species.dm index 34784181083..adee8cc9bf6 100644 --- a/code/modules/mob/living/carbon/human/species/species.dm +++ b/code/modules/mob/living/carbon/human/species/species.dm @@ -396,6 +396,10 @@ if(H.bad_external_organs) H.bad_external_organs.Cut() if(H.bad_internal_organs) H.bad_internal_organs.Cut() + var/datum/component/armor/armor_component = H.GetComponent(/datum/component/armor) + if(armor_component) + armor_component.RemoveComponent() + H.organs = list() H.internal_organs = list() H.organs_by_name = list() diff --git a/code/modules/organs/subtypes/augment.dm b/code/modules/organs/subtypes/augment.dm index 1bceecd87e2..19f42951e2a 100644 --- a/code/modules/organs/subtypes/augment.dm +++ b/code/modules/organs/subtypes/augment.dm @@ -477,22 +477,27 @@ /obj/item/organ/internal/augment/language/klax name = "K'laxan language processor" augment_languages = list(LANGUAGE_UNATHI) + species_restricted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) /obj/item/organ/internal/augment/language/cthur name = "C'thur language processor" augment_languages = list(LANGUAGE_SKRELLIAN) + species_restricted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) /obj/item/organ/internal/augment/language/mikuetz name = "Mi'kuetz language processor" augment_languages = list(LANGUAGE_AZAZIBA) + species_restricted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) /obj/item/organ/internal/augment/language/zino name = "Zino language processor" augment_languages = list(LANGUAGE_GUTTER) + species_restricted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) /obj/item/organ/internal/augment/language/eridani name = "Eridani language processor" augment_languages = list(LANGUAGE_TRADEBAND) + species_restricted = list(SPECIES_VAURCA_BREEDER, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_WARFORM, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_WORKER) /obj/item/organ/internal/augment/language/zeng name = "Zeng-Hu Nral'malic language processor" diff --git a/html/changelogs/RustingWithYou - theorigin.yml b/html/changelogs/RustingWithYou - theorigin.yml new file mode 100644 index 00000000000..1b342237792 --- /dev/null +++ b/html/changelogs/RustingWithYou - theorigin.yml @@ -0,0 +1,42 @@ +################################ +# 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: + - bugfix: "Origin traits and species natural armor will now remove themselves on origin change." + - rscadd: "Vaurca language processors are now applied as origin traits rather than loadout items." diff --git a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm index b9dd2448668..67cba2170a8 100644 --- a/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm +++ b/maps/away/away_site/pirate_base/pirate_base_ghostroles.dm @@ -60,16 +60,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/surname = splittext(H.name, " ") - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) diff --git a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm index 0b0bfc59ad1..b1d1db980c7 100644 --- a/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm +++ b/maps/away/ships/biesel/tcaf_corvette/tcaf_corvette_ghostroles.dm @@ -43,17 +43,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.real_name, " ") - var/surname = fullname[fullname.len] //prefix bumps it up - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) diff --git a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm index 0d3793bd4cd..7fec638cb49 100644 --- a/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm +++ b/maps/away/ships/biesel/tcfl_patrol/tcfl_peacekeeper_ship_ghostroles.dm @@ -50,6 +50,7 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) + H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) if(isipc(H)) diff --git a/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm b/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm index 902bf0d4579..a7ee20a5573 100644 --- a/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm +++ b/maps/away/ships/freebooter/freebooter_ship_ghostroles.dm @@ -45,17 +45,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.name, " ") - var/surname = fullname[fullname.len] - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) diff --git a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm index cae875d8075..e708599e303 100644 --- a/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm +++ b/maps/away/ships/hegemony/hegemony_corvette/hegemony_ghostroles.dm @@ -107,11 +107,7 @@ var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" - - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - H.update_body() + H.update_body() /obj/outfit/admin/izweski/captain name = "Hegemony Navy Captain" diff --git a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm index fe9313d4ca5..15cdbdd83d6 100644 --- a/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm +++ b/maps/away/ships/heph/cyclops/cyclops_ghostroles.dm @@ -49,10 +49,6 @@ var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" - H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isipc(H)) var/obj/item/organ/internal/ipc_tag/tag = H.internal_organs_by_name[BP_IPCTAG] diff --git a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm index 9c805593d3d..af5868bad05 100644 --- a/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm +++ b/maps/away/ships/heph/heph_security/heph_security_ghostroles.dm @@ -46,10 +46,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - H.update_body() if(H?.wear_suit) H.wear_suit.color = pick("#4f3911", "#292826") if(isipc(H)) diff --git a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm index afa2e9e88bf..ddf13aa34b0 100644 --- a/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm +++ b/maps/away/ships/iac/iac_rescue_ship_ghostroles.dm @@ -48,17 +48,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.name, " ") - var/surname = fullname[fullname.len] - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) diff --git a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm index e5cc805eddb..8835c7a4900 100644 --- a/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm +++ b/maps/away/ships/kataphracts/kataphract_ship_ghostroles.dm @@ -113,18 +113,13 @@ var/obj/item/organ/internal/vaurca/preserve/preserve = H.internal_organs_by_name[BP_PHORON_RESERVE] H.internal = preserve H.internals.icon_state = "internal1" - + H.update_body() var/uniform_colour = pick("#1f8c3c", "#ab7318", "#1846ba") if(H?.w_uniform) H.w_uniform.color = uniform_colour if(H?.shoes) H.shoes.color = uniform_colour - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - H.update_body() - /obj/outfit/admin/kataphract/knight name = "Kataphract Knight" diff --git a/maps/away/ships/orion/orion_express_ship_ghostroles.dm b/maps/away/ships/orion/orion_express_ship_ghostroles.dm index 63d0092a7d5..5f89d124087 100644 --- a/maps/away/ships/orion/orion_express_ship_ghostroles.dm +++ b/maps/away/ships/orion/orion_express_ship_ghostroles.dm @@ -47,17 +47,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.name, " ") - var/surname = fullname[fullname.len] - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack) diff --git a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm index e86be010e88..d211f66d9cf 100644 --- a/maps/away/ships/scc/scc_scout_ship_ghostroles.dm +++ b/maps/away/ships/scc/scc_scout_ship_ghostroles.dm @@ -175,17 +175,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/inhaler/phoron_special, slot_in_backpack) - var/list/fullname = splittext(H.name, " ") - var/surname = fullname[fullname.len] - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/clothing/accessory/offworlder/bracer, slot_in_backpack) diff --git a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm index 9cc51035fa5..b2e418758db 100644 --- a/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm +++ b/maps/away/ships/tramp_freighter/tramp_freighter_ghostroles.dm @@ -45,17 +45,6 @@ H.internal = preserve H.internals.icon_state = "internal1" H.equip_or_collect(new /obj/item/reagent_containers/food/snacks/koisbar, slot_in_backpack) - var/list/fullname = splittext(H.name, " ") - var/surname = fullname[fullname.len] - switch(surname) - if("K'lax") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/klax(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) - if("C'thur") - var/obj/item/organ/A = new /obj/item/organ/internal/augment/language/cthur(H) - var/obj/item/organ/external/affected = H.get_organ(A.parent_organ) - A.replaced(H, affected) H.update_body() if(isoffworlder(H)) H.equip_or_collect(new /obj/item/storage/pill_bottle/rmt, slot_in_backpack)