cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge master

Browse Source
This commit is contained in:
Waterpig
2024-08-08 19:59:08 +02:00
parent 1cc783195b cabfa2e689
commit 9da38495b6
339 changed files with 4633 additions and 2168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/bitrunning/components/avatar_connection.dm
+8 -1
View File
@@ -20,7 +20,7 @@
help_text,
)
if(!isliving(parent) || !isliving(old_body) || !server.is_operational || !pod.is_operational)
if(!isliving(parent) || !isliving(old_body) || !old_mind || !server.is_operational || !pod.is_operational)
return COMPONENT_INCOMPATIBLE
var/mob/living/avatar = parent
@@ -67,6 +67,9 @@
if(alias && avatar.real_name != alias)
avatar.fully_replace_character_name(avatar.real_name, alias)
for(var/skill_type in old_mind.known_skills)
avatar.mind.set_experience(skill_type, old_mind.get_skill_exp(skill_type), silent = TRUE)
avatar.playsound_local(avatar, 'sound/magic/blink.ogg', 25, TRUE)
avatar.set_static_vision(2 SECONDS)
avatar.set_temp_blindness(1 SECONDS) // I'm in
@@ -282,6 +285,10 @@
if(isnull(old_mind) || isnull(old_body))
return
for(var/skill_type in avatar.mind.known_skills)
old_mind.set_experience(skill_type, avatar.mind.get_skill_exp(skill_type), silent = TRUE)
avatar.mind.set_experience(skill_type, 0, silent = TRUE)
ghost.mind = old_mind
if(old_body.stat != DEAD)
old_mind.transfer_to(old_body, force_key_move = TRUE)