cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 03:26:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1717 from VOREStation/aro-smfix2

Browse Source 
Two soulcatcher tweaks
This commit is contained in:
Arokha Sieyes
2017-06-12 10:27:50 -04:00
committed by GitHub
parent e3ef835bec b62240b945
commit f1daa0bfd5
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners_vr.dm
+11 -8
View File
@@ -165,14 +165,17 @@ var/global/mob/living/carbon/human/dummy/mannequin/sleevemate_mob
to_chat(usr,"<span class='warning'>Target seems totally braindead.</span>")
return
usr.visible_message("<span class='warning'>[usr] begins downloading [target]'s mind!</span>","<span class='notice'>You begin downloading [target]'s mind!</span>")
if(do_after(usr,35 SECONDS,target)) //This is powerful, yo.
if(!stored_mind && target.mind)
stored_mind = target.mind
target.ghostize()
stored_mind.current = null
update_icon()
to_chat(usr,"<span class='notice'>Mind downloaded!</span>")
var/choice = alert(usr,"This will remove the target's mind from their body. The only way to put it back is via a resleeving pod. Continue?","Confirmation","Continue","Cancel")
if(choice == "Continue" && usr.get_active_hand() == src && usr.Adjacent(target))
usr.visible_message("<span class='warning'>[usr] begins downloading [target]'s mind!</span>","<span class='notice'>You begin downloading [target]'s mind!</span>")
if(do_after(usr,35 SECONDS,target)) //This is powerful, yo.
if(!stored_mind && target.mind)
stored_mind = target.mind
target.ghostize()
stored_mind.current = null
update_icon()
to_chat(usr,"<span class='notice'>Mind downloaded!</span>")
return
code/modules/nifsoft/software/13_soulcatcher.dm
+2 -2
View File
@@ -120,10 +120,10 @@
if("Erase Contents")
var/mob/living/carbon/brain/caught_soul/brainpick = input(nif.human,"Select a mind to delete:","Erase Mind") as null|anything in brainmobs
if(!brainpick) return
var/warning = alert(nif.human,"Are you SURE you want to erase [brainpick.name]?","Erase Mind","CANCEL","DELETE","CANCEL")
var/warning = alert(nif.human,"Are you SURE you want to erase \"[brainpick]\"?","Erase Mind","CANCEL","DELETE","CANCEL")
if(warning == "DELETE")
brainmobs -= brainpick
qdel(brainpick)
return TRUE