diff --git a/aurora.dme b/aurora.dme index 6faa3539..6a06f583 100644 --- a/aurora.dme +++ b/aurora.dme @@ -792,6 +792,7 @@ #include "code\modules\aur-engie\engineering_shuttle.dm" #include "code\modules\aurora\aurora_areas.dm" #include "code\modules\aurora\banner.dm" +#include "code\modules\aurora\intern.dm" #include "code\modules\aurora\bridge_overhaul\chairs.dm" #include "code\modules\aurora\bridge_overhaul\desk_consoles.dm" #include "code\modules\awaymissions\bluespaceartillery.dm" diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index aa89a34f..b2fca35a 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -42,7 +42,8 @@ var/const/LAWYER =(1<<9) var/const/CHAPLAIN =(1<<10) var/const/CLOWN =(1<<11) var/const/MIME =(1<<12) -var/const/ASSISTANT =(1<<13) +var/const/INTERN =(1<<13) +var/const/ASSISTANT =(1<<14) var/list/assistant_occupations = list( @@ -96,6 +97,7 @@ var/list/civilian_positions = list( "Shaft Miner", "Lawyer", "Chaplain", + "Intern", "Assistant" ) diff --git a/code/modules/aurora/intern.dm b/code/modules/aurora/intern.dm new file mode 100644 index 00000000..5a7237d4 --- /dev/null +++ b/code/modules/aurora/intern.dm @@ -0,0 +1,57 @@ +/datum/job/intern + title = "Intern" + flag = INTERN + department_flag = CIVILIAN + faction = "Station" + total_positions = -1 + spawn_positions = -1 + supervisors = "absolutely everyone" + selection_color = "#dddddd" + access = list() //See /datum/job/assistant/get_access() + minimal_access = list() //See /datum/job/assistant/get_access() + alt_titles = list("Engineering Apprentice","Nursing Intern","Lab Assistant","Security Cadet") + +/datum/job/intern/equip(var/mob/living/carbon/human/H) + if(!H) return 0 + if(H.mind.role_alt_title) + switch(H.mind.role_alt_title) + if("Engineering Apprentice") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/engineer(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/orange(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/head/hardhat(H), slot_head) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_eng(H), slot_l_ear) + if("Nursing Intern") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/medical(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_med(H), slot_l_ear) + if("Lab Assistant") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/scientist(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sci(H), slot_l_ear) + if("Security Cadet") + H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/security2(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_sec(H), slot_l_ear) + else + H.equip_to_slot_or_del(new /obj/item/clothing/under/color/white(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/white(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_l_ear) + if(H.backbag == 1) + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H), slot_r_hand) + else + H.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(H.back), slot_in_backpack) + return 1 + +/datum/job/intern/get_access(var/mob/living/carbon/human/H) + if(H.mind.role_alt_title) + switch(H.mind.role_alt_title) + if("Engineering Apprentice") + return list(access_engine, access_maint_tunnels, access_construction) + if("Nursing Intern") + return list(access_medical, access_surgery) + if("Lab Assistant") + return list(access_research, access_robotics) + if("Security Cadet") + return list(access_security, access_sec_doors, access_maint_tunnels) + else + return list() \ No newline at end of file diff --git a/code/modules/economy/Job_Departments.dm b/code/modules/economy/Job_Departments.dm index 64abe66a..351a9aeb 100644 --- a/code/modules/economy/Job_Departments.dm +++ b/code/modules/economy/Job_Departments.dm @@ -67,4 +67,6 @@ var/list/station_departments = list("Command", "Medical", "Engineering", "Scienc /datum/job/detective/department = "Security" -/datum/job/officer/department = "Security" \ No newline at end of file +/datum/job/officer/department = "Security" + +/datum/job/intern/department = "Civilian" \ No newline at end of file diff --git a/code/modules/mob/new_player/preferences_setup.dm b/code/modules/mob/new_player/preferences_setup.dm index 66c6f5ff..d80ff05b 100644 --- a/code/modules/mob/new_player/preferences_setup.dm +++ b/code/modules/mob/new_player/preferences_setup.dm @@ -415,6 +415,13 @@ datum/preferences clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel-norm"), ICON_OVERLAY) if(4) clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) + if(INTERN) + clothes_s = new /icon('icons/mob/uniform.dmi', "white_s") + clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY) + if(backbag == 2) + clothes_s.Blend(new /icon('icons/mob/back.dmi', "backpack"), ICON_OVERLAY) + else if(backbag == 3 || backbag == 4) + clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY) else if(job_medsci_high) switch(job_medsci_high)