From e58c807b8ca247bd044d1a8d338a2827a109911f Mon Sep 17 00:00:00 2001 From: Alberyk Date: Thu, 2 Sep 2021 15:13:08 -0300 Subject: [PATCH] jobs --- aurorastation.dme | 1 + code/game/jobs/access_datum.dm | 4 - code/game/jobs/job/captain.dm | 67 ++++++- code/game/jobs/job/civilian.dm | 41 ++-- code/game/jobs/job/engineering.dm | 14 +- code/game/jobs/job/operations.dm | 177 ++++++++++++++++++ code/game/jobs/jobs.dm | 16 +- .../items/devices/radio/encryptionkey.dm | 5 + .../objects/items/devices/radio/headset.dm | 27 ++- code/game/objects/structures/window.dm | 3 +- maps/placeholder/code/placeholder.dm | 6 + maps/placeholder/code/placeholder_areas.dm | 6 +- 12 files changed, 321 insertions(+), 46 deletions(-) create mode 100644 code/game/jobs/job/operations.dm diff --git a/aurorastation.dme b/aurorastation.dme index ee1a0a08d9d..b43bbe0cf10 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -671,6 +671,7 @@ #include "code\game\jobs\job\engineering.dm" #include "code\game\jobs\job\job.dm" #include "code\game\jobs\job\medical.dm" +#include "code\game\jobs\job\operations.dm" #include "code\game\jobs\job\science.dm" #include "code\game\jobs\job\security.dm" #include "code\game\jobs\job\silicon.dm" diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 2ce413fdae2..714ac52d6f6 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -423,10 +423,6 @@ var/const/access_consular = 72 id = access_consular desc = "Consular" -var/const/access_pilot = 73 -/datum/access/pilot - id = access_pilot - desc = "Pilot" /****************** * Central Command * diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index 400328d8de8..b0b899b2fb6 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -33,16 +33,16 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) head = /obj/item/clothing/head/caphat glasses = /obj/item/clothing/glasses/sunglasses id = /obj/item/card/id/gold - + headset = /obj/item/device/radio/headset/heads/captain bowman = /obj/item/device/radio/headset/heads/captain/alt double_headset = /obj/item/device/radio/headset/alt/double/captain wrist_radio = /obj/item/device/radio/headset/wrist/captain - + tab_pda = /obj/item/modular_computer/handheld/pda/command/captain wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/captain tablet = /obj/item/modular_computer/handheld/preset/command/captain - + backpack_contents = list( /obj/item/storage/box/ids = 1 ) @@ -112,18 +112,73 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) uniform = /obj/item/clothing/under/rank/head_of_personnel shoes = /obj/item/clothing/shoes/brown id = /obj/item/card/id/navy - + headset = /obj/item/device/radio/headset/heads/hop bowman = /obj/item/device/radio/headset/heads/hop/alt double_headset = /obj/item/device/radio/headset/alt/double/hop wrist_radio = /obj/item/device/radio/headset/wrist/hop - + tab_pda = /obj/item/modular_computer/handheld/pda/command/hop wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/hop tablet = /obj/item/modular_computer/handheld/preset/command/hop - + backpack_contents = list( /obj/item/storage/box/ids = 1 ) messengerbag = /obj/item/storage/backpack/messenger/com + +/datum/job/xo + title = "Executive Officer" + flag = XO + departments = list(DEPARTMENT_CIVILIAN = JOBROLE_SUPERVISOR, DEPARTMENT_COMMAND) + department_flag = ENGSEC + faction = "Station" + total_positions = 1 + spawn_positions = 1 + intro_prefix = "the" + supervisors = "the captain" + selection_color = "#90524b" + minimal_player_age = 10 + economic_modifier = 10 + ideal_character_age = 50 + + minimum_character_age = 30 + + outfit = /datum/outfit/job/xo + + access = list(access_sec_doors, access_medical, access_engine, access_change_ids, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, + access_crematorium, access_kitchen, access_hydroponics,access_chapel_office, access_library, access_research, + access_mining, access_mining_station, access_janitor, access_hop, access_RC_announce, access_keycard_auth, + access_gateway, access_weapons, access_journalist) + minimal_access = list(access_sec_doors, access_medical, access_engine, access_change_ids, access_eva, access_heads, + access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, + access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, + access_chapel_office, access_library, access_research, access_mining, access_mining_station, access_janitor, + access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) + + blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR) + +/datum/outfit/job/xo + name = "Executive Officer" + jobtype = /datum/job/xo + + uniform = /obj/item/clothing/under/rank/head_of_personnel + shoes = /obj/item/clothing/shoes/brown + id = /obj/item/card/id/navy + + headset = /obj/item/device/radio/headset/heads/hop + bowman = /obj/item/device/radio/headset/heads/hop/alt + double_headset = /obj/item/device/radio/headset/alt/double/hop + wrist_radio = /obj/item/device/radio/headset/wrist/hop + + tab_pda = /obj/item/modular_computer/handheld/pda/command/hop + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/command/hop + tablet = /obj/item/modular_computer/handheld/preset/command/hop + + backpack_contents = list( + /obj/item/storage/box/ids = 1 + ) + + messengerbag = /obj/item/storage/backpack/messenger/com \ No newline at end of file diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 2ed26c392e2..e7feecc7fcc 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -23,11 +23,11 @@ uniform = /obj/item/clothing/under/rank/bartender shoes = /obj/item/clothing/shoes/black - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/bartender wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/bartender tablet = /obj/item/modular_computer/handheld/preset/civilian/bartender - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service @@ -60,11 +60,11 @@ suit = /obj/item/clothing/suit/chef head = /obj/item/clothing/head/chefhat shoes = /obj/item/clothing/shoes/black - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service @@ -75,7 +75,7 @@ ) /datum/job/hydro - title = "Gardener" + title = "Hydroponicist" flag = BOTANIST departments = SIMPLEDEPT(DEPARTMENT_CIVILIAN) department_flag = CIVILIAN @@ -89,7 +89,6 @@ access = list(access_hydroponics, access_bar, access_kitchen) minimal_access = list(access_hydroponics) - alt_titles = list("Hydroponicist") outfit = /datum/outfit/job/hydro /datum/outfit/job/hydro @@ -100,11 +99,11 @@ suit = /obj/item/clothing/suit/apron shoes = /obj/item/clothing/shoes/black suit_store = /obj/item/device/analyzer/plant_analyzer - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian tablet = /obj/item/modular_computer/handheld/preset/civilian - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service @@ -154,11 +153,11 @@ shoes = /obj/item/clothing/shoes/brown l_hand = /obj/item/clipboard glasses = /obj/item/clothing/glasses/sunglasses - + tab_pda = /obj/item/modular_computer/handheld/pda/supply/qm wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/qm tablet = /obj/item/modular_computer/handheld/preset/supply/qm - + headset = /obj/item/device/radio/headset/qm bowman = /obj/item/device/radio/headset/qm/alt double_headset = /obj/item/device/radio/headset/alt/double/qm @@ -189,11 +188,11 @@ uniform = /obj/item/clothing/under/rank/cargo id = /obj/item/card/id/silver shoes = /obj/item/clothing/shoes/brown - + tab_pda = /obj/item/modular_computer/handheld/pda/supply wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply tablet = /obj/item/modular_computer/handheld/preset/supply - + headset = /obj/item/device/radio/headset/headset_cargo bowman = /obj/item/device/radio/headset/headset_cargo/alt double_headset = /obj/item/device/radio/headset/alt/double/cargo @@ -228,11 +227,11 @@ id = /obj/item/card/id/silver shoes = /obj/item/clothing/shoes/black l_hand = /obj/item/coin/mining - + tab_pda = /obj/item/modular_computer/handheld/pda/supply/miner wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/miner tablet = /obj/item/modular_computer/handheld/preset/civilian - + headset = /obj/item/device/radio/headset/headset_mining bowman = /obj/item/device/radio/headset/headset_mining/alt double_headset = /obj/item/device/radio/headset/alt/double/mining @@ -273,11 +272,11 @@ uniform = /obj/item/clothing/under/rank/janitor shoes = /obj/item/clothing/shoes/black - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/janitor wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/janitor tablet = /obj/item/modular_computer/handheld/preset/civilian/janitor - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service @@ -309,11 +308,11 @@ uniform = /obj/item/clothing/under/suit_jacket/red shoes = /obj/item/clothing/shoes/black - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service @@ -329,7 +328,7 @@ uniform = /obj/item/clothing/under/suit_jacket/red shoes = /obj/item/clothing/shoes/black - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian @@ -364,11 +363,11 @@ shoes = /obj/item/clothing/shoes/black r_pocket = /obj/item/barcodescanner l_hand = /obj/item/storage/bag/books - + tab_pda = /obj/item/modular_computer/handheld/pda/civilian/librarian wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/civilian/librarian tablet = /obj/item/modular_computer/handheld/preset/civilian/librarian - + headset = /obj/item/device/radio/headset/headset_service bowman = /obj/item/device/radio/headset/headset_service/alt double_headset = /obj/item/device/radio/headset/alt/double/service diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index fbef7b82ec3..59890e9aa78 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -39,7 +39,7 @@ id = /obj/item/card/id/navy shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/device/t_scanner - + headset = /obj/item/device/radio/headset/heads/ce bowman = /obj/item/device/radio/headset/heads/ce/alt double_headset = /obj/item/device/radio/headset/alt/double/ce @@ -48,7 +48,7 @@ tab_pda = /obj/item/modular_computer/handheld/pda/engineering/ce wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering/ce tablet = /obj/item/modular_computer/handheld/preset/engineering/ce - + backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel_eng dufflebag = /obj/item/storage/backpack/duffel/eng @@ -64,7 +64,7 @@ H.equip_to_slot_or_del(new /obj/item/clothing/gloves/black(H), slot_gloves) /datum/job/engineer - title = "Station Engineer" + title = "Engineer" flag = ENGINEER departments = SIMPLEDEPT(DEPARTMENT_ENGINEERING) department_flag = ENGSEC @@ -91,7 +91,7 @@ id = /obj/item/card/id/silver shoes = /obj/item/clothing/shoes/workboots r_pocket = /obj/item/device/t_scanner - + headset = /obj/item/device/radio/headset/headset_eng bowman = /obj/item/device/radio/headset/headset_eng/alt double_headset = /obj/item/device/radio/headset/alt/double/eng @@ -100,7 +100,7 @@ tab_pda = /obj/item/modular_computer/handheld/pda/engineering wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/engineering tablet = /obj/item/modular_computer/handheld/preset/engineering - + backpack = /obj/item/storage/backpack/industrial satchel = /obj/item/storage/backpack/satchel_eng dufflebag = /obj/item/storage/backpack/duffel/eng @@ -141,7 +141,7 @@ belt = /obj/item/storage/belt/utility id = /obj/item/card/id/silver shoes = /obj/item/clothing/shoes/workboots - + headset = /obj/item/device/radio/headset/headset_eng bowman = /obj/item/device/radio/headset/headset_eng/alt double_headset = /obj/item/device/radio/headset/alt/double/eng @@ -191,7 +191,7 @@ shoes = /obj/item/clothing/shoes/orange head = /obj/item/clothing/head/beret/engineering belt = /obj/item/storage/belt/utility - + belt_contents = list( /obj/item/weldingtool = 1, /obj/item/crowbar = 1, diff --git a/code/game/jobs/job/operations.dm b/code/game/jobs/job/operations.dm new file mode 100644 index 00000000000..6781bdbdae3 --- /dev/null +++ b/code/game/jobs/job/operations.dm @@ -0,0 +1,177 @@ +/datum/job/supply_manager + title = "Supply Manager" + flag = SUPPLY_MANAGER + departments = list(DEPARTMENT_CARGO = JOBROLE_SUPERVISOR) + department_flag = CIVILIAN + faction = "Station" + total_positions = 1 + spawn_positions = 1 + supervisors = "the captain" + selection_color = "#90524b" + economic_modifier = 5 + + minimum_character_age = 22 + + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_keycard_auth, + access_heads, access_eva, access_teleporter) + minimal_access = list(access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_keycard_auth, + access_heads) + + ideal_character_age = 40 + + outfit = /datum/outfit/job/supply_manager + +/datum/outfit/job/supply_manager + name = "Supply Manager" + jobtype = /datum/job/supply_manager + + uniform = /obj/item/clothing/under/rank/quartermaster + shoes = /obj/item/clothing/shoes/brown + l_hand = /obj/item/clipboard + glasses = /obj/item/clothing/glasses/sunglasses + + tab_pda = /obj/item/modular_computer/handheld/pda/supply/qm + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/qm + tablet = /obj/item/modular_computer/handheld/preset/supply/qm + + headset = /obj/item/device/radio/headset/qm + bowman = /obj/item/device/radio/headset/qm/alt + double_headset = /obj/item/device/radio/headset/alt/double/qm + wrist_radio = /obj/item/device/radio/headset/wrist/cargo/qm + + +/datum/job/supply_tech + title = "Supply Technician" + flag = SUPPLY_TECH + departments = SIMPLEDEPT(DEPARTMENT_CARGO) + department_flag = CIVILIAN + faction = "Station" + total_positions = 3 + spawn_positions = 3 + supervisors = "the supply manager" + selection_color = "#90524b" + + minimum_character_age = 18 + + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station) + minimal_access = list(access_cargo, access_cargo_bot, access_mailsorting) + outfit = /datum/outfit/job/supply_tech + +/datum/outfit/job/supply_tech + name = "Supply Technician" + jobtype = /datum/job/supply_tech + + uniform = /obj/item/clothing/under/rank/cargo + id = /obj/item/card/id/silver + shoes = /obj/item/clothing/shoes/brown + + tab_pda = /obj/item/modular_computer/handheld/pda/supply + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply + tablet = /obj/item/modular_computer/handheld/preset/supply + + headset = /obj/item/device/radio/headset/headset_cargo + bowman = /obj/item/device/radio/headset/headset_cargo/alt + double_headset = /obj/item/device/radio/headset/alt/double/cargo + wrist_radio = /obj/item/device/radio/headset/wrist/cargo + + +/datum/job/prospector + title = "Prospector" + flag = PROSPECTOR + departments = SIMPLEDEPT(DEPARTMENT_CARGO) + department_flag = CIVILIAN + faction = "Station" + total_positions = 3 + spawn_positions = 3 + supervisors = "the supply manager" + selection_color = "#90524b" + economic_modifier = 5 + + minimum_character_age = 18 + + access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station) + minimal_access = list(access_mining, access_mining_station, access_mailsorting) + outfit = /datum/outfit/job/prospector + +/datum/outfit/job/prospector + name = "Prospector" + jobtype = /datum/job/prospector + + uniform = /obj/item/clothing/under/rank/miner + id = /obj/item/card/id/silver + shoes = /obj/item/clothing/shoes/black + l_hand = /obj/item/coin/mining + + tab_pda = /obj/item/modular_computer/handheld/pda/supply/miner + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/pda/supply/miner + tablet = /obj/item/modular_computer/handheld/preset/civilian + + headset = /obj/item/device/radio/headset/headset_mining + bowman = /obj/item/device/radio/headset/headset_mining/alt + double_headset = /obj/item/device/radio/headset/alt/double/mining + wrist_radio = /obj/item/device/radio/headset/wrist/cargo/mining + + backpack_contents = list( + /obj/item/storage/bag/ore = 1 + ) + + backpack = /obj/item/storage/backpack/industrial + satchel = /obj/item/storage/backpack/satchel_eng + dufflebag = /obj/item/storage/backpack/duffel/eng + messengerbag = /obj/item/storage/backpack/messenger/engi + + +/datum/job/manufacturing_tech + title = "Manufacturing Technician" + flag = MANUFACTURING_TECH + departments = SIMPLEDEPT(DEPARTMENT_CARGO) + department_flag = CIVILIAN + faction = "Station" + total_positions = 2 + spawn_positions = 2 + supervisors = "the supply manager" + selection_color = "#a44799" + economic_modifier = 5 + + minimum_character_age = 25 + + access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue) + minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) + + minimal_player_age = 7 + + outfit = /datum/outfit/job/roboticist + +/datum/outfit/job/roboticist + name = "Manufacturing Technician" + jobtype = /datum/job/roboticist + + uniform = /obj/item/clothing/under/rank/roboticist + suit = /obj/item/clothing/suit/storage/toggle/labcoat + shoes = /obj/item/clothing/shoes/black + id = /obj/item/card/id/white + belt = /obj/item/storage/belt/utility + + headset = /obj/item/device/radio/headset/headset_sci + bowman = /obj/item/device/radio/headset/headset_sci/alt + double_headset = /obj/item/device/radio/headset/alt/double/sci + wrist_radio = /obj/item/device/radio/headset/wrist/sci + + tab_pda = /obj/item/modular_computer/handheld/pda/research/robotics + wristbound = /obj/item/modular_computer/handheld/wristbound/preset/advanced/research/robotics + tablet = /obj/item/modular_computer/handheld/preset/research/robotics + + backpack = /obj/item/storage/backpack/toxins + satchel = /obj/item/storage/backpack/satchel_tox + dufflebag = /obj/item/storage/backpack/duffel/tox + messengerbag = /obj/item/storage/backpack/messenger/tox + + belt_contents = list( + /obj/item/screwdriver = 1, + /obj/item/wrench = 1, + /obj/item/weldingtool = 1, + /obj/item/crowbar = 1, + /obj/item/wirecutters = 1, + /obj/item/stack/cable_coil/random = 1, + /obj/item/powerdrill = 1 + ) diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index 67c6a0738e7..4bb84bb8064 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -13,6 +13,7 @@ var/const/AI =(1<<8) var/const/CYBORG =(1<<9) var/const/INTERN_SEC =(1<<10) var/const/INTERN_ENG =(1<<11) +var/const/XO =(1<<12) var/const/MEDSCI =(1<<1) @@ -49,6 +50,9 @@ var/const/CONSULAR =(1<<12) var/const/MERCHANT =(1<<13) var/const/JOURNALIST =(1<<14) var/const/ASSISTANT =(1<<15) +var/const/SUPPLY_MANAGER =(1<<16) +var/const/SUPPLY_TECH =(1<<17) +var/const/PROSPECTOR =(1<<18) var/list/command_positions = list( @@ -57,13 +61,15 @@ var/list/command_positions = list( "Head of Security", "Chief Engineer", "Research Director", - "Chief Medical Officer" + "Chief Medical Officer", + "Executive Officer", + "Supply Manager" ) var/list/engineering_positions = list( "Chief Engineer", - "Station Engineer", + "Engineer", "Atmospheric Technician", "Engineering Apprentice" ) @@ -92,7 +98,11 @@ var/list/science_positions = list( var/list/cargo_positions = list( "Quartermaster", "Cargo Technician", - "Shaft Miner" + "Shaft Miner", + "Supply Manager", + "Supply Technician", + "Prospector", + "Manufacturing Technician" ) var/list/civilian_positions = list( diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 658ad00bf48..904285a8f2d 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -141,6 +141,11 @@ icon_state = "hop_cypherkey" channels = list(CHANNEL_SUPPLY = TRUE, CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE) +/obj/item/device/encryptionkey/heads/xo + name = "executive officer's encryption key" + icon_state = "hop_cypherkey" + channels = list(CHANNEL_SERVICE = TRUE, CHANNEL_COMMAND = TRUE, CHANNEL_SECURITY = TRUE, CHANNEL_PENAL = TRUE) + /obj/item/device/encryptionkey/headset_cargo name = "supply radio encryption key" icon_state = "cargo_cypherkey" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index e92be9603a8..10f10909776 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -84,7 +84,7 @@ if(slot_flags & SLOT_TWOEARS) var/obj/item/clothing/ears/OE = (H.l_ear == src ? H.r_ear : H.l_ear) qdel(OE) - + ..() /obj/item/device/radio/headset/attackby(obj/item/W, mob/user) @@ -200,7 +200,7 @@ to_chat(usr, SPAN_NOTICE("\The [src] will now layer [normal_layer ? "under" : "over"] your outerwear.")) if (ismob(src.loc)) var/mob/M = src.loc - M.update_inv_wrists() + M.update_inv_wrists() /* * Civillian @@ -252,6 +252,29 @@ item_state = "wristset_HoP" ks2type = /obj/item/device/encryptionkey/heads/hop +/obj/item/device/radio/headset/heads/xo + name = "executive officer's headset" + desc = "The headset of the guy who will one day be captain." + icon_state = "hop_headset" + ks2type = /obj/item/device/encryptionkey/heads/hop + +/obj/item/device/radio/headset/heads/hop/xo + name = "executive officer's bowman headset" + icon_state = "hop_headset_alt" + item_state = "headset_alt" + +/obj/item/device/radio/headset/alt/double/xo + name = "executive officer's soundproof headset" + icon_state = "earset_HoP" + item_state = "earset_HoP" + ks2type = /obj/item/device/encryptionkey/heads/xo + +/obj/item/device/radio/headset/wrist/hop + name = "executive officer's wristbound radio" + icon_state = "wristset_HoP" + item_state = "wristset_HoP" + ks2type = /obj/item/device/encryptionkey/heads/xo + /* * Engineering */ diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 8d14a09db29..961c3e60553 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -502,8 +502,7 @@ maxhealth = 500 smooth = SMOOTH_MORE|SMOOTH_DIAGONAL canSmoothWith = list( - /obj/structure/window/shuttle/scc_space_ship, - /turf/simulated/wall/shuttle/scc_space_ship + /obj/structure/window/shuttle/scc_space_ship ) /obj/structure/window/shuttle/scc_space_ship/cardinal diff --git a/maps/placeholder/code/placeholder.dm b/maps/placeholder/code/placeholder.dm index 83dfac59698..799cab30a36 100644 --- a/maps/placeholder/code/placeholder.dm +++ b/maps/placeholder/code/placeholder.dm @@ -66,6 +66,12 @@ /datum/shuttle/autodock/ferry/lift/placeholder/morgue ) + allowed_jobs = list(/datum/job/captain, /datum/job/xo, /datum/job/chief_engineer, /datum/job/cmo, /datum/job/hos, /datum/job/ai, /datum/job/cyborg, + /datum/job/bartender, /datum/job/chef, /datum/job/hydro, /datum/job/janitor, /datum/job/journalist, /datum/job/librarian, /datum/job/chaplain, + /datum/job/doctor, /datum/job/surgeon, /datum/job/pharmacist, /datum/job/psychiatrist, /datum/job/med_tech, /datum/job/intern_med, + /datum/job/engineer, /datum/job/atmos, /datum/job/intern_eng, /datum/job/warden, /datum/job/investigator, /datum/job/officer, /datum/job/intern_sec, + /datum/job/assistant) + //datum/map/aurora/generate_asteroid() // // Create the chasms. // new /datum/random_map/automata/cave_system/chasms(null,0,0,3,255,255) diff --git a/maps/placeholder/code/placeholder_areas.dm b/maps/placeholder/code/placeholder_areas.dm index 56af5cbbc4f..acf8e6063bf 100644 --- a/maps/placeholder/code/placeholder_areas.dm +++ b/maps/placeholder/code/placeholder_areas.dm @@ -198,4 +198,8 @@ /area/engineering/atmos/propulsion/starboard name = "Starboard Propulsion" - icon_state = "blue-red2" \ No newline at end of file + icon_state = "blue-red2" + +//Bridge +/area/crew_quarters/heads/hop/xo + name = "Command - Executive Officer's Office" \ No newline at end of file