diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 50ad92d44b..c8f5fa6911 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -323,18 +323,18 @@ for(var/datum/mind/mind in candidates) p_ckey = ckey(mind.key) p_rep = SSpersistence.antag_rep[p_ckey] - p_rep = p_rep == null ? 0 : p_rep - if(current <= antag_select) - var/subtract = min(p_rep + DEFAULT_ANTAG_TICKETS, MAX_TICKETS_PER_ROLL) - DEFAULT_ANTAG_TICKETS - SSpersistence.antag_rep_change[p_ckey] = -subtract + var/previous = current + var/spend = min(p_rep + DEFAULT_ANTAG_TICKETS, MAX_TICKETS_PER_ROLL) + current += spend -// WARNING("AR_DEBUG: Player [mind.key] won spending [subtract] tickets from starting value [SSpersistence.antag_rep[p_ckey]]") + if(antag_select >= previous && antag_select <= (current-1)) + SSpersistence.antag_rep_change[p_ckey] = -(spend - DEFAULT_ANTAG_TICKETS) + +// WARNING("AR_DEBUG: Player [mind.key] won spending [spend] tickets from starting value [SSpersistence.antag_rep[p_ckey]]") return mind - current += min(p_rep + DEFAULT_ANTAG_TICKETS, MAX_TICKETS_PER_ROLL) - WARNING("Something has gone terribly wrong. /datum/game_mode/proc/antag_pick failed to select a candidate. Falling back to pick()") return pick(candidates) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 26d57d1e76..a18fe78906 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -13,6 +13,7 @@ Assistant access = list() //See /datum/job/assistant/get_access() minimal_access = list() //See /datum/job/assistant/get_access() outfit = /datum/outfit/job/assistant + antag_rep = 10 /datum/job/assistant/get_access() diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 906bd570b4..78219629d3 100755 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -69,8 +69,8 @@ Head of Personnel minimal_player_age = 10 exp_requirements = 180 exp_type = EXP_TYPE_CREW -// exp_type_department = EXP_TYPE_SUPPLY - CITADEL CHANGE - antag_rep = 16 +//exp_type_department = EXP_TYPE_SUPPLY - CITADEL CHANGE + antag_rep = 20 outfit = /datum/outfit/job/hop diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 6b4c09900f..a2c6fd62e5 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -11,7 +11,7 @@ Quartermaster spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#d7b088" - antag_rep = 12 + antag_rep = 17 outfit = /datum/outfit/job/quartermaster @@ -42,7 +42,7 @@ Cargo Technician spawn_positions = 2 supervisors = "the quartermaster and the head of personnel" selection_color = "#dcba97" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/cargo_tech @@ -71,7 +71,7 @@ Shaft Miner spawn_positions = 3 supervisors = "the quartermaster and the head of personnel" selection_color = "#dcba97" - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/miner @@ -150,7 +150,7 @@ Bartender spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/bartender @@ -184,7 +184,7 @@ Cook supervisors = "the head of personnel" selection_color = "#bbe291" var/cooks = 0 //Counts cooks amount - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/cook @@ -237,7 +237,7 @@ Botanist spawn_positions = 2 supervisors = "the head of personnel" selection_color = "#bbe291" - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/botanist @@ -277,7 +277,7 @@ Janitor supervisors = "the head of personnel" selection_color = "#bbe291" var/global/janitors = 0 - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/janitor diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm index a10c15e53f..8ba243459f 100644 --- a/code/modules/jobs/job_types/civilian.dm +++ b/code/modules/jobs/job_types/civilian.dm @@ -11,7 +11,7 @@ Clown spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/clown @@ -73,7 +73,7 @@ Mime spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/mime @@ -124,7 +124,7 @@ Curator spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/curator @@ -170,7 +170,7 @@ Lawyer supervisors = "the head of personnel" selection_color = "#dddddd" var/lawyers = 0 //Counts lawyer amount - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/lawyer diff --git a/code/modules/jobs/job_types/civilian_chaplain.dm b/code/modules/jobs/job_types/civilian_chaplain.dm index 00685454b0..5e56fe5b4f 100644 --- a/code/modules/jobs/job_types/civilian_chaplain.dm +++ b/code/modules/jobs/job_types/civilian_chaplain.dm @@ -12,7 +12,7 @@ Chaplain spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#dddddd" - antag_rep = 4 + antag_rep = 14 outfit = /datum/outfit/job/chaplain diff --git a/code/modules/jobs/job_types/engineering.dm b/code/modules/jobs/job_types/engineering.dm index e48d04a68c..82a6fe1382 100644 --- a/code/modules/jobs/job_types/engineering.dm +++ b/code/modules/jobs/job_types/engineering.dm @@ -17,7 +17,7 @@ Chief Engineer exp_requirements = 180 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_ENGINEERING - antag_rep = 16 + antag_rep = 20 outfit = /datum/outfit/job/ce @@ -77,7 +77,7 @@ Station Engineer selection_color = "#fff5cc" exp_requirements = 60 exp_type = EXP_TYPE_CREW - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/engineer @@ -134,7 +134,7 @@ Atmospheric Technician selection_color = "#fff5cc" exp_requirements = 60 exp_type = EXP_TYPE_CREW - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/atmos diff --git a/code/modules/jobs/job_types/medical.dm b/code/modules/jobs/job_types/medical.dm index f1af65fe0a..4997b3a7f3 100644 --- a/code/modules/jobs/job_types/medical.dm +++ b/code/modules/jobs/job_types/medical.dm @@ -17,7 +17,7 @@ Chief Medical Officer exp_requirements = 180 exp_type = EXP_TYPE_CREW exp_type_department = EXP_TYPE_MEDICAL - antag_rep = 16 + antag_rep = 20 outfit = /datum/outfit/job/cmo @@ -60,7 +60,7 @@ Medical Doctor spawn_positions = 3 supervisors = "the chief medical officer" selection_color = "#ffeef0" - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/doctor @@ -98,7 +98,7 @@ Chemist selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/chemist @@ -134,7 +134,7 @@ Geneticist selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/geneticist @@ -171,7 +171,7 @@ Virologist selection_color = "#ffeef0" exp_type = EXP_TYPE_CREW exp_requirements = 60 - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/virologist diff --git a/code/modules/jobs/job_types/science.dm b/code/modules/jobs/job_types/science.dm index 4fb1347208..0d5da1eec1 100644 --- a/code/modules/jobs/job_types/science.dm +++ b/code/modules/jobs/job_types/science.dm @@ -17,7 +17,7 @@ Research Director exp_type_department = EXP_TYPE_SCIENCE exp_requirements = 180 exp_type = EXP_TYPE_CREW - antag_rep = 16 + antag_rep = 20 outfit = /datum/outfit/job/rd @@ -73,7 +73,7 @@ Scientist selection_color = "#ffeeff" exp_requirements = 60 exp_type = EXP_TYPE_CREW - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/scientist @@ -108,7 +108,7 @@ Roboticist selection_color = "#ffeeff" exp_requirements = 60 exp_type = EXP_TYPE_CREW - antag_rep = 8 + antag_rep = 17 outfit = /datum/outfit/job/roboticist diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index 11144ccd2f..3cfd5ef73d 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -77,7 +77,7 @@ Warden minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - antag_rep = 16 + antag_rep = 20 outfit = /datum/outfit/job/warden @@ -130,7 +130,7 @@ Detective minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - antag_rep = 12 + antag_rep = 20 outfit = /datum/outfit/job/detective @@ -181,7 +181,7 @@ Security Officer minimal_player_age = 7 exp_requirements = 300 exp_type = EXP_TYPE_CREW - antag_rep = 12 + antag_rep = 20 outfit = /datum/outfit/job/security diff --git a/code/modules/jobs/job_types/silicon.dm b/code/modules/jobs/job_types/silicon.dm index 0860c08113..89a44f8c1b 100644 --- a/code/modules/jobs/job_types/silicon.dm +++ b/code/modules/jobs/job_types/silicon.dm @@ -14,7 +14,7 @@ AI minimal_player_age = 30 exp_requirements = 180 exp_type = EXP_TYPE_CREW - antag_rep = 12 + antag_rep = 20 /datum/job/ai/equip(mob/living/carbon/human/H) return H.AIize(FALSE)