diff --git a/code/game/jobs/access_datum.dm b/code/game/jobs/access_datum.dm index 16066bb0580..ab0d458d90f 100644 --- a/code/game/jobs/access_datum.dm +++ b/code/game/jobs/access_datum.dm @@ -423,6 +423,17 @@ var/const/access_consular = 72 id = access_consular desc = "Consular" +var/const/access_intrepid = 73 +/datum/access/intrepid + id = access_intrepid + desc = "Intrepid Shuttle" + region = ACCESS_REGION_COMMAND + +var/const/access_bridge_crew = 74 +/datum/access/bridge_crew + id = access_bridge_crew + desc = "Bridge Crew" + region = ACCESS_REGION_COMMAND /****************** * Central Command * diff --git a/code/game/jobs/job/captain.dm b/code/game/jobs/job/captain.dm index b2f29cc7dfd..e2a514a49ef 100644 --- a/code/game/jobs/job/captain.dm +++ b/code/game/jobs/job/captain.dm @@ -95,12 +95,11 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) 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) + access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid) 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_hydroponics, access_chapel_office, access_library, access_research, - access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) + access_janitor, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist, access_bridge_crew, access_intrepid) blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) @@ -138,7 +137,7 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) intro_prefix = "the" supervisors = "the executive officer and the captain" selection_color = "#2b5bb5" - minimal_player_age = 10 + minimal_player_age = 20 economic_modifier = 10 ideal_character_age = 45 @@ -146,9 +145,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1) outfit = /datum/outfit/job/bridge_crew - access = list(access_change_ids, access_eva, access_heads,access_maint_tunnels, access_bar, access_cargo, access_cargo_bot, - access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_journalist) - minimal_access = list(access_eva, access_heads, access_gateway, access_weapons) + access = list(access_eva, access_heads, access_maint_tunnels, access_weapons, access_bridge_crew, access_intrepid) + minimal_access = list(access_heads, access_eva, access_heads, access_gateway, access_weapons, access_bridge_crew, access_intrepid) blacklisted_species = list(SPECIES_TAJARA_MSAI, SPECIES_TAJARA_ZHAN, SPECIES_DIONA, SPECIES_VAURCA_WORKER, SPECIES_VAURCA_WARRIOR, SPECIES_VAURCA_BULWARK, SPECIES_VAURCA_BREEDER) diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index 4e3ca7f60d2..89b3ee8e449 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -19,11 +19,11 @@ access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_sec_doors, access_research, access_medical, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it) + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_intrepid) minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, access_heads, access_construction, access_sec_doors, access_research, access_medical, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it) + access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_it, access_bridge_crew, access_intrepid) minimal_player_age = 7 outfit = /datum/outfit/job/chief_engineer diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 1e6782bcc6e..2d76d526c58 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -16,11 +16,11 @@ access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction, access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research, - access_first_responder, access_maint_tunnels) + access_first_responder, access_maint_tunnels, access_intrepid) minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads, access_pharmacy, access_virology, access_cmo, access_surgery, access_RC_announce, access_engine, access_construction, access_keycard_auth, access_sec_doors, access_psychiatrist, access_eva, access_external_airlocks, access_research, - access_first_responder, access_maint_tunnels) + access_first_responder, access_maint_tunnels, access_intrepid) minimal_player_age = 10 ideal_character_age = 50 diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index d9faec8bb83..b76dd3958a1 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -17,7 +17,7 @@ access_tox_storage, access_teleporter, access_sec_doors, access_medical, access_engine, access_construction, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_network, - access_maint_tunnels, access_it) + access_maint_tunnels, access_it, access_intrepid) minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, access_eva, access_external_airlocks, access_tox_storage, access_teleporter, access_sec_doors, access_medical, access_engine, access_construction, access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage, diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 3e69fc50519..b075397bcd3 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -17,12 +17,12 @@ 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_external_airlocks, - access_detective, access_weapons) + access_detective, access_weapons, access_intrepid) minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, 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_external_airlocks, - access_detective, access_weapons) + access_detective, access_weapons, access_intrepid) minimal_player_age = 14 outfit = /datum/outfit/job/hos diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index 7e270d8159e..ffbc01e1ca2 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -428,7 +428,7 @@ /obj/structure/closet/secure_closet/bridge_crew name = "bridge crew's locker" - req_access = list(access_heads) + req_access = list(access_bridge_crew) icon_state = "hopsecure1" icon_closed = "hopsecure" icon_locked = "hopsecure1" @@ -447,7 +447,7 @@ /obj/structure/closet/secure_closet/pilot name = "pilot's locker" - req_access = list(access_heads) + req_access = list(access_bridge_crew) icon_state = "hopsecure1" icon_closed = "hopsecure" icon_locked = "hopsecure1" diff --git a/maps/sccv_horizon/code/sccv_horizon_overmap.dm b/maps/sccv_horizon/code/sccv_horizon_overmap.dm index 5d18476ab0f..33e77b8420e 100644 --- a/maps/sccv_horizon/code/sccv_horizon_overmap.dm +++ b/maps/sccv_horizon/code/sccv_horizon_overmap.dm @@ -20,6 +20,7 @@ /obj/machinery/computer/shuttle_control/explore/intrepid name = "Intrepid control console" shuttle_tag = "Intrepid" + req_access = list(access_intrepid) /obj/effect/overmap/visitable/ship/landable/intrepid name = "Intrepid" @@ -44,3 +45,4 @@ /obj/machinery/computer/shuttle_control/explore/mining_shuttle name = "mining shuttle control console" shuttle_tag = "Mining Shuttle" + req_access = list(access_mining) diff --git a/maps/sccv_horizon/placeholder-3_deck_3.dmm b/maps/sccv_horizon/placeholder-3_deck_3.dmm index d68e2f0271a..8842475b45c 100644 --- a/maps/sccv_horizon/placeholder-3_deck_3.dmm +++ b/maps/sccv_horizon/placeholder-3_deck_3.dmm @@ -992,6 +992,16 @@ /obj/structure/table/wood, /turf/simulated/floor/carpet, /area/lawoffice/consular) +"ck" = ( +/obj/item/hand_tele, +/obj/structure/table/standard, +/obj/item/device/radio/intercom{ + dir = 4; + name = "Station Intercom (General)"; + pixel_x = -25 + }, +/turf/simulated/floor/tiled, +/area/teleporter) "cm" = ( /obj/structure/flora/pottedplant/random{ pixel_x = -5 @@ -1046,6 +1056,7 @@ /obj/structure/cable{ icon_state = "1-2" }, +/obj/machinery/firealarm/west, /turf/simulated/floor/bluegrid, /area/storage/shields) "cq" = ( @@ -2330,6 +2341,26 @@ /obj/effect/floor_decal/industrial/warning, /turf/simulated/floor/reinforced, /area/template_noop) +"fi" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/floor_decal/corner/paleblue{ + dir = 9 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/structure/cable/green{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/firealarm/west, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "fj" = ( /obj/structure/table/wood, /obj/item/modular_computer/laptop/preset/representative{ @@ -3007,6 +3038,10 @@ }, /turf/simulated/floor/tiled/dark, /area/engineering/break_room) +"hg" = ( +/obj/machinery/suit_storage_unit/standard_unit, +/turf/simulated/floor/tiled, +/area/teleporter) "hh" = ( /obj/machinery/telecomms/relay/preset/telecomms, /turf/simulated/floor/tiled{ @@ -3506,6 +3541,11 @@ }, /turf/simulated/floor/tiled/white, /area/medical/ward/isolation) +"im" = ( +/obj/structure/table/standard, +/obj/item/modular_computer/laptop/preset/command/teleporter, +/turf/simulated/floor/plating, +/area/teleporter) "in" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -3935,6 +3975,13 @@ "js" = ( /turf/simulated/open, /area/hallway/crew_area) +"ju" = ( +/obj/machinery/light/small/emergency{ + dir = 4 + }, +/obj/structure/table/rack, +/turf/simulated/floor, +/area/maintenance/security_starboard) "jv" = ( /obj/structure/cable/green{ icon_state = "4-8" @@ -4278,6 +4325,12 @@ }, /turf/simulated/floor/tiled/white, /area/hallway/medical/upper) +"kl" = ( +/obj/item/device/radio/beacon, +/obj/machinery/firealarm/west, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/turf/simulated/floor/tiled, +/area/teleporter) "km" = ( /obj/effect/floor_decal/spline/plain{ dir = 9 @@ -5026,6 +5079,12 @@ }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) +"mh" = ( +/obj/structure/table/rack, +/obj/item/tank/oxygen, +/obj/item/clothing/mask/gas, +/turf/simulated/floor/plating, +/area/teleporter) "mi" = ( /obj/effect/floor_decal/spline/plain{ dir = 5 @@ -5070,6 +5129,9 @@ /obj/machinery/light{ dir = 4 }, +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, /turf/simulated/floor/tiled, /area/hallway/primary/port) "mp" = ( @@ -6062,6 +6124,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 }, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled/dark, /area/crew_armory) "oH" = ( @@ -6315,6 +6378,23 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/emergency) +"po" = ( +/obj/machinery/door/airlock/command{ + name = "Teleport Access"; + req_access = list(17) + }, +/obj/machinery/door/firedoor, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/wall/r_wall, +/area/teleporter) "pp" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -6868,13 +6948,17 @@ /turf/simulated/floor/tiled/freezer, /area/crew_quarters/toilet) "qv" = ( -/obj/structure/lattice/catwalk/indoor/grate, -/obj/machinery/light/small/emergency{ - dir = 8 +/obj/structure/cable/green{ + icon_state = "4-8" }, -/obj/random/junk, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/tiled, +/area/teleporter) "qw" = ( /obj/effect/floor_decal/spline/fancy/wood, /obj/effect/floor_decal/spline/fancy/wood{ @@ -8150,12 +8234,8 @@ /turf/simulated/floor/plating, /area/hallway/crew_area) "tD" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/maintenance{ - req_one_access = list(12) - }, -/turf/simulated/floor/tiled, -/area/maintenance/security_starboard) +/turf/simulated/wall/r_wall, +/area/teleporter) "tE" = ( /obj/structure/bed/stool/chair/office/bridge{ dir = 4 @@ -8885,6 +8965,13 @@ /obj/effect/floor_decal/corner/blue/diagonal, /turf/simulated/floor/tiled, /area/bridge/aibunker) +"vH" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/light/small/emergency{ + dir = 8 + }, +/turf/simulated/floor, +/area/maintenance/engineering_ladder) "vI" = ( /obj/structure/window/shuttle/scc_space_ship, /obj/structure/grille, @@ -10413,7 +10500,6 @@ }, /area/tcommsat/chamber) "zH" = ( -/obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor, /area/maintenance/security_starboard) "zI" = ( @@ -11619,6 +11705,10 @@ /obj/structure/table/rack, /obj/item/storage/firstaid, /obj/item/storage/firstaid, +/obj/item/device/radio/intercom{ + name = "Station Intercom (General)"; + pixel_y = 25 + }, /turf/simulated/floor/tiled/dark, /area/crew_armory) "CK" = ( @@ -12111,8 +12201,9 @@ "Ee" = ( /obj/structure/lattice/catwalk/indoor/grate, /obj/machinery/door/airlock/maintenance{ - req_one_access = list(12) + req_access = list(17) }, +/obj/machinery/door/firedoor, /turf/simulated/floor, /area/maintenance/security_starboard) "Ef" = ( @@ -13207,9 +13298,14 @@ /turf/simulated/floor/tiled/dark, /area/bridge) "GS" = ( -/obj/structure/trash_pile, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/obj/effect/floor_decal/industrial/warning{ + dir = 4 + }, +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/turf/simulated/floor/tiled, +/area/teleporter) "GT" = ( /obj/structure/cable/green{ icon_state = "1-2" @@ -13243,6 +13339,16 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/security/forensics_office) +"GV" = ( +/obj/machinery/alarm{ + dir = 4; + pixel_x = -28 + }, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter) "GW" = ( /obj/effect/floor_decal/corner/blue/full{ dir = 1 @@ -14124,6 +14230,13 @@ }, /turf/simulated/floor, /area/maintenance/security_starboard) +"Jc" = ( +/obj/machinery/teleport/station, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/teleporter) "Je" = ( /obj/machinery/door/firedoor, /obj/effect/floor_decal/corner/blue{ @@ -14845,6 +14958,14 @@ }, /turf/simulated/floor/reinforced, /area/template_noop) +"KP" = ( +/obj/machinery/teleport/pad, +/obj/effect/decal/warning_stripes, +/turf/simulated/floor/plating, +/area/teleporter) +"KQ" = ( +/turf/simulated/wall/r_wall, +/area/maintenance/security_starboard) "KR" = ( /obj/effect/floor_decal/corner/green{ dir = 9 @@ -15600,6 +15721,14 @@ }, /turf/simulated/floor/carpet, /area/crew_quarters/heads/hop/xo) +"MB" = ( +/obj/structure/lattice/catwalk/indoor/grate, +/obj/machinery/door/airlock/maintenance{ + req_access = list(17) + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor, +/area/teleporter) "MD" = ( /obj/structure/bed/stool/chair{ dir = 4 @@ -17260,10 +17389,12 @@ /turf/simulated/floor/tiled/dark, /area/lawoffice/representative) "Qr" = ( -/obj/structure/closet, -/obj/random/loot, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/obj/machinery/shieldwallgen, +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/tiled, +/area/teleporter) "Qs" = ( /obj/structure/bed/stool/chair/padded/brown{ dir = 4 @@ -17438,10 +17569,19 @@ /turf/simulated/floor/tiled/dark, /area/bridge/selfdestruct) "QQ" = ( -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor, -/area/maintenance/security_starboard) +/obj/effect/floor_decal/industrial/warning{ + dir = 5 + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 24 + }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/turf/simulated/floor/tiled, +/area/teleporter) "QR" = ( /obj/effect/floor_decal/corner/blue{ dir = 10 @@ -17855,6 +17995,15 @@ }, /turf/simulated/floor/tiled/dark, /area/bridge) +"Se" = ( +/obj/effect/floor_decal/industrial/warning{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/turf/simulated/floor/tiled, +/area/teleporter) "Sf" = ( /obj/structure/bed/stool/chair/office/dark{ dir = 8 @@ -18681,6 +18830,9 @@ "Uc" = ( /turf/simulated/wall/r_wall, /area/hallway/primary/starboard) +"Ud" = ( +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/template_noop) "Ue" = ( /obj/structure/lattice, /obj/structure/railing/mapped{ @@ -19390,6 +19542,21 @@ temperature = 278 }, /area/tcommsat/chamber) +"VR" = ( +/obj/effect/floor_decal/corner/paleblue{ + dir = 6 + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/tiled, +/area/hallway/primary/port) "VS" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -20056,6 +20223,9 @@ /obj/item/ammo_casing/gauss/carbine, /turf/simulated/floor/tiled/dark, /area/crew_armory) +"XP" = ( +/turf/simulated/wall/shuttle/scc_space_ship/cardinal, +/area/teleporter) "XQ" = ( /obj/structure/cable/green{ icon_state = "1-4" @@ -20340,6 +20510,7 @@ /obj/machinery/door/airlock/maintenance{ req_one_access = list(12) }, +/obj/machinery/door/firedoor, /turf/simulated/floor, /area/maintenance/security_starboard) "YC" = ( @@ -42911,7 +43082,7 @@ vm vm vm Cy -DJ +vH DJ DJ HV @@ -44132,7 +44303,7 @@ Ss Sj Sj Sj -Sj +fi Sj Sj rc @@ -44334,7 +44505,7 @@ he mo Gp he -he +VR Ly he he @@ -44532,16 +44703,16 @@ Gb BX BX OV -rl -rl -rl -rl -rl -rl -rl -rl -rl -rl +tD +tD +tD +tD +po +tD +tD +KQ +KQ +KQ Ht rl TG @@ -44735,12 +44906,12 @@ BX BX Be tD -wf -wf -wf +ck +hg +kl qv -wf -wf +GV +MB wf wf Ee @@ -44936,16 +45107,16 @@ Kp Hq zi wW -rl +tD QQ GS -cG -cG +GS +Se Qr -YM +tD zH -rl -rl +KQ +KQ Qm rl rl @@ -45138,14 +45309,14 @@ uv uv uv uv -uv -uv -uv -uv -uv -uv -uv -uv +XP +im +Jc +KP +mh +Qr +tD +ju Cu wK WQ @@ -45340,14 +45511,14 @@ at at at at -at -at -at -at -at -at -at -at +Ud +Ud +Ud +Ud +Ud +Ud +Ud +Ud Cu Vb HU