From 9da34705219ad084a20126eba336b8e99cef2a93 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 29 Sep 2017 23:44:08 -0500 Subject: [PATCH] Update preferences_savefile.dm --- code/modules/client/preferences_savefile.dm | 5 ----- 1 file changed, 5 deletions(-) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index e2612ebf4b..d58d1cec77 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -328,17 +328,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car S["feature_lizard_spines"] >> features["spines"] S["feature_lizard_body_markings"] >> features["body_markings"] S["feature_lizard_legs"] >> features["legs"] -<<<<<<< HEAD - S["feature_human_tail"] >> features["tail_human"] - S["feature_human_ears"] >> features["ears"] -======= if(!CONFIG_GET(flag/join_with_mutant_humans)) features["tail_human"] = "none" features["ears"] = "none" else S["feature_human_tail"] >> features["tail_human"] S["feature_human_ears"] >> features["ears"] ->>>>>>> 4178c20... Configuration datum refactor (#30763) S["clown_name"] >> custom_names["clown"] S["mime_name"] >> custom_names["mime"] S["ai_name"] >> custom_names["ai"]