shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sorry travis

Browse Source
This commit is contained in:
timothyteakettle
2020-09-03 23:07:19 +01:00
parent fc0e8e31fc
commit cdaef63fa1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/ticker.dm
+1 -1
View File
@@ -396,7 +396,7 @@ SUBSYSTEM_DEF(ticker)
SSjob.EquipRank(N, player.mind.assigned_role, 0) SSjob.EquipRank(N, player.mind.assigned_role, 0)
if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character)) if(CONFIG_GET(flag/roundstart_traits) && ishuman(N.new_character))
SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N) SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
N.client.prefs.post_copy_to(player, initial_spawn = TRUE) N.client.prefs.post_copy_to(player)
CHECK_TICK CHECK_TICK
if(captainless) if(captainless)
for(var/mob/dead/new_player/N in GLOB.player_list) for(var/mob/dead/new_player/N in GLOB.player_list)
code/modules/mob/dead/new_player/new_player.dm
+2 -2
View File
@@ -415,7 +415,7 @@
if(GLOB.curse_of_madness_triggered) if(GLOB.curse_of_madness_triggered)
give_madness(humanc, GLOB.curse_of_madness_triggered) give_madness(humanc, GLOB.curse_of_madness_triggered)
if(humanc.client) if(humanc.client)
humanc.client.prefs.post_copy_to(humanc, initial_spawn = TRUE) humanc.client.prefs.post_copy_to(humanc)
GLOB.joined_player_list += character.ckey GLOB.joined_player_list += character.ckey
GLOB.latejoiners += character GLOB.latejoiners += character
@@ -569,7 +569,7 @@
client.prefs.scars_list["[cur_scar_index]"] = valid_scars client.prefs.scars_list["[cur_scar_index]"] = valid_scars
client.prefs.save_character() client.prefs.save_character()
client.prefs.copy_to(H) client.prefs.copy_to(H, initial_spawn = TRUE)
H.dna.update_dna_identity() H.dna.update_dna_identity()
if(mind) if(mind)
if(transfer_after) if(transfer_after)