Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GAS Job Unrestriction #19

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

GAS Job Unrestriction #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d14ced7
GAS Jobs(x24)
Yawet330 Sep 8, 2020
4896900
Update torch_jobs.dm
Yawet330 Sep 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/modules/culture_descriptor/culture/cultures_serpentid.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@

/decl/cultural_info/culture/nabber/b
name = CULTURE_NABBER_B
valid_jobs = list(/datum/job/bartender, /datum/job/chef)
valid_jobs = list(/datum/job/bartender, /datum/job/cargo_tech, /datum/job/chef, /datum/job/mining, /datum/job/medical_trainee, /datum/job/engineer_trainee, /datum/job/explorer)

/decl/cultural_info/culture/nabber/b/minus
name = CULTURE_NABBER_BMINUS
Expand All @@ -59,7 +59,7 @@

/decl/cultural_info/culture/nabber/a
name = CULTURE_NABBER_A
valid_jobs = list(/datum/job/chemist, /datum/job/roboticist)
valid_jobs = list(/datum/job/chemist, /datum/job/roboticist, /datum/job/psiadvisor, /datum/job/explorer, /datum/job/engineer, /datum/job/engineer_trainee, /datum/job/doctor, /datum/job/medical_trainee, /datum/job/mining, /datum/job/scientist, /datum/job/scientist_assistant, /datum/job/merchant)//SKYRAT EDIT, GAS smart.

/decl/cultural_info/culture/nabber/a/minus
name = CULTURE_NABBER_AMINUS
Expand Down
3 changes: 1 addition & 2 deletions maps/torch/job/torch_jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/datum/map/torch
species_to_job_whitelist = list(
/datum/species/nabber = list(/datum/job/ai, /datum/job/cyborg, /datum/job/janitor, /datum/job/scientist_assistant, /datum/job/chemist,
/datum/job/roboticist, /datum/job/cargo_tech, /datum/job/chef, /datum/job/engineer, /datum/job/doctor, /datum/job/bartender),
/datum/species/nabber = list(/datum/job/psiadvisor,/datum/job/explorer,/datum/job/engineer, /datum/job/roboticist, /datum/job/engineer_trainee,/datum/job/doctor, /datum/job/chemist, /datum/job/medical_trainee,/datum/job/psychiatrist, /datum/job/chaplain,/datum/job/cargo_tech, /datum/job/mining,/datum/job/janitor, /datum/job/chef, /datum/job/bartender,/datum/job/scientist, /datum/job/scientist_assistant,/datum/job/ai, /datum/job/cyborg,/datum/job/merchant), //SKYRAT EDIT.
/datum/species/vox/ = list(/datum/job/ai, /datum/job/cyborg, /datum/job/merchant),
/datum/species/vox/armalis = list(/datum/job/ai, /datum/job/cyborg, /datum/job/merchant),
/datum/species/human/mule = list(/datum/job/ai, /datum/job/cyborg, /datum/job/merchant)
Expand Down