Skip to content

Commit

Permalink
Merge pull request TS-Rogue-Star#653 from AzzyDreemurr13/sections-talon
Browse files Browse the repository at this point in the history
Divide and inflate (Talon Update)
  • Loading branch information
Very-Soft authored Nov 12, 2024
2 parents b41399c + f894158 commit d8dbbcb
Show file tree
Hide file tree
Showing 7 changed files with 185 additions and 127 deletions.
32 changes: 31 additions & 1 deletion code/game/jobs/access_datum_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,37 @@ var/const/access_pilot = 67
/var/const/access_talon = 301
/datum/access/talon
id = access_talon
desc = "Talon"
desc = "Talon General"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_talon_bridge = 302
/datum/access/talon_bridge
id = access_talon_bridge
desc = "Talon Bridge"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_talon_medical = 303
/datum/access/talon_medical
id = access_talon_medical
desc = "Talon Medical"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_talon_engineer = 304
/datum/access/talon_engineer
id = access_talon_engineer
desc = "Talon Engineering"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_talon_cargo = 305
/datum/access/talon_cargo
id = access_talon_cargo
desc = "Talon Cargo"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_talon_security = 306
/datum/access/talon_security
id = access_talon_security
desc = "Talon Security"
access_type = ACCESS_TYPE_PRIVATE

/var/const/access_xenobotany = 77
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/doors/airlock_electronics.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

matter = list(MAT_STEEL = 50,MAT_GLASS = 50)

req_one_access = list(access_engine, access_talon) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon
req_one_access = list(access_engine, access_talon_engineer) // Access to unlock the device, ignored if emagged //VOREStation Edit - Add talon
var/list/apply_any_access = list(access_engine) // Can apply any access, not just their own

var/secure = 0 //if set, then wires will be randomized and bolts will drop if the door is broken
Expand Down Expand Up @@ -133,11 +133,11 @@
// Nothing
if(!id || !id.access)
return list()

// Has engineer access, can put any access
else if(has_access(null, apply_any_access, id.access))
return get_all_station_access()

// Not an engineer, can only pick your own accesses to program
else
return id.access
Expand Down
10 changes: 5 additions & 5 deletions code/game/machinery/suit_storage/suit_cycler_units_vr.dm
Original file line number Diff line number Diff line change
Expand Up @@ -39,33 +39,33 @@
name = "Talon engineer suit cycler"
model_text = "Talon engineer"
icon_state = "dark_cycler"
req_access = list(access_talon)
req_access = list(access_talon_engineer)
departments = list(/datum/suit_cycler_choice/department/talon/eng)

/obj/machinery/suit_cycler/vintage/tguard
name = "Talon guard suit cycler"
model_text = "Talon guard"
icon_state = "dark_cycler"
req_access = list(access_talon)
req_access = list(access_talon_security)
departments = list(/datum/suit_cycler_choice/department/talon/marine)

/obj/machinery/suit_cycler/vintage/tmedic
name = "Talon doctor suit cycler"
model_text = "Talon doctor"
icon_state = "dark_cycler"
req_access = list(access_talon)
req_access = list(access_talon_medical)
departments = list(/datum/suit_cycler_choice/department/talon/med)

/obj/machinery/suit_cycler/vintage/tcaptain
name = "Talon captain suit cycler"
model_text = "Talon captain"
icon_state = "dark_cycler"
req_access = list(access_talon)
req_access = list(access_talon_bridge)
departments = list(/datum/suit_cycler_choice/department/talon/officer)

/obj/machinery/suit_cycler/vintage/tminer
name = "Talon miner suit cycler"
model_text = "Talon miner"
icon_state = "dark_cycler"
req_access = list(access_talon)
req_access = list(access_talon_cargo)
departments = list(/datum/suit_cycler_choice/department/talon/miner)
28 changes: 14 additions & 14 deletions maps/offmap_vr/talon/talon_v2.dm
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ var/global/list/latejoin_talon = list()
/obj/machinery/computer/shuttle_control/explore/talonboat
name = "shuttle control console"
shuttle_tag = "Talon's Shuttle"
req_one_access = list(access_talon)
req_one_access = list(access_talon_bridge)

/obj/effect/overmap/visitable/ship/landable/talon_boat
name = "ITV Talon Shuttle"
Expand Down Expand Up @@ -282,7 +282,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/item/weapon/card/id/synthetic/talon/Initialize()
. = ..()
access = list(access_talon, access_synth)
access = list(access_talon, access_talon_bridge, access_talon_medical, access_talon_engineer, access_talon_cargo, access_talon_security, access_synth)

/obj/machinery/power/smes/buildable/offmap_spawn/New()
..(1)
Expand All @@ -294,18 +294,18 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/machinery/power/apc/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(access_talon_engineer)

/obj/machinery/power/apc/talon/hyper
cell_type = /obj/item/weapon/cell/hyper

/obj/machinery/alarm/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(access_talon_engineer)

/obj/machinery/door/firedoor/glass/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(access_talon_engineer)

/obj/machinery/door/firedoor/glass/talon/hidden
name = "\improper Emergency Shutter System"
Expand Down Expand Up @@ -370,7 +370,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
req_access = list(access_talon)
req_access = list(access_talon_bridge)
closet_appearance = /decl/closet_appearance/secure_closet/talon/captain

starts_with = list(
Expand All @@ -392,7 +392,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
req_access = list(access_talon)
req_access = list(access_talon_security)
closet_appearance = /decl/closet_appearance/secure_closet/talon/guard

starts_with = list(
Expand Down Expand Up @@ -423,7 +423,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
req_access = list(access_talon)
req_access = list(access_talon_medical)
closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor

starts_with = list(
Expand All @@ -445,7 +445,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
req_access = list(access_talon)
req_access = list(access_talon_engineer)
closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer

starts_with = list(
Expand Down Expand Up @@ -499,7 +499,7 @@ personally I recommend using the ship's boat if you need to evacuate, but if you

/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
req_access = list(access_talon)
req_access = list(access_talon_cargo)
closet_appearance = /decl/closet_appearance/secure_closet/talon/miner

starts_with = list(
Expand Down Expand Up @@ -572,23 +572,23 @@ personally I recommend using the ship's boat if you need to evacuate, but if you
/datum/computer_file/program/power_monitor/talon
filename = "tpowermonitor"
filedesc = "Power Monitoring (Talon)"
required_access = access_talon
required_access = access_talon_engineer
/datum/computer_file/program/alarm_monitor/talon
filename = "talarmmonitoreng"
filedesc = "Alarm Monitoring (Talon)"
required_access = access_talon
required_access = access_talon_engineer
/datum/computer_file/program/rcon_console/talon
filename = "trconconsole"
filedesc = "RCON Remote Control (Talon)"
required_access = access_talon
/datum/computer_file/program/atmos_control/talon
filename = "tatmoscontrol"
filedesc = "Atmosphere Control (Talon)"
required_access = access_talon
required_access = access_talon_engineer
/datum/computer_file/program/suit_sensors/talon
filename = "tsensormonitor"
filedesc = "Suit Sensors Monitoring (Talon)"
required_access = access_talon
required_access = access_talon_medical

// Modular computer/console presets
/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot
Expand Down
Loading

0 comments on commit d8dbbcb

Please sign in to comment.