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

fix

Browse Source
This commit is contained in:
kevinz000
2019-07-14 03:53:15 -07:00
parent 30a006e42f
commit 570fa0cd3b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/processing/quirks.dm
+2 -2
View File
@@ -25,7 +25,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
quirk_points[initial(T.name)] = initial(T.value) quirk_points[initial(T.name)] = initial(T.value)
quirk_names_by_path[T] = initial(T.name) quirk_names_by_path[T] = initial(T.name)
/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects, roundstart = FALSE, datum/job/job, silent = FALSE) /datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects, roundstart = FALSE, datum/job/job, silent = FALSE, mob/to_chat_target)
GenerateQuirks(cli) GenerateQuirks(cli)
var/list/quirks = cli.prefs.character_quirks.Copy() var/list/quirks = cli.prefs.character_quirks.Copy()
var/list/cut var/list/cut
@@ -34,7 +34,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
for(var/V in quirks) for(var/V in quirks)
user.add_quirk(V, spawn_effects) user.add_quirk(V, spawn_effects)
if(!silent) if(!silent)
to_chat(user, "<span class='boldwarning'>The following quirks were cut during assignment either due to a job restriction or another reason: [english_list(cut)].</span>") to_chat(to_chat_target || user, "<span class='boldwarning'>The following quirks were cut during assignment either due to a job restriction or another reason: [english_list(cut)].</span>")
/datum/controller/subsystem/processing/quirks/proc/quirk_path_by_name(name) /datum/controller/subsystem/processing/quirks/proc/quirk_path_by_name(name)
return quirks[name] return quirks[name]
code/controllers/subsystem/ticker.dm
+1 -1
View File
@@ -374,7 +374,7 @@ SUBSYSTEM_DEF(ticker)
if(player.mind.assigned_role != player.mind.special_role) if(player.mind.assigned_role != player.mind.special_role)
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) SSquirks.AssignQuirks(N.new_character, N.client, TRUE, TRUE, SSjob.GetJob(player.mind.assigned_role), FALSE, N)
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)