cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix transfer self (#8744)

Browse Source
This commit is contained in:
Kashargul
2024-08-08 09:03:07 +02:00
committed by GitHub
parent 6e27929188
commit 32d51e12eb
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modular_chomp/code/modules/vore/eating/soulcatcher.dm
View File

@@ -370,7 +370,7 @@
// Funtion to test if the owner's body has been taken over // Funtion to test if the owner's body has been taken over
/obj/soulgem/proc/is_taken_over() /obj/soulgem/proc/is_taken_over()
return (own_mind && owner.mind != own_mind) return (own_mind && owner.mind && owner.mind != own_mind)
// Transfer section to transfer captured souls // Transfer section to transfer captured souls
@@ -392,7 +392,7 @@
if(is_type_in_list(H.get_right_hand(), valid_trasfer_objects)) if(is_type_in_list(H.get_right_hand(), valid_trasfer_objects))
valid_objects += H.get_right_hand() valid_objects += H.get_right_hand()
for(var/obj/item/I in range(0, get_turf(owner))) for(var/obj/item/I in range(0, get_turf(owner)))
if(is_type_in_list(I)) if(is_type_in_list(I, valid_trasfer_objects))
valid_objects += I valid_objects += I
for(var/mob/M in range(1, get_turf(owner))) for(var/mob/M in range(1, get_turf(owner)))
if(M == owner) if(M == owner)
@@ -436,17 +436,21 @@
if(!mate.stored_mind) if(!mate.stored_mind)
to_chat(owner, span_notice("You scan yourself to transfer the soul into the [target]!")) to_chat(owner, span_notice("You scan yourself to transfer the soul into the [target]!"))
to_chat(M, span_notice("[transfer_message]")) to_chat(M, span_notice("[transfer_message]"))
if(M.mind == own_mind)
own_mind = null
mate.get_mind(M) mate.get_mind(M)
else if(istype(target, /obj/item/device/mmi)) else if(istype(target, /obj/item/device/mmi))
var/obj/item/device/mmi/mm = target var/obj/item/device/mmi/mm = target
if(!mm.brainmob) if(!mm.brainmob || !mm.brainmob.mind)
if(M.mind == own_mind)
own_mind = null
to_chat(owner, span_notice("You transfer the soul into the [target]!")) to_chat(owner, span_notice("You transfer the soul into the [target]!"))
to_chat(M, span_notice("[transfer_message]")) to_chat(M, span_notice("[transfer_message]"))
mm.transfer_identity(M) mm.transfer_identity(M)
if(!mm.brainmob.mind && M.mind)
M.mind.transfer_to(mm.brainmob)
else else
return return
if(M.mind == own_mind)
own_mind = null
brainmobs -= M brainmobs -= M
if(M == selected_soul) if(M == selected_soul)
update_selected_soul() update_selected_soul()