cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Quirk preferences fixes

Browse Source
This commit is contained in:
yogstation13-bot
2019-06-30 04:04:55 +01:00
parent b11912d463
commit 1dd38835ad
3 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/controllers/subsystem/processing/quirks.dm
View File

@@ -30,10 +30,22 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
quirk_points[initial(T.name)] = initial(T.value)
/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects)
<<<<<<< HEAD
if(!checkquirks(user,cli)) return// Yogs -- part of Adding Mood as Preference
=======
var/badquirk = FALSE
>>>>>>> d8b023774e... Quirk preferences fixes (#44823)
for(var/V in cli.prefs.all_quirks)
var/datum/quirk/Q = quirks[V]
if(Q)
user.add_quirk(Q, spawn_effects)
else
stack_trace("Invalid quirk \"[V]\" in client [cli.ckey] preferences")
<<<<<<< HEAD
stack_trace("Invalid quirk \"[V]\" in client [cli.ckey] preferences")
=======
stack_trace("Invalid quirk \"[V]\" in client [cli.ckey] preferences")
cli.prefs.all_quirks -= V
badquirk = TRUE
if(badquirk)
cli.prefs.save_character()
>>>>>>> d8b023774e... Quirk preferences fixes (#44823)