-
Notifications
You must be signed in to change notification settings - Fork 565
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> # About the pull request Repairs the ID mod console "centcom" variable (renames it to weyland). Allows this new WY version of the console to correctly assign Corporate ID Accesses and job presets. Renames a couple PMC jobs (no impact due to no playtime tracking) Adds a whole bunch of WY jobs, including the PMCs, so they'll now track playtime. # Explain why it's good for the game Makes it a bit easier to dynamically update IDs in WY related events. I know I've encountered plenty of times where I've wanted to add corporate accesses to certain people but had to resort to variable editing. # Testing Photographs and Procedure <!-- Include any screenshots/videos/debugging steps of the modified code functioning successfully, ideally including edge cases. --> <!-- !! If you are modifying sprites, you **must** include one or more in-game screenshots or videos of the new sprites. !! --> ![image](https://github.com/cmss13-devs/cmss13/assets/41653574/49dab43e-0418-4520-81c9-6d0fce1b32bb) ![image](https://github.com/cmss13-devs/cmss13/assets/41653574/ce6681f2-5c57-40db-8a1a-b872345f108b) # Changelog :cl: fix: Changing an Identification Computer to is_weyland (formerly is_centcom) now works correctly and allows assignment of corporate accesses or presets. code: Added two procs for interpreting WY access information in the UI. code: Added separate role groups for PMC and Corporate job defines. add: Added ACCESS_WY_DATABASE as a requirement to use the WY subtype console. add: Added a WY subtype for crew monitor. code: Renamed the faction defines explicitly relating to static defences due to confusion over FACTION_WY and FACTION_WEYLAND. /:cl: <!-- Both :cl:'s are required for the changelog to work! -->
- Loading branch information
1 parent
c69997b
commit fa0637a
Showing
15 changed files
with
249 additions
and
44 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,110 @@ | ||
/datum/job/special/wey_yu | ||
supervisors = "Weyland-Yutani Corporate Office" | ||
title = "Weyland-Yutani Representative" | ||
selection_class = "job_cl" | ||
flags_startup_parameters = ROLE_CUSTOM_SPAWN | ||
gear_preset = /datum/equipment_preset/wy/trainee | ||
|
||
/datum/job/special/wey_yu/corporate/trainee | ||
title = JOB_TRAINEE | ||
gear_preset = /datum/equipment_preset/wy/trainee | ||
|
||
/datum/job/special/wey_yu/corporate/junior_exec | ||
title = JOB_JUNIOR_EXECUTIVE | ||
gear_preset = /datum/equipment_preset/wy/junior_exec | ||
|
||
/datum/job/special/wey_yu/corporate/exec | ||
title = JOB_EXECUTIVE | ||
gear_preset = /datum/equipment_preset/wy/exec | ||
|
||
/datum/job/special/wey_yu/corporate/senior_exec | ||
title = JOB_SENIOR_EXECUTIVE | ||
gear_preset = /datum/equipment_preset/wy/senior_exec | ||
|
||
/datum/job/special/wey_yu/corporate/exec_spec | ||
title = JOB_EXECUTIVE_SPECIALIST | ||
gear_preset = /datum/equipment_preset/wy/exec_spec | ||
|
||
/datum/job/special/wey_yu/corporate/exec_supr | ||
title = JOB_EXECUTIVE_SUPERVISOR | ||
gear_preset = /datum/equipment_preset/wy/exec_supervisor | ||
|
||
/datum/job/special/wey_yu/corporate/assist_man | ||
title = JOB_ASSISTANT_MANAGER | ||
gear_preset = /datum/equipment_preset/wy/manager/assistant_manager | ||
|
||
/datum/job/special/wey_yu/corporate/div_man | ||
title = JOB_DIVISION_MANAGER | ||
gear_preset = /datum/equipment_preset/wy/manager/division_manager | ||
supervisors = "Weyland-Yutani Directorate" | ||
|
||
/datum/job/special/wey_yu/corporate/chief_exec | ||
title = JOB_CHIEF_EXECUTIVE | ||
gear_preset = /datum/equipment_preset/wy/manager/chief_executive | ||
supervisors = "Weyland-Yutani Directorate" | ||
|
||
/datum/job/special/wey_yu/corporate/director | ||
title = JOB_DIRECTOR | ||
gear_preset = /datum/equipment_preset/wy/manager/director | ||
supervisors = "Weyland-Yutani Directorate" | ||
|
||
|
||
// PMCS // | ||
/datum/job/special/wey_yu/pmc | ||
supervisors = "Weyland-Yutani PMC Dispatch" | ||
|
||
/datum/job/special/wey_yu/pmc/standard | ||
title = JOB_PMC_STANDARD | ||
gear_preset = /datum/equipment_preset/pmc/pmc_standard | ||
|
||
/datum/job/special/wey_yu/pmc/medic | ||
title = JOB_PMC_MEDIC | ||
gear_preset = /datum/equipment_preset/pmc/pmc_medic | ||
|
||
/datum/job/special/wey_yu/pmc/engineer | ||
title = JOB_PMC_ENGINEER | ||
gear_preset = /datum/equipment_preset/pmc/technician | ||
|
||
/datum/job/special/wey_yu/pmc/gunner | ||
title = JOB_PMC_GUNNER | ||
gear_preset = /datum/equipment_preset/pmc/pmc_gunner | ||
|
||
/datum/job/special/wey_yu/pmc/sniper | ||
title = JOB_PMC_SNIPER | ||
gear_preset = /datum/equipment_preset/pmc/pmc_sniper | ||
|
||
/datum/job/special/wey_yu/pmc/leader | ||
title = JOB_PMC_LEADER | ||
gear_preset = /datum/equipment_preset/pmc/pmc_leader | ||
|
||
/datum/job/special/wey_yu/pmc/investigator | ||
title = JOB_PMC_INVESTIGATOR | ||
gear_preset = /datum/equipment_preset/pmc/pmc_med_investigator | ||
|
||
/datum/job/special/wey_yu/pmc/lead_invest | ||
title = JOB_PMC_LEAD_INVEST | ||
gear_preset = /datum/equipment_preset/pmc/pmc_lead_investigator | ||
|
||
/datum/job/special/wey_yu/pmc/detainer | ||
title = JOB_PMC_DETAINER | ||
gear_preset = /datum/equipment_preset/pmc/pmc_detainer | ||
|
||
/datum/job/special/wey_yu/pmc/crewman | ||
title = JOB_PMC_CREWMAN | ||
gear_preset = /datum/equipment_preset/pmc/pmc_crewman | ||
|
||
/datum/job/special/wey_yu/pmc/doctor | ||
title = JOB_PMC_DOCTOR | ||
gear_preset = /datum/equipment_preset/pmc/doctor | ||
|
||
/datum/job/special/wey_yu/pmc/handler | ||
title = JOB_PMC_XENO_HANDLER | ||
gear_preset = /datum/equipment_preset/pmc/xeno_handler | ||
|
||
/datum/job/special/wey_yu/pmc/synth | ||
title = JOB_PMC_SYNTH | ||
gear_preset = /datum/equipment_preset/pmc/synth | ||
|
||
/datum/job/special/wey_yu/pmc/director | ||
title = JOB_PMC_DIRECTOR | ||
gear_preset = /datum/equipment_preset/pmc/director |
Oops, something went wrong.