cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Soul catcher sanity (#8685)

Browse Source
This commit is contained in:
Kashargul
2024-07-22 20:59:49 +02:00
committed by GitHub
parent 0438d08e12
commit c13ebbe60b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -156,6 +156,7 @@
own_mind = brainmob.mind own_mind = brainmob.mind
remove_verb(brainmob, /mob/proc/enter_soulcatcher) //No recursive self capturing... remove_verb(brainmob, /mob/proc/enter_soulcatcher) //No recursive self capturing...
add_verb(brainmob, /mob/living/carbon/brain/caught_soul/vore/proc/transfer_self) add_verb(brainmob, /mob/living/carbon/brain/caught_soul/vore/proc/transfer_self)
add_verb(brainmob, /mob/living/carbon/brain/caught_soul/vore/proc/reenter_body)
//If they have these values, apply them //If they have these values, apply them
if(isliving(M)) if(isliving(M))
@@ -331,7 +332,7 @@
to_chat(CS, span_notice("[transit_message]") + "\n[inside_flavor]") to_chat(CS, span_notice("[transit_message]") + "\n[inside_flavor]")
/obj/soulgem/proc/return_to_body(var/datum/mind) /obj/soulgem/proc/return_to_body(var/datum/mind)
if(!own_mind == mind) if(own_mind != mind)
to_chat(src, span_warning("You aren't in your own soulcatcher!")) to_chat(src, span_warning("You aren't in your own soulcatcher!"))
return return
var/mob/self = null var/mob/self = null

4
modular_chomp/code/modules/vore/eating/soulcatcher_mob.dm
View File

@@ -162,7 +162,7 @@
if(eyeobj) if(eyeobj)
to_chat(src, span_warning("You can't do that while AR projecting!")) to_chat(src, span_warning("You can't do that while AR projecting!"))
return return
if(!gem.own_mind == mind) if(gem.own_mind != mind)
to_chat(src, span_warning("You aren't in your own soulcatcher!")) to_chat(src, span_warning("You aren't in your own soulcatcher!"))
return return
@@ -172,7 +172,7 @@
var/obj/item/target = tgui_input_list(src, "Select where you want to store your own mind into.", "Mind Transfer Target", valid_objects) var/obj/item/target = tgui_input_list(src, "Select where you want to store your own mind into.", "Mind Transfer Target", valid_objects)
gem.transfer_mob(src, target) gem.transfer_mob(src, target)
/mob/living/carbon/brain/caught_soul/vore/verb/reenter_body() /mob/living/carbon/brain/caught_soul/vore/proc/reenter_body()
set name = "Re-enter Body" set name = "Re-enter Body"
set desc = "Return to your body after self capturing." set desc = "Return to your body after self capturing."
set category = "Soulcatcher" set category = "Soulcatcher"