From a57bda822bad8404bc24636af211c7703337c23e Mon Sep 17 00:00:00 2001 From: deathride58 Date: Sun, 3 Jun 2018 22:19:13 -0400 Subject: [PATCH] Update game_options.dm --- .../configuration/entries/game_options.dm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/code/controllers/configuration/entries/game_options.dm b/code/controllers/configuration/entries/game_options.dm index 8ac0941b11..ebf27324b9 100644 --- a/code/controllers/configuration/entries/game_options.dm +++ b/code/controllers/configuration/entries/game_options.dm @@ -288,7 +288,11 @@ /datum/config_entry/flag/shift_time_realtime -<<<<<<< HEAD +/datum/config_entry/keyed_number_list/antag_rep + +/datum/config_entry/number/monkeycap + config_entry_value = 64 + min_val = 0 //Cit changes - Adds config options for crew objectives and miscreants /datum/config_entry/flag/allow_crew_objectives @@ -306,10 +310,3 @@ /datum/config_entry/number/nightshift_finish config_entry_value = 6 //End of Cit changes -======= -/datum/config_entry/keyed_number_list/antag_rep - -/datum/config_entry/number/monkeycap - config_entry_value = 64 - min_val = 0 ->>>>>>> d060e4e... Antag reputation rewards are now configurable (#38077)