Skip to content

Commit

Permalink
Makes Med, Tech, and Research Assistant jobs more viable for learning…
Browse files Browse the repository at this point in the history
… (also headset changes to barber and musician) (#7547)

* Commits Jobs and PDA2,, basically all the changes

* techass jumpsuit, medass scrubs, and old comment

* techass jumpsuit, medass scrubs, unused comment

Co-authored-by: Yellow-Mushroom <codywilson@usf.edu>
  • Loading branch information
Yellow-Mushroom and Yellow-Mushroom committed Mar 28, 2022
1 parent 9d7b2b6 commit ee8da49
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 5 deletions.
20 changes: 15 additions & 5 deletions code/datums/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1197,11 +1197,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 @@ -1211,11 +1213,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 @@ -1243,11 +1247,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 @@ -1278,6 +1284,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 @@ -1381,6 +1388,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 @@ -2603,6 +2611,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 @@ -2673,6 +2682,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
Original file line number Diff line number Diff line change
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

0 comments on commit ee8da49

Please sign in to comment.