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 being sent back to lobby not allowing changing quirks

Browse Source
This commit is contained in:
Joe Schmoe
2019-05-19 17:55:12 +02:00
parent faa2226b9b
commit 1c4e9262ff
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,8 +31,12 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
/datum/controller/subsystem/processing/quirks/proc/AssignQuirks(mob/living/user, client/cli, spawn_effects)
for(var/V in cli.prefs.all_quirks)
<<<<<<< HEAD
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")
=======
user.add_quirk(V, spawn_effects)
>>>>>>> 687f3c97c3... Fix being sent back to lobby not allowing changing quirks (#43319)