diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm index 504792155..bae6eab9c 100644 --- a/code/__DEFINES/access.dm +++ b/code/__DEFINES/access.dm @@ -68,6 +68,9 @@ #define ACCESS_LEAVE_GENPOP 70 #define ACCESS_PSYCH 71 #define ACCESS_LAMBENT 72 +#define ACCESS_BARBER 73 +#define ACCESS_BARISTA 74 + //BEGIN CENTCOM ACCESS /*Should leave plenty of room if we need to add more access levels. diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index b0936d040..d00bb5b32 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -47,6 +47,8 @@ #define CLOWN (1<<11) #define MIME (1<<12) #define ASSISTANT (1<<13) +#define BARBER (1<<14) +#define BARISTA (1<<15) #define JOB_AVAILABLE 0 #define JOB_UNAVAILABLE_GENERIC 1 diff --git a/code/game/area/Space_Station_13_areas.dm b/code/game/area/Space_Station_13_areas.dm index 0e235c991..5f8b9bd62 100644 --- a/code/game/area/Space_Station_13_areas.dm +++ b/code/game/area/Space_Station_13_areas.dm @@ -952,10 +952,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Private Investigator's Office" icon_state = "detective" -/area/security/lambent - name = "Lambent's Quarters" - icon_state = "detective" - /area/security/range name = "Firing Range" icon_state = "firingrange" @@ -1463,12 +1459,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Pool Area" icon_state = "pool" -/area/crew_quarters/spa - name = "Spa" - -/area/crew_quarters/spa/sauna - name = "Sauna" - /area/xenoarch/nothinghere name = "Nothing Here" icon_state = "yellow" @@ -1478,31 +1468,6 @@ NOTE: there are two lists of areas in the end of this file: centcom and station name = "Arcade" icon_state = "yellow" -/area/artatrium - name = "Art Atrium" - icon_state = "library" - -/area/crew_quarters/bar/cafe - name = "Cafe" - icon_state = "bar" - -/area/crew_quarters/bar/cafe/backroom - name = "Cafe Backroom" - icon_state = "bar" - -/area/crew_quarters/bar/cafe/storage - name = "Cafe Storage" - icon_state = "bar" - -/area/kinarisrep - name = "Kinaris Representative Office" - -/area/kinarisblueshield - name = "Kinaris Lambent Office" - -/area/barber - name = "Barber's Shop" - /area/medical/psych/ward name = "Psychology Ward" diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index aa78f2d93..2d69b4d8f 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -123,10 +123,6 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark) name = "Detective" icon_state = "Detective" -/obj/effect/landmark/start/lambent - name = "Lambent" - icon_state = "Lambent" - /obj/effect/landmark/start/warden name = "Warden" icon_state = "Warden" diff --git a/code/modules/jobs/access.dm b/code/modules/jobs/access.dm index ed734c98a..fe8414b80 100644 --- a/code/modules/jobs/access.dm +++ b/code/modules/jobs/access.dm @@ -133,7 +133,7 @@ ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, - ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, + ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, ACCESS_BARISTA, ACCESS_BARBER, ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_QM, ACCESS_SURGERY, ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, ACCESS_WEAPONS, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, @@ -161,7 +161,7 @@ if(0) return get_all_accesses() if(1) //station general - return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER) + return list(ACCESS_KITCHEN,ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_BARISTA, ACCESS_BARBER) if(2) //security return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_HOS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_LAMBENT) if(3) //medbay @@ -224,6 +224,10 @@ return "RD Office" if(ACCESS_BAR) return "Bar" + if(ACCESS_BARBER) + return "Barber" + if(ACCESS_BARISTA) + return "Barista" if(ACCESS_JANITOR) return "Custodial Closet" if(ACCESS_ENGINE) @@ -359,7 +363,7 @@ return "Code Scotch" /proc/get_all_jobs() - return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Cook", "Botanist", "Quartermaster", "Cargo Technician", + return list("Assistant", "Captain", "Head of Personnel", "Bartender", "Barista", "Barber", "Cook", "Botanist", "Quartermaster", "Cargo Technician", "Shaft Miner", "Clown", "Mime", "Janitor", "Curator", "Lawyer", "Chaplain", "Chief Engineer", "Station Engineer", "Engineering Intern", "Atmospheric Technician", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Virologist", "Psychologist", "Medical Resident", "Research Director", "Scientist", "Roboticist", "Research Student", "Head of Security", "Warden", "Detective", "Security Officer", "Rookie", "Lambent") diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 1565ab437..92652190c 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -100,13 +100,13 @@ Head of Personnel outfit = /datum/outfit/job/hop access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_BARISTA, ACCESS_BARBER, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MINERAL_STOREROOM, ACCESS_PSYCH) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_COURT, ACCESS_WEAPONS, - ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_BARISTA, ACCESS_BARBER, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_VAULT, ACCESS_MINING_STATION, diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index 9dec1a40a..9480cc9ae 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -170,7 +170,7 @@ Bartender outfit = /datum/outfit/job/bartender - access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_BAR, ACCESS_MINERAL_STOREROOM) @@ -183,7 +183,7 @@ Bartender ears = /obj/item/radio/headset/headset_srv uniform = /obj/item/clothing/under/rank/bartender suit = /obj/item/clothing/suit/armor/vest - backpack_contents = list(/obj/item/storage/box/beanbag=1,/obj/item/book/granter/action/drink_fling=1) + backpack_contents = list(/obj/item/book/granter/action/drink_fling=1) shoes = /obj/item/clothing/shoes/laceup /* @@ -195,7 +195,7 @@ Cook department_head = list("Head of Personnel") department_flag = CIVILIAN faction = "Station" - total_positions = 2 + total_positions = 1 spawn_positions = 1 supervisors = "the head of personnel" selection_color = "#bbe291" diff --git a/code/modules/jobs/job_types/job_alt_titles.dm b/code/modules/jobs/job_types/job_alt_titles.dm index b96fd9b7f..cd29fff71 100644 --- a/code/modules/jobs/job_types/job_alt_titles.dm +++ b/code/modules/jobs/job_types/job_alt_titles.dm @@ -89,9 +89,6 @@ /datum/job/detective alt_titles = list("Forensics Technician", "Private Investigator", "Gumshoe") -/datum/job/lambent - alt_titles = list("Kinaris Protectorate", "Hardshield", "Asset Specialist", "Luminal") - /datum/job/junior_officer //Supply diff --git a/code/modules/jobs/job_types/security.dm b/code/modules/jobs/job_types/security.dm index 0ca7152de..0a0c83508 100644 --- a/code/modules/jobs/job_types/security.dm +++ b/code/modules/jobs/job_types/security.dm @@ -27,11 +27,11 @@ Head of Security outfit = /datum/outfit/job/hos access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_BARISTA, ACCESS_BARBER, ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_BARISTA, ACCESS_BARBER, ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) @@ -74,63 +74,6 @@ Head of Security suit_store = /obj/item/tank/internals/oxygen backpack_contents = list(/obj/item/melee/baton/loaded=1, /obj/item/gun/energy/e_gun=1) -/* -Lambent -*/ -/datum/job/lambent - title = "Lambent" - flag = LAMBENT - department_head = list("CentCom") - department_flag = ENGSEC - faction = "Station" - total_positions = 1 - spawn_positions = 1 - supervisors = "Central Command and Kinaris officials" - selection_color = "#ffedcc" - req_admin_notify = 1 - minimal_player_age = 30 - exp_requirements = 9000 - exp_type = EXP_TYPE_COMMAND - exp_type_department = EXP_TYPE_COMMAND - whitelist_type = "important" - custom_spawn_text = "You are a Kinaris Lambent; a person hired directly by Kinaris who has a high interest in asset security and the protection of the station. Unlike the station, your gear is official Kinaris items, not replicated Milky-Way Engrams. As such, you should keep them safe due to the power they hold. You answer directly to Central Command and Kinaris, and security matters should not involve you for the most part, unless staffing is low or there is a problem with securing assets. Thankfully, Layenia Station is one of Kinaris's most low-tech stations with hardly anything important to secure; not even the items in the vault are noteworthy due to the falsified, low-tech Engram they're under. Just ensure peace is kept and the station is functioning in a calm manner." - - outfit = /datum/outfit/job/lambent - - access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_LAMBENT, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, - ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) - minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_LAMBENT, - ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, - ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, - ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) - - mind_traits = list(TRAIT_CAPTAIN_METABOLISM) - - blacklisted_quirks = list(/datum/quirk/brainproblems, /datum/quirk/insanity, /datum/quirk/nonviolent) - -/datum/outfit/job/lambent - name = "Lambent" - jobtype = /datum/job/lambent - - id = /obj/item/card/id/silver - belt = /obj/item/pda/captain - glasses = /obj/item/clothing/glasses/hud/toggle/zao - ears = /obj/item/radio/headset/heads/captain/alt - gloves = /obj/item/clothing/gloves/lambent - uniform = /obj/item/clothing/under/rank/lambent - suit = /obj/item/clothing/suit/lambent - shoes = /obj/item/clothing/shoes/lambent - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - - backpack = /obj/item/storage/backpack/lambent - satchel = /obj/item/storage/backpack/satchel/lambent - duffelbag = /obj/item/storage/backpack/duffelbag/lambent - box = /obj/item/storage/box/security - - implants = list(/obj/item/implant/mindshield) - /* Warden */ diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 498a9af4d..92afee693 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -38,6 +38,8 @@ GLOBAL_LIST_INIT(supply_positions, list( GLOBAL_LIST_INIT(civilian_positions, list( "Head of Personnel", + "Barista", + "Barber", "Bartender", "Botanist", "Cook", diff --git a/config/jobs.txt b/config/jobs.txt index 4156b60e0..4ba075e30 100644 --- a/config/jobs.txt +++ b/config/jobs.txt @@ -17,7 +17,9 @@ Cargo Technician=3,2 Shaft Miner=3,3 Bartender=1,1 -Cook=2,1 +Barista=1,1 +Barber=2,1 +Cook=1,1 Botanist=3,2 Janitor=2,1 diff --git a/hyperstation/code/game/area/Space_Station_13_areas.dm b/hyperstation/code/game/area/Space_Station_13_areas.dm new file mode 100644 index 000000000..cf8c345c2 --- /dev/null +++ b/hyperstation/code/game/area/Space_Station_13_areas.dm @@ -0,0 +1,31 @@ +/area/barber + name = "Barber's Shop" + +/area/kinarisrep + name = "Kinaris Representative Office" + +/area/crew_quarters/bar/cafe + name = "Cafe" + icon_state = "bar" + +/area/crew_quarters/bar/cafe/backroom + name = "Cafe Backroom" + icon_state = "bar" + +/area/crew_quarters/bar/cafe/storage + name = "Cafe Storage" + icon_state = "bar" + +/area/artatrium + name = "Art Atrium" + icon_state = "library" + +/area/crew_quarters/spa + name = "Spa" + +/area/crew_quarters/spa/sauna + name = "Sauna" + +/area/security/lambent + name = "Lambent's Quarters" + icon_state = "detective" diff --git a/hyperstation/code/game/objects/effects/landmarks.dm b/hyperstation/code/game/objects/effects/landmarks.dm new file mode 100644 index 000000000..5ae0945f4 --- /dev/null +++ b/hyperstation/code/game/objects/effects/landmarks.dm @@ -0,0 +1,11 @@ +/obj/effect/landmark/start/lambent + name = "Lambent" + icon_state = "Lambent" + +/obj/effect/landmark/start/barber + name = "Barber" + icon_state = "Barber" + +/obj/effect/landmark/start/barista + name = "Barista" + icon_state = "Barista" diff --git a/hyperstation/code/modules/jobs/job_types/civilian.dm b/hyperstation/code/modules/jobs/job_types/civilian.dm new file mode 100644 index 000000000..9ed93fdb2 --- /dev/null +++ b/hyperstation/code/modules/jobs/job_types/civilian.dm @@ -0,0 +1,52 @@ +/datum/job/barista + title = "Barista" + flag = BARISTA + department_head = list("Head of Personnel") + department_flag = CIVILIAN + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the head of personnel" + selection_color = "#bbe291" + + outfit = /datum/outfit/job/barista + + access = list(ACCESS_HYDROPONICS, ACCESS_BARISTA, ACCESS_KITCHEN, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_BARISTA, ACCESS_MINERAL_STOREROOM) + +/datum/outfit/job/barista + name = "Barista" + jobtype = /datum/job/barista + + belt = /obj/item/pda/bar + ears = /obj/item/radio/headset/headset_srv + uniform = /obj/item/clothing/under/lawyer/blacksuit + suit = /obj/item/clothing/suit/toggle/lawyer/black + backpack_contents = list(/obj/item/book/granter/action/drink_fling=1, /obj/item/clothing/accessory/waistcoat) + shoes = /obj/item/clothing/shoes/laceup + +/datum/job/barber + title = "Barber" + flag = BARBER + department_head = list("Head of Personnel") + department_flag = CIVILIAN + faction = "Station" + total_positions = 2 + spawn_positions = 1 + supervisors = "the head of personnel" + selection_color = "#bbe291" + + outfit = /datum/outfit/job/barber + + access = list(ACCESS_BARBER) + minimal_access = list(ACCESS_BARBER) + +/datum/outfit/job/barber + name = "Barber" + jobtype = /datum/job/barber + + glasses = /obj/item/clothing/glasses/sunglasses + ears = /obj/item/radio/headset/headset_srv + belt = /obj/item/pda + uniform = /obj/item/clothing/under/barber + shoes = /obj/item/clothing/shoes/laceup diff --git a/hyperstation/code/modules/jobs/job_types/job_alt_titles.dm b/hyperstation/code/modules/jobs/job_types/job_alt_titles.dm new file mode 100644 index 000000000..0f20b5e46 --- /dev/null +++ b/hyperstation/code/modules/jobs/job_types/job_alt_titles.dm @@ -0,0 +1,8 @@ +/datum/job/lambent + alt_titles = list("Kinaris Protectorate", "Hardshield", "Asset Specialist", "Luminal") + +/datum/job/barber + alt_titles = list("Cosmetologist", "Beautician", "Hairdresser", "Hair Stylist") + +/datum/job/barista + alt_titles = list("Cafe Attendant", "Cafe Server") diff --git a/hyperstation/code/modules/jobs/job_types/security.dm b/hyperstation/code/modules/jobs/job_types/security.dm new file mode 100644 index 000000000..0360b5423 --- /dev/null +++ b/hyperstation/code/modules/jobs/job_types/security.dm @@ -0,0 +1,56 @@ +/* +Lambent +*/ +/datum/job/lambent + title = "Lambent" + flag = LAMBENT + department_head = list("CentCom") + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "Central Command and Kinaris officials" + selection_color = "#ffedcc" + req_admin_notify = 1 + minimal_player_age = 30 + exp_requirements = 9000 + exp_type = EXP_TYPE_COMMAND + exp_type_department = EXP_TYPE_COMMAND + whitelist_type = "important" + custom_spawn_text = "You are a Kinaris Lambent; a person hired directly by Kinaris who has a high interest in asset security and the protection of the station. Unlike the station, your gear is official Kinaris items, not replicated Milky-Way Engrams. As such, you should keep them safe due to the power they hold. You answer directly to Central Command and Kinaris, and security matters should not involve you for the most part, unless staffing is low or there is a problem with securing assets. Thankfully, Layenia Station is one of Kinaris's most low-tech stations with hardly anything important to secure; not even the items in the vault are noteworthy due to the falsified, low-tech Engram they're under. Just ensure peace is kept and the station is functioning in a calm manner." + + outfit = /datum/outfit/job/lambent + + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_LAMBENT, + ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_BARISTA, ACCESS_BARBER, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_WEAPONS, ACCESS_ENTER_GENPOP, ACCESS_LEAVE_GENPOP, ACCESS_LAMBENT, + ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_BARISTA, ACCESS_BARBER, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) + + mind_traits = list(TRAIT_CAPTAIN_METABOLISM) + + blacklisted_quirks = list(/datum/quirk/brainproblems, /datum/quirk/insanity, /datum/quirk/nonviolent) + +/datum/outfit/job/lambent + name = "Lambent" + jobtype = /datum/job/lambent + + id = /obj/item/card/id/silver + belt = /obj/item/pda/captain + glasses = /obj/item/clothing/glasses/hud/toggle/zao + ears = /obj/item/radio/headset/heads/captain/alt + gloves = /obj/item/clothing/gloves/lambent + uniform = /obj/item/clothing/under/rank/lambent + suit = /obj/item/clothing/suit/lambent + shoes = /obj/item/clothing/shoes/lambent + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) + + backpack = /obj/item/storage/backpack/lambent + satchel = /obj/item/storage/backpack/satchel/lambent + duffelbag = /obj/item/storage/backpack/duffelbag/lambent + box = /obj/item/storage/box/security + + implants = list(/obj/item/implant/mindshield) diff --git a/hyperstation/code/obj/clothes.dm b/hyperstation/code/obj/clothes.dm new file mode 100644 index 000000000..da96e29ad --- /dev/null +++ b/hyperstation/code/obj/clothes.dm @@ -0,0 +1,7 @@ +/obj/item/clothing/under/barber + name = "barber's uniform" + desc = "A fancy pink shirt paired with light-catching white pants. Yet to be blood- and puke-stained." + icon = 'hyperstation/icons/obj/clothing/uniforms.dmi' + //alternate_worn_icon = 'hyperstation/icons/mobs/uniforms.dmi' + icon_state = "barber" + item_state = "barber" diff --git a/hyperstation/icons/obj/clothing/uniforms.dmi b/hyperstation/icons/obj/clothing/uniforms.dmi index 749e71350..6ef677ea1 100644 Binary files a/hyperstation/icons/obj/clothing/uniforms.dmi and b/hyperstation/icons/obj/clothing/uniforms.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 3f8cd5af4..b953d759d 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index 6e1f3e1a2..a5532018f 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 3086ca0b9..916151ba4 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -3098,8 +3098,10 @@ #include "hyperstation\code\datums\traits\neutral.dm" #include "hyperstation\code\datums\weather\lithium_aurora.dm" #include "hyperstation\code\datums\weather\oxygen_rain.dm" +#include "hyperstation\code\game\area\Space_Station_13_areas.dm" #include "hyperstation\code\game\machinery\lore_terminal.dm" #include "hyperstation\code\game\objects\railings.dm" +#include "hyperstation\code\game\objects\effects\landmarks.dm" #include "hyperstation\code\game\objects\items\coconutcannon.dm" #include "hyperstation\code\game\objects\items\cosmetics.dm" #include "hyperstation\code\game\objects\items\storage\big_bag.dm" @@ -3158,7 +3160,10 @@ #include "hyperstation\code\modules\events\crystalloid_entities.dm" #include "hyperstation\code\modules\food_and_drinks\recipes\drinks_recipes.dm" #include "hyperstation\code\modules\integrated_electronics\input.dm" +#include "hyperstation\code\modules\jobs\job_types\civilian.dm" +#include "hyperstation\code\modules\jobs\job_types\job_alt_titles.dm" #include "hyperstation\code\modules\jobs\job_types\roleplay.dm" +#include "hyperstation\code\modules\jobs\job_types\security.dm" #include "hyperstation\code\modules\mining\shelters.dm" #include "hyperstation\code\modules\mining\equipment\survival_pod.dm" #include "hyperstation\code\modules\mob\mob_helpers.dm" @@ -3185,6 +3190,7 @@ #include "hyperstation\code\modules\vending\teavendomatic.dm" #include "hyperstation\code\obj\ashtray.dm" #include "hyperstation\code\obj\bluespace sewing kit.dm" +#include "hyperstation\code\obj\clothes.dm" #include "hyperstation\code\obj\condom.dm" #include "hyperstation\code\obj\decal.dm" #include "hyperstation\code\obj\economy.dm"