cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 11:07:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implants, implanted items and other bodypart contents no longer get deleted on species change (#28540)

Browse Source 
* transfers implants, cavity implants and bodypart contents when changing species.

* Dropping cyber implants on the ground instead
This commit is contained in:
Migratingcocofruit
2025-04-16 17:27:33 +00:00
committed by GitHub
parent 3680765fa1
commit cd1db6e7f4
2 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/_species.dm
+51 -1
View File
@@ -214,8 +214,41 @@
* Arguments:
* * H: The human to create organs inside of
* * bodyparts_to_omit: Any bodyparts in this list (and organs within them) should not be added.
* * transfer_contents: Whether or not to transfer the contents of the old organs to the new ones
*/
/datum/species/proc/create_organs(mob/living/carbon/human/H, list/bodyparts_to_omit) //Handles creation of mob organs.
/datum/species/proc/create_organs(mob/living/carbon/human/H, list/bodyparts_to_omit, transfer_contents = TRUE) //Handles creation of mob organs.
var/list/transfer_list = list()
for(var/limb_name in has_limbs)
var/obj/item/organ/external/body_part = H.bodyparts_by_name[limb_name]
if(!body_part)
continue
// Always expel all cyber implants
for(var/obj/item/organ/internal/cyberimp/internal_organ in body_part.internal_organs)
internal_organ.remove(H)
internal_organ.forceMove(get_turf(H))
// If we don't transfer the content or make a new organ in place of the old one, drop the contents on the ground
if(!transfer_contents || (bodyparts_to_omit && (limb_name in bodyparts_to_omit)))
// Drop cavity implant
if(body_part.hidden)
body_part.hidden.forceMove(get_turf(H))
body_part.hidden = null // null ref so it doesn't get deleted with the bodypart
// Drop general contents of bodypart
for(var/atom/movable/thing in body_part.contents)
thing.forceMove(get_turf(H))
body_part.contents = list() // empty ref list so the contents don't get deleted with the bodypart
else
// Transfer cavity implant
transfer_list += list("[limb_name]" = list("hidden" = null, "contents" = list()))
if(body_part.hidden)
transfer_list[limb_name]["hidden"] = body_part.hidden
body_part.hidden = null // null ref so it doesn't get deleted with the bodypart
// Transfer contents
if(length(body_part.contents))
transfer_list[limb_name]["contents"] = body_part.contents
body_part.contents = list() // empty ref list so the contents don't get deleted with the bodypart
QDEL_LIST_CONTENTS(H.internal_organs)
QDEL_LIST_CONTENTS(H.bodyparts)
@@ -231,6 +264,23 @@
var/limb_path = organ_data["path"]
var/obj/item/organ/O = new limb_path(H)
organ_data["descriptor"] = O.name
// Transfer things from the old organ to the new
if(istype(O, /obj/item/organ/external) && transfer_list[limb_name])
var/obj/item/organ/external/external_organ = O
external_organ.hidden = transfer_list[limb_name]["hidden"]
external_organ.contents = transfer_list[limb_name]["contents"]
transfer_list -= transfer_list[limb_name]
// Anything we still didn't transfer for whatever reason we drop on the ground
for(var/list/remaining in transfer_list)
if(remaining["hidden"])
var/atom/movable/thing = remaining["hidden"]
thing.forceMove(get_turf(H))
if(length(remaining["contents"]))
for(var/atom/movable/thing in remaining["contents"])
thing.forceMove(get_turf(H))
for(var/index in has_organ)
var/obj/item/organ/internal/organ_path = has_organ[index]