Skip to content

Commit

Permalink
Fix bitrunner alternate job + set RU alternate titles in New() (ss220…
Browse files Browse the repository at this point in the history 
…club#458)

## About The Pull Request
Более робастная система в New(), на случай добавления новых
альтернативных тайтлов оффами. Все обращения к работке обращаются уже к
созданному инстансу (или должны)

И фикс отдела для битраннеров

<details><summary>Скриншоты</summary>


![Screenshot_17](https://github.com/user-attachments/assets/497314f9-225e-4e44-b083-2ece6a24a427)

![Screenshot_18](https://github.com/user-attachments/assets/e8d7eb6f-209d-4db9-b89d-d0bc0e261d72)

![Screenshot_19](https://github.com/user-attachments/assets/3715092c-b577-4beb-9301-1adab9220926)

</details>
  • Loading branch information
@larentoun
larentoun committed Jul 25, 2024
1 parent 0b09795 commit effc020
Showing 1 changed file with 108 additions and 75 deletions.
183 changes: 108 additions & 75 deletions modular_bandastation/ru_jobs/code/ru_jobs.dm
View file
Original file line number Diff line number Diff line change
@@ -1,115 +1,148 @@
/datum/job/ai
alternate_titles = list(JOB_AI_RU,)
/datum/job/ai/New()
. = ..()
alternate_titles += list(JOB_AI_RU)

/datum/job/atmospheric_technician
alternate_titles = list(JOB_ATMOSPHERIC_TECHNICIAN_RU,)
/datum/job/atmospheric_technician/New()
. = ..()
alternate_titles += list(JOB_ATMOSPHERIC_TECHNICIAN_RU)

/datum/job/bartender
alternate_titles = list(JOB_BARTENDER_RU,)
/datum/job/bartender/New()
. = ..()
alternate_titles += list(JOB_BARTENDER_RU)

/datum/job/botanist
alternate_titles = list(JOB_BOTANIST_RU,)
/datum/job/bitrunner/New()
. = ..()
alternate_titles += list(JOB_BITRUNNER_RU)

/datum/job/captain
alternate_titles = list(JOB_CAPTAIN_RU,)
/datum/job/botanist/New()
. = ..()
alternate_titles += list(JOB_BOTANIST_RU)

/datum/job/cargo_technician
alternate_titles = list(JOB_CARGO_TECHNICIAN_RU,)
/datum/job/captain/New()
. = ..()
alternate_titles += list(JOB_CAPTAIN_RU)

/datum/job/chemist
alternate_titles = list(JOB_CHEMIST_RU,)
/datum/job/cargo_technician/New()
. = ..()
alternate_titles += list(JOB_CARGO_TECHNICIAN_RU)

/datum/job/chief_engineer
alternate_titles = list(JOB_CHIEF_ENGINEER_RU,)
/datum/job/chemist/New()
. = ..()
alternate_titles += list(JOB_CHEMIST_RU)

/datum/job/chief_medical_officer
alternate_titles = list(JOB_CHIEF_MEDICAL_OFFICER_RU,)
/datum/job/chief_engineer/New()
. = ..()
alternate_titles += list(JOB_CHIEF_ENGINEER_RU)

/datum/job/clown
alternate_titles = list(JOB_CLOWN_RU,)
/datum/job/chief_medical_officer/New()
. = ..()
alternate_titles += list(JOB_CHIEF_MEDICAL_OFFICER_RU)

/datum/job/cook
alternate_titles = list(
JOB_CHEF,
/datum/job/clown/New()
. = ..()
alternate_titles += list(JOB_CLOWN_RU)

/datum/job/cook/New()
. = ..()
alternate_titles += list(
JOB_COOK_RU,
JOB_CHEF_RU,
JOB_CHEF_RU
)

/datum/job/coroner
alternate_titles = list(JOB_CORONER_RU,)
/datum/job/coroner/New()
. = ..()
alternate_titles += list(JOB_CORONER_RU)

/datum/job/curator
alternate_titles = list(JOB_CURATOR_RU,)
/datum/job/curator/New()
. = ..()
alternate_titles += list(JOB_CURATOR_RU)

/datum/job/cyborg
alternate_titles = list(JOB_CYBORG_RU,)
/datum/job/cyborg/New()
. = ..()
alternate_titles += list(JOB_CYBORG_RU)

/datum/job/detective
alternate_titles = list(JOB_DETECTIVE_RU,)
/datum/job/detective/New()
. = ..()
alternate_titles += list(JOB_DETECTIVE_RU)

/datum/job/geneticist
alternate_titles = list(JOB_GENETICIST_RU,)
/datum/job/geneticist/New()
. = ..()
alternate_titles += list(JOB_GENETICIST_RU)

/datum/job/head_of_personnel
alternate_titles = list(JOB_HEAD_OF_PERSONNEL_RU,)
/datum/job/head_of_personnel/New()
. = ..()
alternate_titles += list(JOB_HEAD_OF_PERSONNEL_RU)

/datum/job/head_of_security
alternate_titles = list(JOB_HEAD_OF_SECURITY_RU,)
/datum/job/head_of_security/New()
. = ..()
alternate_titles += list(JOB_HEAD_OF_SECURITY_RU)

/datum/job/janitor
alternate_titles = list(JOB_JANITOR_RU,)
/datum/job/janitor/New()
. = ..()
alternate_titles += list(JOB_JANITOR_RU)

/datum/job/lawyer
alternate_titles = list(JOB_LAWYER_RU,)
/datum/job/lawyer/New()
. = ..()
alternate_titles += list(JOB_LAWYER_RU)

/datum/job/doctor
alternate_titles = list(JOB_MEDICAL_DOCTOR_RU,)
/datum/job/doctor/New()
. = ..()
alternate_titles += list(JOB_MEDICAL_DOCTOR_RU)

/datum/job/mime
alternate_titles = list(JOB_MIME_RU,)
/datum/job/mime/New()
. = ..()
alternate_titles += list(JOB_MIME_RU)

/datum/job/paramedic
alternate_titles = list(JOB_PARAMEDIC_RU,)
/datum/job/paramedic/New()
. = ..()
alternate_titles += list(JOB_PARAMEDIC_RU)

/datum/job/prisoner
alternate_titles = list(JOB_PRISONER_RU,)
/datum/job/prisoner/New()
. = ..()
alternate_titles += list(JOB_PRISONER_RU)

/datum/job/psychologist
alternate_titles = list(JOB_PSYCHOLOGIST_RU,)
/datum/job/psychologist/New()
. = ..()
alternate_titles += list(JOB_PSYCHOLOGIST_RU)

/datum/job/quartermaster
alternate_titles = list(JOB_QUARTERMASTER_RU,)
/datum/job/quartermaster/New()
. = ..()
alternate_titles += list(JOB_QUARTERMASTER_RU)

/datum/job/research_director
alternate_titles = list(JOB_RESEARCH_DIRECTOR_RU,)
/datum/job/research_director/New()
. = ..()
alternate_titles += list(JOB_RESEARCH_DIRECTOR_RU)

/datum/job/roboticist
alternate_titles = list(JOB_ROBOTICIST_RU,)
/datum/job/roboticist/New()
. = ..()
alternate_titles += list(JOB_ROBOTICIST_RU)

/datum/job/scientist
alternate_titles = list(JOB_SCIENTIST_RU,)
/datum/job/scientist/New()
. = ..()
alternate_titles += list(JOB_SCIENTIST_RU)

/datum/job/security_officer
alternate_titles = list(
JOB_SECURITY_OFFICER_MEDICAL,
JOB_SECURITY_OFFICER_ENGINEERING,
JOB_SECURITY_OFFICER_SUPPLY,
JOB_SECURITY_OFFICER_SCIENCE,
/datum/job/security_officer/New()
. = ..()
alternate_titles += list(
JOB_SECURITY_OFFICER_RU,
JOB_SECURITY_OFFICER_MEDICAL_RU,
JOB_SECURITY_OFFICER_ENGINEERING_RU,
JOB_SECURITY_OFFICER_SUPPLY_RU,
JOB_SECURITY_OFFICER_SCIENCE_RU,
JOB_SECURITY_OFFICER_SCIENCE_RU
)

/datum/job/shaft_miner
alternate_titles = list(JOB_SHAFT_MINER_RU,)
/datum/job/shaft_miner/New()
. = ..()
alternate_titles += list(JOB_SHAFT_MINER_RU)

/datum/job/station_engineer
alternate_titles = list(JOB_STATION_ENGINEER_RU,)
/datum/job/station_engineer/New()
. = ..()
alternate_titles += list(JOB_STATION_ENGINEER_RU)

/datum/job/warden
alternate_titles = list(JOB_WARDEN_RU,)
/datum/job/warden/New()
. = ..()
alternate_titles += list(JOB_WARDEN_RU)

/datum/job/chaplain
alternate_titles = list(JOB_CHAPLAIN_RU,)
/datum/job/chaplain/New()
. = ..()
alternate_titles += list(JOB_CHAPLAIN_RU)

0 comments on commit effc020

Please sign in to comment.