From b8fbf82b9abc8507836358a4f32281ff6f1e0d7f Mon Sep 17 00:00:00 2001 From: Lucy Date: Sat, 13 Jul 2024 10:28:35 -0400 Subject: [PATCH] Changing species no longer deletes your skillchips --- .../modules/mob/living/carbon/human/_species.dm | 17 +++++++++++++++++ .../modules/mob/living/carbon/human/species.dm | 3 --- tgstation.dme | 2 +- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 monkestation/code/modules/mob/living/carbon/human/_species.dm delete mode 100644 monkestation/code/modules/mob/living/carbon/human/species.dm diff --git a/monkestation/code/modules/mob/living/carbon/human/_species.dm b/monkestation/code/modules/mob/living/carbon/human/_species.dm new file mode 100644 index 00000000000000..82102e3ae40d70 --- /dev/null +++ b/monkestation/code/modules/mob/living/carbon/human/_species.dm @@ -0,0 +1,17 @@ +/// Returns the species's laugh sound. +/datum/species/proc/get_laugh_sound(mob/living/carbon/human/human) + return + +/datum/species/regenerate_organs(mob/living/carbon/organ_holder, datum/species/old_species, replace_current = TRUE, list/excluded_zones, visual_only = FALSE) + var/list/skillchips = organ_holder.clone_skillchip_list() + organ_holder.destroy_all_skillchips(silent = TRUE) + . = ..() + for(var/chip in skillchips) + var/chip_type = chip["type"] + if(!ispath(chip_type, /obj/item/skillchip)) + continue + var/obj/item/skillchip/skillchip = new chip_type(organ_holder) + if(organ_holder.implant_skillchip(skillchip, force = TRUE)) + qdel(skillchip) + continue + skillchip.set_metadata(chip) diff --git a/monkestation/code/modules/mob/living/carbon/human/species.dm b/monkestation/code/modules/mob/living/carbon/human/species.dm deleted file mode 100644 index 00963a6e287ffa..00000000000000 --- a/monkestation/code/modules/mob/living/carbon/human/species.dm +++ /dev/null @@ -1,3 +0,0 @@ -/// Returns the species's laugh sound. -/datum/species/proc/get_laugh_sound(mob/living/carbon/human/human) - return diff --git a/tgstation.dme b/tgstation.dme index b744e421fb4b97..f480f03f94d7a6 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -6947,6 +6947,7 @@ #include "monkestation\code\modules\mob\living\carbon\carbon_defines.dm" #include "monkestation\code\modules\mob\living\carbon\carbon_update_icons.dm" #include "monkestation\code\modules\mob\living\carbon\emote.dm" +#include "monkestation\code\modules\mob\living\carbon\human\_species.dm" #include "monkestation\code\modules\mob\living\carbon\human\accessory_helpers.dm" #include "monkestation\code\modules\mob\living\carbon\human\carbon.dm" #include "monkestation\code\modules\mob\living\carbon\human\custom_bodytype.dm" @@ -6956,7 +6957,6 @@ #include "monkestation\code\modules\mob\living\carbon\human\human_defines.dm" #include "monkestation\code\modules\mob\living\carbon\human\lizard_gags.dm" #include "monkestation\code\modules\mob\living\carbon\human\simian_gags.dm" -#include "monkestation\code\modules\mob\living\carbon\human\species.dm" #include "monkestation\code\modules\mob\living\carbon\human\worn_overlays.dm" #include "monkestation\code\modules\mob\living\carbon\human\monkey\dukeman.dm" #include "monkestation\code\modules\mob\living\carbon\human\species_type\abductors.dm"