From dffebee0a0dd03107affb6bebb615561ec3d6861 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:18:33 +1200 Subject: [PATCH] Event Service Role & Event Job Outfits (#19652) Adds the event service job used in New Blades so far, as well as unique outfits for event jobs to make giving them different gear easier for future devs. --- code/__DEFINES/jobs.dm | 4 +- code/game/jobs/faction/hephaestus.dm | 27 ++++- code/game/jobs/faction/idris.dm | 14 ++- code/game/jobs/faction/orion_express.dm | 14 ++- code/game/jobs/faction/pmc.dm | 28 ++++- code/game/jobs/faction/zavodskoi.dm | 41 ++++++- code/game/jobs/faction/zeng_hu.dm | 30 ++++- code/game/jobs/job/event.dm | 106 +++++++++++++++++- code/game/jobs/jobs.dm | 4 +- .../loadout/items/factions.dm | 4 +- .../changelogs/RustingWithYou - eventjob2.yml | 59 ++++++++++ 11 files changed, 310 insertions(+), 21 deletions(-) create mode 100644 html/changelogs/RustingWithYou - eventjob2.yml diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index d5ad8fabc97..5af4570245e 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -17,7 +17,7 @@ #define EVENTENG_ROLE /datum/job/eventsec #define EVENTSCI_ROLE /datum/job/eventsci #define EVENTOPS_ROLE /datum/job/eventops -#define EVENT_ROLES list(/datum/job/eventsec, /datum/job/eventmed, /datum/job/eventeng, /datum/job/eventsci, /datum/job/eventops) +#define EVENT_ROLES list(/datum/job/eventsec, /datum/job/eventmed, /datum/job/eventeng, /datum/job/eventsci, /datum/job/eventops, /datum/job/eventsrv) // Departments // Used to know what roles are part of which department. @@ -29,7 +29,7 @@ #define SCIENCE_ROLES list(/datum/job/scientist, /datum/job/xenoarchaeologist, /datum/job/xenobiologist, /datum/job/xenobotanist, /datum/job/intern_sci, /datum/job/eventsci) #define MEDICAL_ROLES list(/datum/job/doctor, /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, /datum/job/med_tech, /datum/job/intern_med, /datum/job/eventmed) #define ENGINEERING_ROLES list(/datum/job/engineer, /datum/job/atmos, /datum/job/intern_eng, /datum/job/eventeng) -#define SERVICE_ROLES list(/datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/librarian) +#define SERVICE_ROLES list(/datum/job/chaplain, /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/librarian, /datum/job/eventsrv) #define CIVILIAN_ROLES list(/datum/job/assistant, /datum/job/visitor, /datum/job/journalist) #define NON_CREW_CIVILIAN_ROLES list(/datum/job/passenger, /datum/job/merchant) #define SECURITY_ROLES list(/datum/job/warden, /datum/job/investigator, /datum/job/officer, /datum/job/intern_sec, /datum/job/eventsec) diff --git a/code/game/jobs/faction/hephaestus.dm b/code/game/jobs/faction/hephaestus.dm index 216d1dc4127..1860d96ac7d 100644 --- a/code/game/jobs/faction/hephaestus.dm +++ b/code/game/jobs/faction/hephaestus.dm @@ -48,8 +48,8 @@ "Corporate Reporter" = /obj/outfit/job/journalist/hephaestus, "Corporate Liaison" = /obj/outfit/job/representative/hephaestus, "Off-Duty Crew Member" = /obj/outfit/job/visitor/hephaestus, - "Engineering Personnel" = /obj/outfit/job/engineer/hephaestus, - "Operations Personnel" = /obj/outfit/job/hangar_tech/hephaestus + "Engineering Personnel" = /obj/outfit/job/engineer/event/hephaestus, + "Operations Personnel" = /obj/outfit/job/hangar_tech/event/hephaestus ) /obj/outfit/job/hangar_tech/hephaestus @@ -175,3 +175,26 @@ satchel_faction = /obj/item/storage/backpack/satchel/heph dufflebag_faction = /obj/item/storage/backpack/duffel/heph messengerbag_faction = /obj/item/storage/backpack/messenger/heph + +/obj/outfit/job/hangar_tech/event/hephaestus + name = "Operations Personnel - Hephaestus" + + uniform = /obj/item/clothing/under/rank/hangar_technician/heph + id = /obj/item/card/id/hephaestus + + backpack_faction = /obj/item/storage/backpack/heph + satchel_faction = /obj/item/storage/backpack/satchel/heph + dufflebag_faction = /obj/item/storage/backpack/duffel/heph + messengerbag_faction = /obj/item/storage/backpack/messenger/heph + +/obj/outfit/job/engineer/event/hephaestus + name = "Engineering Personnel - Hephaestus" + + uniform = /obj/item/clothing/under/rank/engineer/heph + head = /obj/item/clothing/head/hardhat/green + id = /obj/item/card/id/hephaestus + + backpack_faction = /obj/item/storage/backpack/heph + satchel_faction = /obj/item/storage/backpack/satchel/heph + dufflebag_faction = /obj/item/storage/backpack/duffel/heph + messengerbag_faction = /obj/item/storage/backpack/messenger/heph diff --git a/code/game/jobs/faction/idris.dm b/code/game/jobs/faction/idris.dm index cba0ebe956a..010e2768e4b 100644 --- a/code/game/jobs/faction/idris.dm +++ b/code/game/jobs/faction/idris.dm @@ -62,7 +62,8 @@ "Chaplain" = /obj/outfit/job/chaplain/idris, "Corporate Liaison" = /obj/outfit/job/representative/idris, "Off-Duty Crew Member" = /obj/outfit/job/visitor/idris, - "Security Personnel" = /obj/outfit/job/officer/idris + "Security Personnel" = /obj/outfit/job/officer/event/idris, + "Service Personnel" = /obj/outfit/job/bartender/idris ) /obj/outfit/job/officer/idris @@ -253,3 +254,14 @@ satchel_faction = /obj/item/storage/backpack/satchel/idris dufflebag_faction = /obj/item/storage/backpack/duffel/idris messengerbag_faction = /obj/item/storage/backpack/messenger/idris + +/obj/outfit/job/officer/event/idris + name = "Security Personnel - Idris" + + uniform = /obj/item/clothing/under/rank/security/idris + id = /obj/item/card/id/idris/sec + + backpack_faction = /obj/item/storage/backpack/idris + satchel_faction = /obj/item/storage/backpack/satchel/idris + dufflebag_faction = /obj/item/storage/backpack/duffel/idris + messengerbag_faction = /obj/item/storage/backpack/messenger/idris diff --git a/code/game/jobs/faction/orion_express.dm b/code/game/jobs/faction/orion_express.dm index 4570102aafd..53109d0d3b3 100644 --- a/code/game/jobs/faction/orion_express.dm +++ b/code/game/jobs/faction/orion_express.dm @@ -50,7 +50,8 @@ "Chaplain" = /obj/outfit/job/chaplain/orion, "Corporate Liaison" = /obj/outfit/job/representative/orion, "Off-Duty Crew Member" = /obj/outfit/job/visitor/orion, - "Operations Personnel" = /obj/outfit/job/hangar_tech/orion + "Operations Personnel" = /obj/outfit/job/hangar_tech/event/orion, + "Service Personnel" = /obj/outfit/job/bartender/orion ) /obj/outfit/job/hangar_tech/orion @@ -209,3 +210,14 @@ satchel_faction = /obj/item/storage/backpack/satchel/orion dufflebag_faction = /obj/item/storage/backpack/duffel/orion messengerbag_faction = /obj/item/storage/backpack/messenger/orion + +/obj/outfit/job/hangar_tech/event/orion + name = "Hangar Technician - Orion Express" + + uniform = /obj/item/clothing/under/rank/hangar_technician/orion + id = /obj/item/card/id/orion + + backpack_faction = /obj/item/storage/backpack/orion + satchel_faction = /obj/item/storage/backpack/satchel/orion + dufflebag_faction = /obj/item/storage/backpack/duffel/orion + messengerbag_faction = /obj/item/storage/backpack/messenger/orion diff --git a/code/game/jobs/faction/pmc.dm b/code/game/jobs/faction/pmc.dm index 91d0fa62ff6..a4aa7284164 100644 --- a/code/game/jobs/faction/pmc.dm +++ b/code/game/jobs/faction/pmc.dm @@ -49,8 +49,8 @@ "Corporate Reporter" = /obj/outfit/job/journalist/pmc, "Corporate Liaison" = /obj/outfit/job/representative/pmc, "Off-Duty Crew Member" = /obj/outfit/job/visitor/pmc, - "Security Personnel" = /obj/outfit/job/officer/pmc, - "Medical Personnel" = /obj/outfit/job/med_tech/pmc + "Security Personnel" = /obj/outfit/job/officer/event/pmc, + "Medical Personnel" = /obj/outfit/job/med_tech/event/pmc ) /obj/outfit/job/officer/pmc @@ -227,3 +227,27 @@ satchel_faction = /obj/item/storage/backpack/satchel/pmcg dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg + +/obj/outfit/job/officer/event/pmc + name = "Security Personnel - PMC" + + uniform = /obj/item/clothing/under/rank/security/pmc + id = /obj/item/card/id/pmc + + backpack_faction = /obj/item/storage/backpack/pmcg + satchel_faction = /obj/item/storage/backpack/satchel/pmcg + dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg + messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg + +/obj/outfit/job/med_tech/event/pmc + name = "Medical Personnel - PMC" + + head = /obj/item/clothing/head/softcap/pmc + uniform = /obj/item/clothing/under/rank/medical/paramedic/pmc + suit = /obj/item/clothing/suit/storage/toggle/para_jacket/pmc + id = /obj/item/card/id/pmc + + backpack_faction = /obj/item/storage/backpack/pmcg + satchel_faction = /obj/item/storage/backpack/satchel/pmcg + dufflebag_faction = /obj/item/storage/backpack/duffel/pmcg + messengerbag_faction = /obj/item/storage/backpack/messenger/pmcg diff --git a/code/game/jobs/faction/zavodskoi.dm b/code/game/jobs/faction/zavodskoi.dm index b19f1e9fbf3..98b36d866d6 100644 --- a/code/game/jobs/faction/zavodskoi.dm +++ b/code/game/jobs/faction/zavodskoi.dm @@ -64,9 +64,9 @@ "Corporate Reporter" = /obj/outfit/job/journalist/zavodskoi, "Corporate Liaison" = /obj/outfit/job/representative/zavodskoi, "Off-Duty Crew Member" = /obj/outfit/job/visitor/zavodskoi, - "Security Personnel" = /obj/outfit/job/officer/zavodskoi, - "Engineering Personnel" = /obj/outfit/job/engineer/zavodskoi, - "Science Personnel" = /obj/outfit/job/scientist/zavodskoi + "Security Personnel" = /obj/outfit/job/officer/event/zavodskoi, + "Engineering Personnel" = /obj/outfit/job/engineer/event/zavodskoi, + "Science Personnel" = /obj/outfit/job/scientist/event/zavodskoi ) /obj/outfit/job/officer/zavodskoi @@ -290,3 +290,38 @@ dufflebag_faction = /obj/item/storage/backpack/duffel/zavod messengerbag_faction = /obj/item/storage/backpack/messenger/zavod +/obj/outfit/job/officer/event/zavodskoi + name = "Security Personnel - Zavodskoi Interstellar" + + uniform = /obj/item/clothing/under/rank/security/zavod + id = /obj/item/card/id/zavodskoi/sec + + backpack_faction = /obj/item/storage/backpack/zavod + satchel_faction = /obj/item/storage/backpack/satchel/zavod + dufflebag_faction = /obj/item/storage/backpack/duffel/zavod + messengerbag_faction = /obj/item/storage/backpack/messenger/zavod + +/obj/outfit/job/scientist/event/zavodskoi + name = "Research Personnel - Zavodskoi Interstellar" + + uniform = /obj/item/clothing/under/rank/scientist/zavod + suit = /obj/item/clothing/suit/storage/toggle/labcoat/zavodskoi + id = /obj/item/card/id/zavodskoi + shoes = /obj/item/clothing/shoes/sneakers/medsci/zavod + + backpack_faction = /obj/item/storage/backpack/zavod + satchel_faction = /obj/item/storage/backpack/satchel/zavod + dufflebag_faction = /obj/item/storage/backpack/duffel/zavod + messengerbag_faction = /obj/item/storage/backpack/messenger/zavod + +/obj/outfit/job/engineer/event/zavodskoi + name = "Engineering Personnel - Zavodskoi Interstellar" + + uniform = /obj/item/clothing/under/rank/engineer/zavod + head = /obj/item/clothing/head/hardhat/red + id = /obj/item/card/id/zavodskoi + + backpack_faction = /obj/item/storage/backpack/zavod + satchel_faction = /obj/item/storage/backpack/satchel/zavod + dufflebag_faction = /obj/item/storage/backpack/duffel/zavod + messengerbag_faction = /obj/item/storage/backpack/messenger/zavod diff --git a/code/game/jobs/faction/zeng_hu.dm b/code/game/jobs/faction/zeng_hu.dm index 0aeecf22dd7..245dd0cc5b0 100644 --- a/code/game/jobs/faction/zeng_hu.dm +++ b/code/game/jobs/faction/zeng_hu.dm @@ -56,8 +56,8 @@ "Corporate Reporter" = /obj/outfit/job/journalist/zeng_hu, "Corporate Liaison" = /obj/outfit/job/representative/zeng_hu, "Off-Duty Crew Member" = /obj/outfit/job/visitor/zeng_hu, - "Science Personnel" = /obj/outfit/job/scientist/zeng_hu, - "Medical Personnel" = /obj/outfit/job/med_tech/zeng_hu + "Science Personnel" = /obj/outfit/job/scientist/event/zeng_hu, + "Medical Personnel" = /obj/outfit/job/med_tech/event/zeng_hu ) /obj/outfit/job/doctor/zeng_hu @@ -258,3 +258,29 @@ satchel_faction = /obj/item/storage/backpack/satchel/zeng dufflebag_faction = /obj/item/storage/backpack/duffel/zeng messengerbag_faction = /obj/item/storage/backpack/messenger/zeng + +/obj/outfit/job/med_tech/event/zeng_hu + name = "Medical Personnel - Zeng-Hu" + + head = /obj/item/clothing/head/softcap/zeng + uniform = /obj/item/clothing/under/rank/medical/paramedic/zeng + suit = /obj/item/clothing/suit/storage/toggle/para_jacket/zeng + id = /obj/item/card/id/zeng_hu + + backpack_faction = /obj/item/storage/backpack/zeng + satchel_faction = /obj/item/storage/backpack/satchel/zeng + dufflebag_faction = /obj/item/storage/backpack/duffel/zeng + messengerbag_faction = /obj/item/storage/backpack/messenger/zeng + +/obj/outfit/job/scientist/event/zeng_hu + name = "Research Personnel - Zeng-Hu" + + uniform = /obj/item/clothing/under/rank/scientist/zeng + suit = /obj/item/clothing/suit/storage/toggle/labcoat/zeng/alt + id = /obj/item/card/id/zeng_hu + shoes = /obj/item/clothing/shoes/sneakers/medsci/zeng + + backpack_faction = /obj/item/storage/backpack/zeng + satchel_faction = /obj/item/storage/backpack/satchel/zeng + dufflebag_faction = /obj/item/storage/backpack/duffel/zeng + messengerbag_faction = /obj/item/storage/backpack/messenger/zeng diff --git a/code/game/jobs/job/event.dm b/code/game/jobs/job/event.dm index 994bb435bf8..ef8a2fb13f4 100644 --- a/code/game/jobs/job/event.dm +++ b/code/game/jobs/job/event.dm @@ -20,10 +20,26 @@ access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_WEAPONS) minimal_player_age = 7 - outfit = /obj/outfit/job/officer + outfit = /obj/outfit/job/officer/event blacklisted_species = list(SPECIES_IPC_ZENGHU, SPECIES_IPC_G1, SPECIES_IPC_G2, SPECIES_IPC_XION, SPECIES_IPC_XION_REMOTE, SPECIES_VAURCA_BULWARK, SPECIES_DIONA_COEUS, SPECIES_VAURCA_BREEDER) +/obj/outfit/job/officer/event + name = "Security Personnel" + suit = /obj/item/clothing/suit/armor/carrier/officer + head = /obj/item/clothing/head/helmet/security + glasses = /obj/item/clothing/glasses/hud/security + species_head = list( + SPECIES_SKRELL = /obj/item/clothing/head/helmet/security/skrell, + SPECIES_SKRELL_AXIORI = /obj/item/clothing/head/helmet/security/skrell + ) + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = list( + /obj/item/gun/projectile/sec = 1 + ) + belt = /obj/item/storage/belt/security/full/disruptor + + /datum/job/eventmed title = "Medical Personnel" flag = EVENTMED @@ -44,10 +60,29 @@ access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_PHARMACY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC) minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_RESEARCH, ACCESS_SEC_DOORS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PARAMEDIC) - outfit = /obj/outfit/job/med_tech + outfit = /obj/outfit/job/med_tech/event blacklisted_species = list(SPECIES_DIONA, SPECIES_DIONA_COEUS, SPECIES_IPC_G2, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) +/obj/outfit/job/med_tech/event + name = "Medical Personnel" + belt = /obj/item/storage/belt/medical/paramedic + belt_contents = list( + /obj/item/reagent_containers/hypospray = 1, + /obj/item/device/healthanalyzer = 1 + ) + glasses = /obj/item/clothing/glasses/hud/health + gloves = /obj/item/clothing/gloves/latex/nitrile + r_ear = /obj/item/device/flashlight/pen + species_gloves = list( + SPECIES_UNATHI = /obj/item/clothing/gloves/latex/nitrile/unathi, + SPECIES_TAJARA = /obj/item/clothing/gloves/latex/nitrile/tajara, + SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/latex/nitrile/tajara, + SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/latex/nitrile/tajara, + SPECIES_VAURCA_WARRIOR = /obj/item/clothing/gloves/latex/nitrile/vaurca, + SPECIES_VAURCA_WORKER = /obj/item/clothing/gloves/latex/nitrile/vaurca + ) + /datum/job/eventeng title = "Engineering Personnel" flag = EVENTENG @@ -68,10 +103,33 @@ access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_LEVIATHAN) minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_SHIP_WEAPONS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_LEVIATHAN) - outfit = /obj/outfit/job/engineer + outfit = /obj/outfit/job/engineer/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) +/obj/outfit/job/engineer/event + name = "Engineering Personnel" + glasses = /obj/item/clothing/glasses/welding + gloves = /obj/item/clothing/gloves/yellow + species_gloves = list( + SPECIES_UNATHI = /obj/item/clothing/gloves/yellow/specialu, + SPECIES_TAJARA = /obj/item/clothing/gloves/yellow/specialt, + SPECIES_TAJARA_MSAI = /obj/item/clothing/gloves/yellow/specialt, + SPECIES_TAJARA_ZHAN = /obj/item/clothing/gloves/yellow/specialt, + SPECIES_VAURCA_WARRIOR = null, + SPECIES_VAURCA_WORKER = null, + SPECIES_VAURCA_BULWARK = null + ) + belt_contents = list( + /obj/item/weldingtool/largetank = 1, + /obj/item/crowbar = 1, + /obj/item/wirecutters = 1, + /obj/item/stack/cable_coil/random = 1, + /obj/item/powerdrill = 1, + /obj/item/device/multitool = 1, + /obj/item/hammer = 1 + ) + /datum/job/eventsci title = "Science Personnel" flag = EVENTSCI @@ -94,9 +152,19 @@ minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_INTREPID) minimal_player_age = 14 - outfit = /obj/outfit/job/scientist + outfit = /obj/outfit/job/scientist/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) +/obj/outfit/job/scientist/event + name = "Research Personnel" + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/device/camera = 1, + /obj/item/device/camera_film = 2, + /obj/item/device/taperecorder = 1 + ) + belt = /obj/item/storage/belt/archaeology/full + /datum/job/eventops title = "Operations Personnel" flag = EVENTOPS @@ -116,6 +184,34 @@ access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_SHIP_WEAPONS, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_ROBOTICS) minimal_access = list(ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_SHIP_WEAPONS, ACCESS_MAILSORTING) - outfit = /obj/outfit/job/hangar_tech + outfit = /obj/outfit/job/hangar_tech/event blacklisted_species = list(SPECIES_VAURCA_BREEDER) + +/obj/outfit/job/hangar_tech/event + name = "Operations Personnel" + backpack_contents = list( + /obj/item/storage/box/survival = 1, + /obj/item/stack/nanopaste = 1, + /obj/item/modular_computer/handheld/preset/supply/cargo_delivery = 1 + ) + belt = /obj/item/storage/belt/utility/full + +/datum/job/eventsrv + title = "Service Personnel" + flag = EVENTSRV + departments = SIMPLEDEPT(DEPARTMENT_SERVICE) + department_flag = EVENTDEPT + faction = "Station" + total_positions = -1 + spawn_positions = -1 + supervisors = "the executive officer" + selection_color = "#90524b" + + minimum_character_age = list( + SPECIES_HUMAN = 18, + SPECIES_SKRELL = 50, + SPECIES_SKRELL_AXIORI = 50 + ) + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN) + outfit = /obj/outfit/job/bartender diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 42154bee645..f719246c7e5 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -68,6 +68,7 @@ var/const/EVENTENG =(1<<1) var/const/EVENTMED =(1<<2) var/const/EVENTSCI =(1<<3) var/const/EVENTOPS =(1<<4) +var/const/EVENTSRV =(1<<5) // Positions Lists @@ -133,7 +134,8 @@ var/list/service_positions = list( "Chef", "Janitor", "Librarian", - "Chaplain" + "Chaplain", + "Service Personnel" ) var/list/civilian_positions = list( diff --git a/code/modules/client/preference_setup/loadout/items/factions.dm b/code/modules/client/preference_setup/loadout/items/factions.dm index 8bf62b3c00b..4fbdab8b514 100644 --- a/code/modules/client/preference_setup/loadout/items/factions.dm +++ b/code/modules/client/preference_setup/loadout/items/factions.dm @@ -58,7 +58,7 @@ slot = slot_w_uniform cost = 1 faction = "Idris Incorporated" - allowed_roles = list("Janitor") + allowed_roles = list("Janitor", "Service Personnel") /datum/gear/faction/idris_sunglasses display_name = "idris security HUD selection" @@ -625,7 +625,7 @@ slot = slot_w_uniform cost = 1 faction = "NanoTrasen" - allowed_roles = list("Janitor") + allowed_roles = list("Janitor", "Service Personnel") /datum/gear/faction/nt_headwear display_name = "nanotrasen headwear selection" diff --git a/html/changelogs/RustingWithYou - eventjob2.yml b/html/changelogs/RustingWithYou - eventjob2.yml new file mode 100644 index 00000000000..32cdc979490 --- /dev/null +++ b/html/changelogs/RustingWithYou - eventjob2.yml @@ -0,0 +1,59 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: RustingWithYou + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds the event service job." + - qol: "Event jobs now have their own outfits."