cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-26 17:41:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Job refactor 2: less hardcoded lists (#7410)

Browse Source 
* Job refactor 2: less hardcoded lists

* CRITICAL DEP 1

* CRITCAL DEP 2

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

* Update nanotrasen_admiral.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-08-06 02:42:53 +02:00
committed by GitHub
parent 5fcedca6e5
commit 91070a797c
82 changed files with 852 additions and 664 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/events/pirates.dm
View File

@@ -483,7 +483,7 @@
return 0
else if("pirate" in H.faction) //can't ransom your fellow pirates to CentCom!
return 0
else if(H.mind.assigned_role.title in GLOB.command_positions)
else if(H.mind.assigned_role.departments_bitflags & DEPARTMENT_BITFLAG_COMMAND)
return 3000
else
return 1000

26
code/modules/events/wizard/departmentrevolt.dm
View File

@@ -56,25 +56,37 @@
switch(department)
if("Uprising of Assistants") //God help you
jobs_to_revolt = list("Assistant")
jobs_to_revolt += "Assistant"
nation_name = pick("Assa", "Mainte", "Tunnel", "Gris", "Grey", "Liath", "Grigio", "Ass", "Assi")
if("Medical")
jobs_to_revolt = GLOB.medical_positions
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/medical)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Mede", "Healtha", "Recova", "Chemi", "Viro", "Psych")
if("Engineering")
jobs_to_revolt = GLOB.engineering_positions
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/engineering)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Atomo", "Engino", "Power", "Teleco")
if("Science")
jobs_to_revolt = GLOB.science_positions
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/science)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Sci", "Griffa", "Geneti", "Explosi", "Mecha", "Xeno", "Nani", "Cyto")
if("Supply")
jobs_to_revolt = GLOB.supply_positions
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/cargo)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Cargo", "Guna", "Suppli", "Mule", "Crate", "Ore", "Mini", "Shaf")
if("Service") //the few, the proud, the technically aligned
jobs_to_revolt = GLOB.service_positions.Copy() - list("Assistant", "Prisoner")
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/service)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Honka", "Boozo", "Fatu", "Danka", "Mimi", "Libra", "Jani", "Religi")
if("Security")
jobs_to_revolt = GLOB.security_positions
var/datum/job_department/job_department = SSjob.get_department_type(/datum/job_department/security)
for(var/datum/job/job as anything in job_department.department_jobs)
jobs_to_revolt += job.title
nation_name = pick("Securi", "Beepski", "Shitcuri", "Red", "Stunba", "Flashbango", "Flasha", "Stanfordi")
nation_name += pick("stan", "topia", "land", "nia", "ca", "tova", "dor", "ador", "tia", "sia", "ano", "tica", "tide", "cis", "marea", "co", "taoide", "slavia", "stotzka")