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

fix

Browse Source
This commit is contained in:
Ling
2019-07-21 22:13:24 +02:00
parent 348a45a870
commit b1fce9ad6e
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,22 +30,17 @@ 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
<<<<<<< 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)