cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/tgstation into misc_span_fixes1

Browse Source 
# Conflicts:
#	code/game/objects/items/devices/PDA/PDA.dm
#	code/modules/mob/dead/new_player/new_player.dm
This commit is contained in:
kingofkosmos
2019-10-13 15:21:17 +03:00
parent 259626a8b4 9cb9f8158f
commit 228b4282ca
78 changed files with 634 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/brain_damage/split_personality.dm
+6
View File
@@ -23,7 +23,13 @@
/datum/brain_trauma/severe/split_personality/proc/make_backseats()
stranger_backseat = new(owner, src)
var/obj/effect/proc_holder/spell/targeted/personality_commune/stranger_spell = new(src)
stranger_backseat.AddSpell(stranger_spell)
owner_backseat = new(owner, src)
var/obj/effect/proc_holder/spell/targeted/personality_commune/owner_spell = new(src)
owner_backseat.AddSpell(owner_spell)
/datum/brain_trauma/severe/split_personality/proc/get_ghost()
set waitfor = FALSE