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

Jump to bottom

Makes Med, Tech, and Research Assistant jobs more viable for learning (also headset changes to barber and musician) #7547

Merged
merged 4 commits into from Mar 28, 2022
Merged

Makes Med, Tech, and Research Assistant jobs more viable for learning (also headset changes to barber and musician) #7547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8274ab1
Commits Jobs and PDA2,, basically all the changes
Feb 19, 2022
0ab5ade
Merge branch 'master' of https://github.com/goonstation/goonstation i…
Feb 20, 2022
c27e7c4
techass jumpsuit, medass scrubs, and old comment
Feb 20, 2022
b241622
techass jumpsuit, medass scrubs, unused comment
Feb 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 15 additions & 5 deletions code/datums/jobs.dm
View file
Open in desktop
Expand Up @@ -1227,11 +1227,13 @@ ABSTRACT_TYPE(/datum/job/civilian)
/datum/job/special/research_assistant
name = "Research Assistant"
linkcolor = "#9900FF"
limit = 1
limit = 2
wages = PAY_UNTRAINED
low_priority_job = 1
slot_jump = list(/obj/item/clothing/under/color/white)
slot_foot = list(/obj/item/clothing/shoes/white)
slot_belt = list(/obj/item/device/pda2/toxins)
slot_ears = list(/obj/item/device/radio/headset/research)

New()
..()
Expand All @@ -1241,11 +1243,13 @@ ABSTRACT_TYPE(/datum/job/civilian)
/datum/job/special/medical_assistant
name = "Medical Assistant"
linkcolor = "#9900FF"
limit = 1
limit = 2
wages = PAY_UNTRAINED
low_priority_job = 1
slot_jump = list(/obj/item/clothing/under/color/white)
slot_foot = list(/obj/item/clothing/shoes/white)
slot_jump = list(/obj/item/clothing/under/scrub = 30,/obj/item/clothing/under/scrub/teal = 14,/obj/item/clothing/under/scrub/blue = 14,/obj/item/clothing/under/scrub/purple = 14,/obj/item/clothing/under/scrub/orange = 14,/obj/item/clothing/under/scrub/pink = 14)
slot_foot = list(/obj/item/clothing/shoes/red)
slot_ears = list(/obj/item/device/radio/headset/medical)
slot_belt = list(/obj/item/device/pda2/medical)

New()
..()
Expand Down Expand Up @@ -1273,11 +1277,13 @@ ABSTRACT_TYPE(/datum/job/civilian)
/datum/job/special/tech_assistant
name = "Technical Assistant"
linkcolor = "#FF9900"
limit = 1
limit = 2
wages = PAY_UNTRAINED
low_priority_job = 1
slot_jump = list(/obj/item/clothing/under/color/yellow)
slot_foot = list(/obj/item/clothing/shoes/brown)
slot_ears = list(/obj/item/device/radio/headset/engineer)
slot_belt = list(/obj/item/device/pda2/technical_assistant)

New()
..()
Expand Down Expand Up @@ -1308,6 +1314,7 @@ ABSTRACT_TYPE(/datum/job/civilian)
slot_foot = list(/obj/item/clothing/shoes/black)
slot_poc1 = list(/obj/item/scissors)
slot_poc2 = list(/obj/item/razor_blade)
slot_ears = list(/obj/item/device/radio/headset/civilian)

New()
..()
Expand Down Expand Up @@ -1411,6 +1418,7 @@ ABSTRACT_TYPE(/datum/job/civilian)
slot_jump = list(/obj/item/clothing/under/suit/pinstripe)
slot_head = list(/obj/item/clothing/head/flatcap)
slot_foot = list(/obj/item/clothing/shoes/brown)
slot_ears = list(/obj/item/device/radio/headset/civilian)
items_in_backpack = list(/obj/item/instrument/saxophone,/obj/item/instrument/guitar,/obj/item/instrument/bagpipe,/obj/item/instrument/fiddle)

// randomizd gimmick jobs
Expand Down Expand Up @@ -2606,6 +2614,7 @@ ABSTRACT_TYPE(/datum/job/special/halloween/critter)
slot_foot = list(/obj/item/clothing/shoes/black)
slot_poc1 = list(/obj/item/scissors)
slot_poc2 = list(/obj/item/razor_blade)
slot_ears = list(/obj/item/device/radio/headset/civilian)

New()
..()
Expand Down Expand Up @@ -2676,6 +2685,7 @@ ABSTRACT_TYPE(/datum/job/special/halloween/critter)
slot_jump = list(/obj/item/clothing/under/suit/pinstripe)
slot_head = list(/obj/item/clothing/head/flatcap)
slot_foot = list(/obj/item/clothing/shoes/brown)
slot_ears = list(/obj/item/device/radio/headset/civilian)
items_in_backpack = list(/obj/item/instrument/saxophone,/obj/item/instrument/guitar,/obj/item/instrument/bagpipe,/obj/item/instrument/fiddle)

/datum/job/battler
Expand Down
5 changes: 5 additions & 0 deletions code/obj/item/device/pda2/pda2.dm
View file
Open in desktop
Expand Up @@ -262,6 +262,11 @@
mailgroups = list(MGO_ENGINEER,MGD_STATIONREPAIR,MGD_PARTY)
alertgroups = list(MGA_MAIL, MGA_RADIO, MGA_ENGINE, MGA_CRISIS)

technical_assistant
icon_state = "pda-e" //tech ass is too broad to have a set cartridge but should get alerts
mailgroups = list(MGD_STATIONREPAIR,MGD_PARTY)
alertgroups = list(MGA_MAIL,MGA_RADIO)

mining
icon_state = "pda-e"
mailgroups = list(MGD_MINING,MGD_PARTY)
Expand Down