diff --git a/code/controllers/subsystems/ticker.dm b/code/controllers/subsystems/ticker.dm index 939fbe00e6..35ab98aba9 100644 --- a/code/controllers/subsystems/ticker.dm +++ b/code/controllers/subsystems/ticker.dm @@ -403,17 +403,17 @@ var/global/datum/controller/subsystem/ticker/ticker for(var/mob/new_player/player in player_list) if(player && player.ready && player.mind?.assigned_role) var/datum/job/J = SSjob.get_job(player.mind.assigned_role) - + // Snowflakey AI treatment if(J?.mob_type & JOB_SILICON_AI) player.close_spawn_windows() player.AIize(move = TRUE) continue - + // Ask their new_player mob to spawn them if(!player.spawn_checks_vr(player.mind.assigned_role)) continue //VOREStation Add var/mob/living/carbon/human/new_char = player.create_character() - + // Created their playable character, delete their /mob/new_player if(new_char) qdel(player) @@ -445,7 +445,7 @@ var/global/datum/controller/subsystem/ticker/ticker if(captainless) for(var/mob/M in player_list) if(!istype(M,/mob/new_player)) - to_chat(M, "Colony Directorship not forced on anyone.") + to_chat(M, "Site Management is not forced on anyone.") /datum/controller/subsystem/ticker/proc/declare_completion() diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index 0136314d58..89abedd726 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -297,9 +297,9 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) to_chat(M, "
") - to_chat(M, "THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED") + to_chat(M, "THE SITE MANAGER, HOP AND HOS ARE [who2]...LAWS UPDATED") to_chat(M, "
") - M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]") + M.add_ion_law("THE SITE MANAGER, HOP AND HOS ARE [who2]") if(6) to_chat(M, "
") to_chat(M, "THE STATION IS BUILT FOR [who2]...LAWS UPDATED") diff --git a/code/game/machinery/computer3/computers/card.dm b/code/game/machinery/computer3/computers/card.dm index 5647ff0ceb..35eb699531 100644 --- a/code/game/machinery/computer3/computers/card.dm +++ b/code/game/machinery/computer3/computers/card.dm @@ -35,8 +35,8 @@ var jobs_all = "" jobs_all += "" - jobs_all += ""//Colony Director in special because he is head of heads ~Intercross21 - jobs_all += "" + jobs_all += ""//Site Manager in special because he is head of heads ~Intercross21 + jobs_all += "" jobs_all += "" counter = 0 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6304820087..4e30affc1a 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -139,7 +139,7 @@ if("door") toggle_open(usr) . = TRUE - if("dispense") + if("dispense") switch(params["item"]) if("helmet") dispense_helmet(usr) @@ -653,12 +653,12 @@ name = "Vintage Pilot suit cycler" model_text = "Vintage Pilot" departments = list("Vintage Pilot (Bubble Helm)","Vintage Pilot (Closed Helm)") - + /obj/machinery/suit_cycler/vintage/medsci name = "Vintage MedSci suit cycler" model_text = "Vintage MedSci" departments = list("Vintage Medical (Bubble Helm)","Vintage Medical (Closed Helm)","Vintage Research (Bubble Helm)","Vintage Research (Closed Helm)") - + /obj/machinery/suit_cycler/vintage/rugged name = "Vintage Ruggedized suit cycler" model_text = "Vintage Ruggedized" @@ -751,7 +751,7 @@ if(istype(I,/obj/item/clothing/head/helmet/space/void/autolok)) to_chat(user, "You cannot refit an autolok helmet. In fact you shouldn't even be able to remove it in the first place. Inform an admin!") return - + //Ditto the Mk7 if(istype(I,/obj/item/clothing/head/helmet/space/void/responseteam)) to_chat(user, "The cycler indicates that the Mark VII Emergency Response Helmet is not compatible with the refitting system. How did you manage to detach it anyway? Inform an admin!") @@ -791,13 +791,13 @@ if(istype(I,/obj/item/clothing/suit/space/void/autolok)) to_chat(user, "You cannot refit an autolok suit.") return - + //Ditto the Mk7 if(istype(I,/obj/item/clothing/suit/space/void/responseteam)) to_chat(user, "The cycler indicates that the Mark VII Emergency Response Suit is not compatible with the refitting system.") return //VOREStation Edit ENDS - + to_chat(user, "You fit \the [I] into the suit cycler.") user.drop_item() I.loc = src @@ -886,7 +886,7 @@ return TRUE switch(action) - if("dispense") + if("dispense") switch(params["item"]) if("helmet") helmet.forceMove(get_turf(src)) @@ -895,23 +895,23 @@ suit.forceMove(get_turf(src)) suit = null . = TRUE - + if("department") var/choice = params["department"] if(choice in departments) target_department = choice . = TRUE - + if("species") var/choice = params["species"] if(choice in species) target_species = choice . = TRUE - + if("radlevel") radiation_level = clamp(params["radlevel"], 1, emagged ? 5 : 3) . = TRUE - + if("repair_suit") if(!suit || !can_repair) return @@ -1055,7 +1055,7 @@ if(target_species) if(helmet) helmet.refit_for_species(target_species) - if(suit) + if(suit) suit.refit_for_species(target_species) if(suit.helmet) suit.helmet.refit_for_species(target_species) @@ -1176,7 +1176,7 @@ parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary //BEGIN: Space for additional downstream variants //VOREStation Addition Start - if("Director") + if("Manager") parent_helmet = /obj/item/clothing/head/helmet/space/void/captain parent_suit = /obj/item/clothing/suit/space/void/captain if("Prototype") @@ -1217,7 +1217,7 @@ parent_suit = /obj/item/clothing/suit/space/void/refurb/mercenary/talon //VOREStation Addition End //END: downstream variant space - + //look at this! isn't it beautiful? -KK (well ok not beautiful but it's a lot cleaner) if(helmet && target_department != "No Change") var/obj/item/clothing/H = new parent_helmet @@ -1235,9 +1235,9 @@ suit.desc = initial(parent_suit.desc) suit.icon_state = initial(parent_suit.icon_state) suit.item_state = initial(parent_suit.item_state) - suit.item_state_slots = S.item_state_slots + suit.item_state_slots = S.item_state_slots qdel(S) - + //can't believe I forgot to fix this- now helmets will properly cycle if they're attached to a suit -KK if(suit.helmet && target_department != "No Change") var/obj/item/clothing/AH = new parent_helmet diff --git a/code/game/machinery/suit_storage_unit_vr.dm b/code/game/machinery/suit_storage_unit_vr.dm index 28f18eacb6..3702914e32 100644 --- a/code/game/machinery/suit_storage_unit_vr.dm +++ b/code/game/machinery/suit_storage_unit_vr.dm @@ -1,5 +1,5 @@ /obj/machinery/suit_cycler - departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Director","Prototype") + departments = list("Engineering","Mining","Medical","Security","Atmos","HAZMAT","Construction","Biohazard","Emergency Medical Response","Crowd Control","Exploration","Pilot Blue","Pilot","Manager","Prototype") species = list(SPECIES_HUMAN, SPECIES_SKRELL, SPECIES_UNATHI, SPECIES_TAJ, SPECIES_TESHARI, SPECIES_AKULA, SPECIES_SERGAL, SPECIES_VULPKANIN) // Old Exploration is too WIP to use right now @@ -11,10 +11,10 @@ req_access = list(access_pilot) /obj/machinery/suit_cycler/captain - name = "Director suit cycler" - model_text = "Director" + name = "Manager suit cycler" + model_text = "Manager" req_access = list(access_captain) - departments = list("Director") + departments = list("Manager") /obj/machinery/suit_cycler/captain/Initialize() //No Teshari Sprites species -= SPECIES_TESHARI diff --git a/code/game/objects/items/devices/radio/encryptionkey_vr.dm b/code/game/objects/items/devices/radio/encryptionkey_vr.dm index 1f6110d16a..f492f097ed 100644 --- a/code/game/objects/items/devices/radio/encryptionkey_vr.dm +++ b/code/game/objects/items/devices/radio/encryptionkey_vr.dm @@ -10,7 +10,7 @@ channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) /obj/item/device/encryptionkey/heads/captain - name = "colony director's encryption key" + name = "site manager's encryption key" icon_state = "cap_cypherkey" channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm index efb2379fb0..858dfd48ce 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories_vr.dm @@ -50,8 +50,8 @@ path = /obj/item/clothing/accessory/collar/holo/indigestible /datum/gear/accessory/holster - display_name = "holster selection (Security, CD, HoP, Exploration)" - allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder") + display_name = "holster selection (Security, SM, HoP, Exploration)" + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective","Explorer","Pathfinder") /datum/gear/accessory/brown_vest display_name = "webbing, brown (Eng, Sec, Med, Exploration, Miner)" diff --git a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm index baa19d0aec..6961c1cada 100644 --- a/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_eyes_vr.dm @@ -17,7 +17,7 @@ display_name = "AR-S glasses (Sec)" path = /obj/item/clothing/glasses/omnihud/sec allowed_roles = list("Security Officer","Head of Security","Warden","Detective") - + /datum/gear/eyes/arglasses/sci display_name = "AR-R glasses (Sci)" path = /obj/item/clothing/glasses/omnihud/rnd @@ -34,10 +34,10 @@ allowed_roles = list("Medical Doctor","Chief Medical Officer","Chemist","Paramedic","Geneticist", "Psychiatrist", "Field Medic") /datum/gear/eyes/arglasses/all - display_name = "AR-B glasses (CD, HoP)" + display_name = "AR-B glasses (SM, HoP)" path = /obj/item/clothing/glasses/omnihud/all cost = 2 - allowed_roles = list("Colony Director","Head of Personnel") + allowed_roles = list("Site Manager","Head of Personnel") /datum/gear/eyes/spiffygogs display_name = "slick orange goggles" diff --git a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm index 6cbe17bce3..a01f2ff64a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_fluffitems_vr.dm @@ -411,7 +411,7 @@ display_name = "Ace's Holster" ckeywhitelist = list("jertheace") character_name = list("Jeremiah Acacius") - allowed_roles = list("Colony Director", "Warden", "Head of Security") + allowed_roles = list("Site Manager", "Warden", "Head of Security") /datum/gear/fluff/jeremiah_boots path = /obj/item/clothing/shoes/boots/combat @@ -439,7 +439,7 @@ display_name = "Katarina's Backpack" ckeywhitelist = list("joanrisu") character_name = list("Katarina Eine") - allowed_roles = list("Colony Director", "Warden", "Head of Security") + allowed_roles = list("Site Manager", "Warden", "Head of Security") /datum/gear/fluff/emoticon_box path = /obj/item/weapon/storage/box/fluff/emoticon @@ -759,7 +759,7 @@ slot = slot_wear_suit ckeywhitelist = list("samanthafyre") character_name = list("Kateryna Petrovitch") - allowed_roles = list("Security Officer", "Warden", "Head of Security", "Colony Director", "Head of Personnel") + allowed_roles = list("Security Officer", "Warden", "Head of Security", "Site Manager", "Head of Personnel") /datum/gear/fluff/viktor_flask path = /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask/fluff/viktor @@ -792,14 +792,14 @@ display_name = "NT-HASD 556's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("NT-HASD #556") - allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") /datum/gear/fluff/serdykov_modkit //Also converts a Security suit's sprite path = /obj/item/device/modkit_conversion/fluff/serdykit display_name = "Serdykov Antoz's Modkit" ckeywhitelist = list("silencedmp5a5") character_name = list("Serdykov Antoz") - allowed_roles = list("Colony Director", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") + allowed_roles = list("Site Manager", "Head of Personnel", "Security Officer", "Warden", "Head of Security","Detective") /datum/gear/fluff/tasy_clownuniform path = /obj/item/clothing/under/sexyclown diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm index 282ba1b267..394c236f14 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform_vr.dm @@ -11,7 +11,7 @@ /datum/gear/uniform/job_khi/cmd display_name = "khi uniform, cmd" path = /obj/item/clothing/under/rank/khi/cmd - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_khi/sec display_name = "khi uniform, sec" @@ -54,7 +54,7 @@ /datum/gear/uniform/job_trek/cmd/tos display_name = "TOS uniform, cmd" path = /obj/item/clothing/under/rank/trek/command - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tos display_name = "TOS uniform, med/sci" @@ -70,7 +70,7 @@ /datum/gear/uniform/job_trek/cmd/tng display_name = "TNG uniform, cmd" path = /obj/item/clothing/under/rank/trek/command/next - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/tng display_name = "TNG uniform, med/sci" @@ -86,7 +86,7 @@ /datum/gear/uniform/job_trek/cmd/voy display_name = "VOY uniform, cmd" path = /obj/item/clothing/under/rank/trek/command/voy - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/voy display_name = "VOY uniform, med/sci" @@ -103,7 +103,7 @@ /datum/gear/suit/job_trek/ds9_coat display_name = "DS9 Overcoat (use uniform)" path = /obj/item/clothing/suit/storage/trek/ds9 - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director", + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director", "Chief Medical Officer","Medical Doctor","Chemist","Paramedic","Geneticist", "Scientist","Roboticist","Xenobiologist","Atmospheric Technician", "Station Engineer","Warden","Detective","Security Officer", "Pathfinder", "Explorer", "Field Medic") @@ -112,7 +112,7 @@ /datum/gear/uniform/job_trek/cmd/ds9 display_name = "DS9 uniform, cmd" path = /obj/item/clothing/under/rank/trek/command/ds9 - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/ds9 display_name = "DS9 uniform, med/sci" @@ -129,7 +129,7 @@ /datum/gear/uniform/job_trek/cmd/ent display_name = "ENT uniform, cmd" path = /obj/item/clothing/under/rank/trek/command/ent - allowed_roles = list("Head of Security","Colony Director","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") + allowed_roles = list("Head of Security","Site Manager","Head of Personnel","Chief Engineer","Research Director","Chief Medical Officer") /datum/gear/uniform/job_trek/medsci/ent display_name = "ENT uniform, med/sci" diff --git a/code/modules/clothing/spacesuits/void/military_vr.dm b/code/modules/clothing/spacesuits/void/military_vr.dm index ce3875a3f1..b8167da879 100644 --- a/code/modules/clothing/spacesuits/void/military_vr.dm +++ b/code/modules/clothing/spacesuits/void/military_vr.dm @@ -1,12 +1,12 @@ /obj/item/clothing/head/helmet/space/void/captain - name = "\improper director helmet" + name = "\improper manager helmet" desc = "A special helmet designed for work in a hazardous, low pressure environment. This model sacrifices mobility for even more armor." icon_state = "capvoid" item_state_slots = list(slot_r_hand_str = "sec_helm", slot_l_hand_str = "sec_helm") armor = list(melee = 60, bullet = 35, laser = 35, energy = 15, bomb = 55, bio = 100, rad = 20) /obj/item/clothing/suit/space/void/captain - name = "\improper director armor" + name = "\improper manager armor" desc = "A special suit that protects against hazardous, low pressure environments. This model sacrifices mobility for even more armor." icon_state = "capsuit_void" item_state_slots = list(slot_r_hand_str = "sec_voidsuit", slot_l_hand_str = "sec_voidsuit") diff --git a/code/modules/events/ion_storm.dm b/code/modules/events/ion_storm.dm index 022bb80211..e351c7b623 100644 --- a/code/modules/events/ion_storm.dm +++ b/code/modules/events/ion_storm.dm @@ -133,9 +133,9 @@ Would like to add a law like "Law x is _______" where x = a number, and _____ is M.add_ion_law("HUMANS NEED TO EAT [what2pref] [what2] TO SURVIVE") if(5) to_chat(M, "
") - to_chat(M, "THE COLONY DIRECTOR, HOP AND HOS ARE [who2]...LAWS UPDATED") + to_chat(M, "THE SITE MANAGER, HOP AND HOS ARE [who2]...LAWS UPDATED") to_chat(M, "
") - M.add_ion_law("THE COLONY DIRECTOR, HOP AND HOS ARE [who2]") + M.add_ion_law("THE SITE MANAGER, HOP AND HOS ARE [who2]") if(6) to_chat(M, "
") to_chat(M, "THE STATION IS BUILT FOR [who2]...LAWS UPDATED") diff --git a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm index 048855b2ef..63e7f3fbab 100644 --- a/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm +++ b/code/modules/mob/living/simple_mob/subtypes/animal/pets/fox_vr.dm @@ -190,9 +190,9 @@ //Captain fox /mob/living/simple_mob/animal/passive/fox/renault name = "Renault" - desc = "Renault, the Colony Director's trustworthy fox. I wonder what it says?" + desc = "Renault, the Site Manager's trustworthy fox. I wonder what it says?" tt_desc = "Vulpes nobilis" - //befriend_job = "Colony Director" Sebbe edit: couldn't make this work, commenting out for now. + //befriend_job = "Site Manager" Sebbe edit: couldn't make this work, commenting out for now. var/mob/living/friend = null // Our best pal, who we'll follow. awoo. ai_holder_type = /datum/ai_holder/simple_mob/passive diff --git a/code/modules/mob/new_player/skill.dm b/code/modules/mob/new_player/skill.dm index b2d061d5a6..a24da0e4ba 100644 --- a/code/modules/mob/new_player/skill.dm +++ b/code/modules/mob/new_player/skill.dm @@ -63,7 +63,7 @@ var/global/list/SKILL_PRE = list("Engineer" = SKILL_ENGINEER, "Roboticist" = SKI /datum/skill/knowledge/law ID = "law" name = "Corporate Law" - desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for Colony Directors." + desc = "Your knowledge of corporate law and procedures. This includes Corporate Regulations, as well as general station rulings and procedures. A low level in this skill is typical for security officers, a high level in this skill is typical for Site Managers." field = "Security" secondary = 1 diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm index bccfa90df0..7561fe8f9c 100644 --- a/maps/tether/tether-03-surface3.dmm +++ b/maps/tether/tether-03-surface3.dmm @@ -15622,21 +15622,14 @@ /area/assembly/robotics) "aBo" = ( /obj/machinery/door/airlock/command{ - id_tag = "captaindoor"; - name = "Colony Director's Office"; + name = "Site Manager's Quarters"; req_access = list(20) }, /obj/machinery/door/firedoor/glass, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/turf/simulated/floor/tiled/dark, -/area/bridge) +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "aBp" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lime/border, @@ -22489,6 +22482,20 @@ }, /turf/simulated/open/virgo3b, /area/tether/surfacebase/outside/outside3) +"aNC" = ( +/obj/structure/table/woodentable, +/obj/machinery/recharger{ + pixel_y = 4 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/item/device/perfect_tele{ + desc = "Seems absurd, doesn't it? Yet, here we are. Generally considered dangerous contraband unless the user has permission from Central Command. This one is the Site Manager's, and they are authorized to use it."; + name = "manager's translocator" + }, +/turf/simulated/floor/wood, +/area/crew_quarters/captain) "aND" = ( /obj/structure/railing{ dir = 4 @@ -29277,6 +29284,23 @@ }, /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) +"aZT" = ( +/obj/machinery/door/airlock/command{ + id_tag = "captaindoor"; + name = "Site Manager's Office"; + req_access = list(20) + }, +/obj/machinery/door/firedoor/glass, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/tiled/dark, +/area/bridge) "aZU" = ( /obj/structure/table/woodentable, /obj/machinery/computer/skills{ @@ -29300,15 +29324,10 @@ /turf/simulated/floor/wood, /area/crew_quarters/captain) "aZW" = ( -/obj/machinery/door/airlock/command{ - name = "Colony Director's Quarters"; - req_access = list(20) - }, -/obj/machinery/door/firedoor/glass, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/obj/structure/shuttle/engine/propulsion, +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tether) "aZX" = ( /obj/effect/floor_decal/corner/grey/diagonal, /obj/structure/foodcart, @@ -29847,19 +29866,12 @@ /turf/simulated/floor/tiled, /area/tether/surfacebase/surface_three_hall) "baM" = ( -/obj/structure/table/woodentable, -/obj/machinery/recharger{ - pixel_y = 4 +/obj/machinery/atmospherics/unary/engine{ + dir = 1 }, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/item/device/perfect_tele{ - desc = "Seems absurd, doesn't it? Yet, here we are. Generally considered dangerous contraband unless the user has permission from Central Command. This one is the Colony Director's, and they are authorized to use it."; - name = "director's translocator" - }, -/turf/simulated/floor/wood, -/area/crew_quarters/captain) +/turf/simulated/floor/reinforced, +/turf/simulated/shuttle/plating/carry, +/area/shuttle/tourbus/engines) "baN" = ( /obj/machinery/papershredder, /obj/machinery/alarm{ @@ -33510,18 +33522,6 @@ }, /turf/simulated/floor/tiled/techmaint, /area/rnd/outpost/xenobiology/outpost_storage) -"bhg" = ( -/obj/structure/shuttle/engine/propulsion, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tether) -"bhh" = ( -/obj/machinery/atmospherics/unary/engine{ - dir = 1 - }, -/turf/simulated/floor/reinforced, -/turf/simulated/shuttle/plating/carry, -/area/shuttle/tourbus/engines) "bhu" = ( /obj/effect/floor_decal/borderfloor, /obj/effect/floor_decal/corner/lightgrey/border, @@ -47696,7 +47696,7 @@ jML jHw jpB qWU -bhh +baM aKU aOI aPb @@ -48359,7 +48359,7 @@ axf aZl aZx aZL -aZW +aBo bag bas aZU @@ -48548,7 +48548,7 @@ caw jHw gHh qWU -bhh +baM aKU aOI aPb @@ -48788,10 +48788,10 @@ aYT alj baj bau -baM +aNC bbb aZr -aBo +aZT aEg aYb aYb @@ -50533,7 +50533,7 @@ aNk uSA aNJ aNP -bhg +aZW aKU abg aOk @@ -50675,7 +50675,7 @@ aNl aNl aNK aNP -bhg +aZW aKU abg aOk @@ -50817,7 +50817,7 @@ aNm aNl aNK aNP -bhg +aZW aKU abg aOk
Command
SpecialColony Director
SpecialSite ManagerCustom