cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-10-25 01:07:26 -04:00
committed by GitHub
parent 2c4649d319
commit 80f88f465b
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
maps/southern_cross/southern_cross_jobs.dm
View File

@@ -76,19 +76,10 @@ var/const/access_explorer = 43
supervisors = "the explorer leader and the head of personnel" supervisors = "the explorer leader and the head of personnel"
selection_color = "#515151" selection_color = "#515151"
economic_modifier = 4 economic_modifier = 4
<<<<<<< HEAD
access = list(access_explorer)
minimal_access = list(access_explorer)
||||||| parent of b9ba661b8b... Merge pull request #11603 from VOREStation/upstream-merge-8253
access = list(access_explorer, access_research)
minimal_access = list(access_explorer, access_research)
=======
access = list(access_explorer, access_research) access = list(access_explorer, access_research)
minimal_access = list(access_explorer, access_research) minimal_access = list(access_explorer, access_research)
banned_job_species = list(SPECIES_ZADDAT) banned_job_species = list(SPECIES_ZADDAT)
>>>>>>> b9ba661b8b... Merge pull request #11603 from VOREStation/upstream-merge-8253
outfit_type = /decl/hierarchy/outfit/job/explorer2 outfit_type = /decl/hierarchy/outfit/job/explorer2
/* /*
alt_titles = list( alt_titles = list(
@@ -109,15 +100,7 @@ var/const/access_explorer = 43
economic_modifier = 4 economic_modifier = 4
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer) access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
<<<<<<< HEAD
outfit_type = /decl/hierarchy/outfit/job/medical/sar
||||||| parent of b9ba661b8b... Merge pull request #11603 from VOREStation/upstream-merge-8253
outfit_type = /decl/hierarchy/outfit/job/medical/sar
job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif."
=======
min_age_by_species = list(SPECIES_PROMETHEAN = 2) min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/medical/sar outfit_type = /decl/hierarchy/outfit/job/medical/sar
job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif." job_description = "A Search and Rescue operative recovers individuals who are injured or dead on the surface of Sif."
>>>>>>> b9ba661b8b... Merge pull request #11603 from VOREStation/upstream-merge-8253