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

[MIRROR] Fix runtime in shade transformation when done via russian revolver (#835)

Browse Source 
* Fix runtime in shade transformation when done via russian revolver (#53739)

/obj/item/gun/ballistic/revolver/russian/proc/shoot_self starts a transfer_soul chain with a null user, because it's the target who inflicted it on themselves. There is no user.

Later on in when we init the shade, we attempt to copy the "master"/user's language to the shade too.

No user, classic runtime.

Moving the user language transfer behind a conditional check addresses this oversight.

* Fix runtime in shade transformation when done via russian revolver

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
This commit is contained in:
SkyratBot
2020-09-17 02:06:24 +01:00
committed by GitHub
co-authored by Timberpoes
parent ca60139d3f
commit 1dd319d56a
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/antagonists/wizard/equipment/soulstone.dm
+2 -1
View File
@@ -310,7 +310,8 @@
S.real_name = "Shade of [T.real_name]"
S.key = shade_controller.key
S.copy_languages(T, LANGUAGE_MIND)//Copies the old mobs languages into the new mob holder.
S.copy_languages(user, LANGUAGE_MASTER)
if(user)
S.copy_languages(user, LANGUAGE_MASTER)
S.update_atom_languages()
grant_all_languages(FALSE, FALSE, TRUE) //Grants omnitongue
if(user)