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

Antagonist reputation system

Browse Source
This commit is contained in:
Sirenfal
2018-03-02 14:38:26 -06:00
committed by CitadelStationBot
parent 3690cf3309
commit 44dc6ac3a0
29 changed files with 252 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/captain.dm
+6
View File
@@ -15,6 +15,7 @@ Captain
minimal_player_age = 14
exp_requirements = 180
exp_type = EXP_TYPE_CREW
antag_rep = 20
outfit = /datum/outfit/job/captain
@@ -68,7 +69,12 @@ Head of Personnel
minimal_player_age = 10
exp_requirements = 180
exp_type = EXP_TYPE_CREW
<<<<<<< HEAD
// exp_type_department = EXP_TYPE_SUPPLY - CITADEL CHANGE
=======
exp_type_department = EXP_TYPE_SUPPLY
antag_rep = 16
>>>>>>> 937ad3a... Antagonist reputation system (#35485)
outfit = /datum/outfit/job/hop
code/modules/jobs/job_types/cargo_service.dm
+7
View File
@@ -11,6 +11,7 @@ Quartermaster
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#d7b088"
antag_rep = 12
outfit = /datum/outfit/job/quartermaster
@@ -41,6 +42,7 @@ Cargo Technician
spawn_positions = 2
supervisors = "the quartermaster and the head of personnel"
selection_color = "#dcba97"
antag_rep = 4
outfit = /datum/outfit/job/cargo_tech
@@ -69,6 +71,7 @@ Shaft Miner
spawn_positions = 3
supervisors = "the quartermaster and the head of personnel"
selection_color = "#dcba97"
antag_rep = 8
outfit = /datum/outfit/job/miner
@@ -147,6 +150,7 @@ Bartender
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#bbe291"
antag_rep = 4
outfit = /datum/outfit/job/bartender
@@ -180,6 +184,7 @@ Cook
supervisors = "the head of personnel"
selection_color = "#bbe291"
var/cooks = 0 //Counts cooks amount
antag_rep = 8
outfit = /datum/outfit/job/cook
@@ -232,6 +237,7 @@ Botanist
spawn_positions = 2
supervisors = "the head of personnel"
selection_color = "#bbe291"
antag_rep = 8
outfit = /datum/outfit/job/botanist
@@ -271,6 +277,7 @@ Janitor
supervisors = "the head of personnel"
selection_color = "#bbe291"
var/global/janitors = 0
antag_rep = 8
outfit = /datum/outfit/job/janitor
code/modules/jobs/job_types/civilian.dm
+4
View File
@@ -11,6 +11,7 @@ Clown
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
antag_rep = 4
outfit = /datum/outfit/job/clown
@@ -72,6 +73,7 @@ Mime
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
antag_rep = 4
outfit = /datum/outfit/job/mime
@@ -122,6 +124,7 @@ Curator
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
antag_rep = 4
outfit = /datum/outfit/job/curator
@@ -167,6 +170,7 @@ Lawyer
supervisors = "the head of personnel"
selection_color = "#dddddd"
var/lawyers = 0 //Counts lawyer amount
antag_rep = 8
outfit = /datum/outfit/job/lawyer
code/modules/jobs/job_types/civilian_chaplain.dm
+1
View File
@@ -12,6 +12,7 @@ Chaplain
spawn_positions = 1
supervisors = "the head of personnel"
selection_color = "#dddddd"
antag_rep = 4
outfit = /datum/outfit/job/chaplain
code/modules/jobs/job_types/engineering.dm
+3
View File
@@ -17,6 +17,7 @@ Chief Engineer
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_ENGINEERING
antag_rep = 16
outfit = /datum/outfit/job/ce
@@ -76,6 +77,7 @@ Station Engineer
selection_color = "#fff5cc"
exp_requirements = 60
exp_type = EXP_TYPE_CREW
antag_rep = 8
outfit = /datum/outfit/job/engineer
@@ -132,6 +134,7 @@ Atmospheric Technician
selection_color = "#fff5cc"
exp_requirements = 60
exp_type = EXP_TYPE_CREW
antag_rep = 8
outfit = /datum/outfit/job/atmos
code/modules/jobs/job_types/job.dm
+3
View File
@@ -48,6 +48,9 @@
var/exp_type = ""
var/exp_type_department = ""
//The amount of good boy points playing this role will earn you towards a higher chance to roll antagonist next round
var/antag_rep = 0
//Only override this proc
//H is usually a human unless an /equip override transformed it
/datum/job/proc/after_spawn(mob/living/H, mob/M)
code/modules/jobs/job_types/medical.dm
+5
View File
@@ -17,6 +17,7 @@ Chief Medical Officer
exp_requirements = 180
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_MEDICAL
antag_rep = 16
outfit = /datum/outfit/job/cmo
@@ -59,6 +60,7 @@ Medical Doctor
spawn_positions = 3
supervisors = "the chief medical officer"
selection_color = "#ffeef0"
antag_rep = 8
outfit = /datum/outfit/job/doctor
@@ -96,6 +98,7 @@ Chemist
selection_color = "#ffeef0"
exp_type = EXP_TYPE_CREW
exp_requirements = 60
antag_rep = 8
outfit = /datum/outfit/job/chemist
@@ -131,6 +134,7 @@ Geneticist
selection_color = "#ffeef0"
exp_type = EXP_TYPE_CREW
exp_requirements = 60
antag_rep = 8
outfit = /datum/outfit/job/geneticist
@@ -167,6 +171,7 @@ Virologist
selection_color = "#ffeef0"
exp_type = EXP_TYPE_CREW
exp_requirements = 60
antag_rep = 8
outfit = /datum/outfit/job/virologist
code/modules/jobs/job_types/science.dm
+3
View File
@@ -17,6 +17,7 @@ Research Director
exp_type_department = EXP_TYPE_SCIENCE
exp_requirements = 180
exp_type = EXP_TYPE_CREW
antag_rep = 16
outfit = /datum/outfit/job/rd
@@ -72,6 +73,7 @@ Scientist
selection_color = "#ffeeff"
exp_requirements = 60
exp_type = EXP_TYPE_CREW
antag_rep = 8
outfit = /datum/outfit/job/scientist
@@ -106,6 +108,7 @@ Roboticist
selection_color = "#ffeeff"
exp_requirements = 60
exp_type = EXP_TYPE_CREW
antag_rep = 8
outfit = /datum/outfit/job/roboticist
code/modules/jobs/job_types/security.dm
+4
View File
@@ -23,6 +23,7 @@ Head of Security
exp_requirements = 300
exp_type = EXP_TYPE_CREW
exp_type_department = EXP_TYPE_SECURITY
antag_rep = 20
outfit = /datum/outfit/job/hos
@@ -76,6 +77,7 @@ Warden
minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
antag_rep = 16
outfit = /datum/outfit/job/warden
@@ -128,6 +130,7 @@ Detective
minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
antag_rep = 12
outfit = /datum/outfit/job/detective
@@ -178,6 +181,7 @@ Security Officer
minimal_player_age = 7
exp_requirements = 300
exp_type = EXP_TYPE_CREW
antag_rep = 12
outfit = /datum/outfit/job/security
code/modules/jobs/job_types/silicon.dm
+2 -1
View File
@@ -14,6 +14,7 @@ AI
minimal_player_age = 30
exp_requirements = 180
exp_type = EXP_TYPE_CREW
antag_rep = 12
/datum/job/ai/equip(mob/living/carbon/human/H)
return H.AIize(FALSE)
@@ -52,4 +53,4 @@ Cyborg
/datum/job/cyborg/after_spawn(mob/living/silicon/robot/R, mob/M)
if(CONFIG_GET(flag/rename_cyborg)) //name can't be set in robot/New without the client
R.rename_self("cyborg", M.client)
R.rename_self("cyborg", M.client)