cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-21 13:05:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Makes the plasmaman outfit designation use the job rather than a very long list (#4250)

Browse Source 
* Makes the plasmaman outfit designation use the job rather than a very long list (#57758)

* Deletes the very-long outfit switch

* Small change, mechanically does nothing

Changes behavior a bit as per request, worked fine on my end

* Makes the plasmaman outfit designation use the job rather than a very long list

Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-19 22:21:13 +01:00
committed by GitHub
parent 02e5260efd
commit 67351e9cd5
35 changed files with 39 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/jobs/job_types/_job.dm
+3
View File
@@ -43,6 +43,9 @@
var/outfit = null
/// The job's outfit that will be assigned for plasmamen.
var/plasmaman_outfit = null
var/exp_requirements = 0
var/exp_type = ""
code/modules/jobs/job_types/assistant.dm
+1
View File
@@ -9,6 +9,7 @@ Assistant
supervisors = "absolutely everyone"
selection_color = "#dddddd"
outfit = /datum/outfit/job/assistant
plasmaman_outfit = /datum/outfit/plasmaman
antag_rep = 7
paycheck = PAYCHECK_ASSISTANT // Get a job. Job reassignment changes your paycheck now. Get over it.
departments = DEPARTMENT_SERVICE
code/modules/jobs/job_types/atmospheric_technician.dm
+1
View File
@@ -10,6 +10,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/atmos
plasmaman_outfit = /datum/outfit/plasmaman/atmospherics
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_ENG
code/modules/jobs/job_types/bartender.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/bartender
plasmaman_outfit = /datum/outfit/plasmaman/bar
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/botanist.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/botanist
plasmaman_outfit = /datum/outfit/plasmaman/botany
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/captain.dm
+1
View File
@@ -14,6 +14,7 @@
exp_type_department = EXP_TYPE_COMMAND
outfit = /datum/outfit/job/captain
plasmaman_outfit = /datum/outfit/plasmaman/captain
paycheck = PAYCHECK_COMMAND
paycheck_department = ACCOUNT_SEC
code/modules/jobs/job_types/cargo_technician.dm
+1
View File
@@ -10,6 +10,7 @@
selection_color = "#dcba97"
outfit = /datum/outfit/job/cargo_tech
plasmaman_outfit = /datum/outfit/plasmaman/cargo
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_CAR
code/modules/jobs/job_types/chaplain.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/chaplain
plasmaman_outfit = /datum/outfit/plasmaman/chaplain
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/chemist.dm
+1
View File
@@ -10,6 +10,7 @@
exp_requirements = 60
outfit = /datum/outfit/job/chemist
plasmaman_outfit = /datum/outfit/plasmaman/chemist
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
code/modules/jobs/job_types/chief_engineer.dm
+1
View File
@@ -15,6 +15,7 @@
exp_type_department = EXP_TYPE_ENGINEERING
outfit = /datum/outfit/job/ce
plasmaman_outfit = /datum/outfit/plasmaman/chief_engineer
departments = DEPARTMENT_ENGINEERING | DEPARTMENT_COMMAND
paycheck = PAYCHECK_COMMAND
code/modules/jobs/job_types/chief_medical_officer.dm
+1
View File
@@ -15,6 +15,7 @@
exp_type_department = EXP_TYPE_MEDICAL
outfit = /datum/outfit/job/cmo
plasmaman_outfit = /datum/outfit/plasmaman/chief_medical_officer
departments = DEPARTMENT_MEDICAL | DEPARTMENT_COMMAND
paycheck = PAYCHECK_COMMAND
code/modules/jobs/job_types/clown.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/clown
plasmaman_outfit = /datum/outfit/plasmaman/clown
paycheck = PAYCHECK_MINIMAL
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/cook.dm
+1
View File
@@ -11,6 +11,7 @@
var/list/kitchen_areas = list(/area/service/kitchen)
outfit = /datum/outfit/job/cook
plasmaman_outfit = /datum/outfit/plasmaman/chef
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/curator.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/curator
plasmaman_outfit = /datum/outfit/plasmaman/curator
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/detective.dm
+1
View File
@@ -12,6 +12,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/detective
plasmaman_outfit = /datum/outfit/plasmaman/detective
departments = DEPARTMENT_SECURITY
paycheck = PAYCHECK_MEDIUM
code/modules/jobs/job_types/geneticist.dm
+1
View File
@@ -10,6 +10,7 @@
exp_requirements = 60
outfit = /datum/outfit/job/geneticist
plasmaman_outfit = /datum/outfit/plasmaman/genetics
departments = DEPARTMENT_MEDICAL
paycheck = PAYCHECK_MEDIUM
code/modules/jobs/job_types/head_of_personnel.dm
+1
View File
@@ -16,6 +16,7 @@
exp_type_department = EXP_TYPE_SERVICE
outfit = /datum/outfit/job/hop
plasmaman_outfit = /datum/outfit/plasmaman/head_of_personnel
departments = DEPARTMENT_COMMAND | DEPARTMENT_SERVICE
paycheck = PAYCHECK_COMMAND
code/modules/jobs/job_types/head_of_security.dm
+1
View File
@@ -15,6 +15,7 @@
exp_type_department = EXP_TYPE_SECURITY
outfit = /datum/outfit/job/hos
plasmaman_outfit = /datum/outfit/plasmaman/head_of_security
departments = DEPARTMENT_SECURITY | DEPARTMENT_COMMAND
mind_traits = list(TRAIT_DONUT_LOVER)
code/modules/jobs/job_types/janitor.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/janitor
plasmaman_outfit = /datum/outfit/plasmaman/janitor
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/lawyer.dm
+1
View File
@@ -9,6 +9,7 @@
var/lawyers = 0 //Counts lawyer amount
outfit = /datum/outfit/job/lawyer
plasmaman_outfit = /datum/outfit/plasmaman/bar
paycheck = PAYCHECK_EASY
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/medical_doctor.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#ffeef0"
outfit = /datum/outfit/job/doctor
plasmaman_outfit = /datum/outfit/plasmaman/medical
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
code/modules/jobs/job_types/mime.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/mime
plasmaman_outfit = /datum/outfit/plasmaman/mime
paycheck = PAYCHECK_MINIMAL
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/paramedic.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#ffeef0"
outfit = /datum/outfit/job/paramedic
plasmaman_outfit = /datum/outfit/plasmaman/paramedic
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
code/modules/jobs/job_types/prisoner.dm
+2
View File
@@ -7,7 +7,9 @@
supervisors = "the security team"
selection_color = "#ffe1c3"
paycheck = PAYCHECK_PRISONER
outfit = /datum/outfit/job/prisoner
plasmaman_outfit = /datum/outfit/plasmaman/prisoner
display_order = JOB_DISPLAY_ORDER_PRISONER
code/modules/jobs/job_types/psychologist.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#bbe291"
outfit = /datum/outfit/job/psychologist
plasmaman_outfit = /datum/outfit/plasmaman/psychologist
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_SRV
code/modules/jobs/job_types/quartermaster.dm
+1
View File
@@ -11,6 +11,7 @@
exp_type_department = EXP_TYPE_SUPPLY // This is so the jobs menu can work properly
outfit = /datum/outfit/job/quartermaster
plasmaman_outfit = /datum/outfit/plasmaman/cargo
paycheck = PAYCHECK_COMMAND //SKYRAT EDIT CHANGE - ORIGINAL: PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_CAR
code/modules/jobs/job_types/research_director.dm
+1
View File
@@ -15,6 +15,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/rd
plasmaman_outfit = /datum/outfit/plasmaman/research_director
departments = DEPARTMENT_SCIENCE | DEPARTMENT_COMMAND
paycheck = PAYCHECK_COMMAND
code/modules/jobs/job_types/roboticist.dm
+1
View File
@@ -11,6 +11,7 @@
bounty_types = CIV_JOB_ROBO
outfit = /datum/outfit/job/roboticist
plasmaman_outfit = /datum/outfit/plasmaman/robotics
departments = DEPARTMENT_SCIENCE
paycheck = PAYCHECK_MEDIUM
code/modules/jobs/job_types/scientist.dm
+1
View File
@@ -10,6 +10,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/scientist
plasmaman_outfit = /datum/outfit/plasmaman/science
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_SCI
code/modules/jobs/job_types/security_officer.dm
+1
View File
@@ -12,6 +12,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/security
plasmaman_outfit = /datum/outfit/plasmaman/security
paycheck = PAYCHECK_HARD
paycheck_department = ACCOUNT_SEC
code/modules/jobs/job_types/shaft_miner.dm
+1
View File
@@ -8,6 +8,7 @@
selection_color = "#dcba97"
outfit = /datum/outfit/job/miner
plasmaman_outfit = /datum/outfit/plasmaman/mining
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_CAR
code/modules/jobs/job_types/station_engineer.dm
+1
View File
@@ -10,6 +10,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/engineer
plasmaman_outfit = /datum/outfit/plasmaman/engineering
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_ENG
code/modules/jobs/job_types/virologist.dm
+1
View File
@@ -10,6 +10,7 @@
exp_requirements = 60
outfit = /datum/outfit/job/virologist
plasmaman_outfit = /datum/outfit/plasmaman/viro
paycheck = PAYCHECK_MEDIUM
paycheck_department = ACCOUNT_MED
code/modules/jobs/job_types/warden.dm
+1
View File
@@ -12,6 +12,7 @@
exp_type = EXP_TYPE_CREW
outfit = /datum/outfit/job/warden
plasmaman_outfit = /datum/outfit/plasmaman/warden
paycheck = PAYCHECK_HARD
paycheck_department = ACCOUNT_SEC
code/modules/mob/living/carbon/human/species_types/plasmamen.dm
+2 -94
View File
@@ -71,100 +71,8 @@
. = ..()
/datum/species/plasmaman/before_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE)
var/current_job = J.title
var/datum/outfit/plasmaman/O = new /datum/outfit/plasmaman
switch(current_job)
if("Chaplain")
O = new /datum/outfit/plasmaman/chaplain
if("Curator")
O = new /datum/outfit/plasmaman/curator
if("Janitor")
O = new /datum/outfit/plasmaman/janitor
if("Botanist")
O = new /datum/outfit/plasmaman/botany
if("Bartender", "Lawyer")
O = new /datum/outfit/plasmaman/bar
if("Psychologist")
O = new /datum/outfit/plasmaman/psychologist
if("Cook")
O = new /datum/outfit/plasmaman/chef
if("Prisoner")
O = new /datum/outfit/plasmaman/prisoner
if("Security Officer")
O = new /datum/outfit/plasmaman/security
if("Detective")
O = new /datum/outfit/plasmaman/detective
if("Warden")
O = new /datum/outfit/plasmaman/warden
if("Cargo Technician", "Quartermaster")
O = new /datum/outfit/plasmaman/cargo
if("Shaft Miner")
O = new /datum/outfit/plasmaman/mining
if("Medical Doctor")
O = new /datum/outfit/plasmaman/medical
if("Paramedic")
O = new /datum/outfit/plasmaman/paramedic
if("Chemist")
O = new /datum/outfit/plasmaman/chemist
if("Geneticist")
O = new /datum/outfit/plasmaman/genetics
if("Roboticist")
O = new /datum/outfit/plasmaman/robotics
if("Virologist")
O = new /datum/outfit/plasmaman/viro
if("Scientist")
O = new /datum/outfit/plasmaman/science
if("Station Engineer")
O = new /datum/outfit/plasmaman/engineering
if("Atmospheric Technician")
O = new /datum/outfit/plasmaman/atmospherics
if("Mime")
O = new /datum/outfit/plasmaman/mime
if("Clown")
O = new /datum/outfit/plasmaman/clown
if("Captain")
O = new /datum/outfit/plasmaman/captain
if("Head of Personnel")
O = new /datum/outfit/plasmaman/head_of_personnel
if("Head of Security")
O = new /datum/outfit/plasmaman/head_of_security
if("Chief Engineer")
O = new /datum/outfit/plasmaman/chief_engineer
if("Chief Medical Officer")
O = new /datum/outfit/plasmaman/chief_medical_officer
if("Research Director")
O = new /datum/outfit/plasmaman/research_director
H.equipOutfit(O, visualsOnly)
if(J.plasmaman_outfit)
H.equipOutfit(J.plasmaman_outfit, visualsOnly)
H.internal = H.get_item_for_held_index(2)
H.update_internals_hud_icon(1)