mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Merge remote-tracking branch 'remotes/git-svn' r4920 into bs12_with_tgport
Conflicts: baystation12.dme code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/cult/runes.dm code/game/gamemodes/events.dm code/game/machinery/computer/HolodeckControl.dm code/game/objects/items/devices/radio/radio.dm code/modules/admin/admin_verbs.dm code/modules/awaymissions/zlevel.dm code/modules/client/client procs.dm code/modules/mob/living/say.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/mob_cleanup.dm code/modules/paperwork/paperbin.dm html/changelog.html icons/turf/areas.dmi maps/RandomZLevels/assistantChamber.dmm maps/RandomZLevels/fileList.txt Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
@@ -78,6 +78,9 @@
|
||||
else
|
||||
return
|
||||
|
||||
for (var/obj/effect/proc_holder/spell/S in M.spell_list)
|
||||
new_mob.spell_list += new S.type
|
||||
|
||||
new_mob.a_intent = "hurt"
|
||||
if(M.mind)
|
||||
M.mind.transfer_to(new_mob)
|
||||
|
||||
Reference in New Issue
Block a user