shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] I'm a dumb idiot and forgot to change the antag_rep values (#6000)

Browse Source 
* I'm a dumb idiot and forgot to change the antag_rep values

* merge conflict
This commit is contained in:
CitadelStationBot
2018-03-19 21:25:01 -05:00
committed by Poojawa
parent 3d26cd4a6f
commit 980d69dde3
11 changed files with 37 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/assistant.dm
+1
View File
@@ -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()
code/modules/jobs/job_types/captain.dm
+2 -2
View File
@@ -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
code/modules/jobs/job_types/cargo_service.dm
+7 -7
View File
@@ -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
code/modules/jobs/job_types/civilian.dm
+4 -4
View File
@@ -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
code/modules/jobs/job_types/civilian_chaplain.dm
+1 -1
View File
@@ -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
code/modules/jobs/job_types/engineering.dm
+3 -3
View File
@@ -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
code/modules/jobs/job_types/medical.dm
+5 -5
View File
@@ -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
code/modules/jobs/job_types/science.dm
+3 -3
View File
@@ -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
code/modules/jobs/job_types/security.dm
+3 -3
View File
@@ -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
code/modules/jobs/job_types/silicon.dm
+1 -1
View File
@@ -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)