cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-28 14:37:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

jobs, access and radio to defines (#18297)

Browse Source 
* jobs, access and radio to defines

* .

* .

* urg

* .

* .

* finish the radio freqs

* why

* .

* .

* ticker initial

* eh

---------

Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
Kashargul
2025-08-31 01:32:36 +02:00
committed by GitHub
co-authored by Cameron Lennox
parent 1cb38c22ec
commit e956d13a6b
313 changed files with 193679 additions and 12007 deletions
Download Patch File Download Diff File Expand all files Collapse all files
archive/maps/cynosure/cynosure-3.dmm
+2 -17
View File
@@ -1079,7 +1079,7 @@
/obj/effect/floor_decal/corner/blue/border{
dir = 4
},
/obj/structure/closet/secure_closet/RD,
/obj/structure/closet/secure_closet/research_director,
/obj/random_multi/single_item/hand_tele,
/obj/structure/cable/green{
icon_state = "1-2"
@@ -21743,7 +21743,7 @@
/turf/simulated/floor/tiled/dark,
/area/surface/station/security/armoury)
"oNM" = (
/obj/structure/closet/secure_closet/CMO,
/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/blue/border,
/obj/machinery/light,
@@ -30249,21 +30249,6 @@
},
/turf/simulated/shuttle/wall/dark/no_join,
/area/shuttle/large_escape_pod2/station)
"uDG" = (
/obj/machinery/door/firedoor/border_only,
/obj/structure/cable/green{
icon_state = "0-8"
},
/obj/structure/grille,
/obj/structure/window/reinforced/full,
/obj/machinery/door/blast/regular/open{
dir = 4;
id = "captainlockdown";
layer = 3.3;
name = "Site Manager Lockdown"
},
/turf/simulated/floor/plating,
/area/surface/station/crew_quarters/captain)
"uDX" = (
/obj/machinery/light{
dir = 1
archive/maps/cynosure/cynosure_defines.dm
+2 -2
View File
@@ -319,13 +319,13 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
req_one_access = list(access_explorer)
req_one_access = list(ACCESS_EXPLORER)
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"
req_access = null
req_one_access = list(access_explorer)
req_one_access = list(ACCESS_EXPLORER)
// Putting this here in order to not disrupt existing maps/downstreams.
/turf/simulated/open
archive/maps/cynosure/cynosure_jobs.dm
+13 -17
View File
@@ -1,11 +1,7 @@
// Pilots
var/const/EXPLORER =(1<<14)
var/const/access_explorer = 43
/datum/access/explorer
id = access_explorer
id = ACCESS_EXPLORER
desc = "Explorer"
region = ACCESS_REGION_GENERAL
@@ -27,8 +23,8 @@ var/const/access_explorer = 43
supervisors = "the Research Director"
selection_color = "#633D63"
economic_modifier = 4
access = list(access_explorer, access_research)
minimal_access = list(access_explorer, access_research)
access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
outfit_type = /decl/hierarchy/outfit/job/explorer2
job_description = "An Explorer searches for interesting things on the surface of Sif, and returns them to the station."
@@ -37,16 +33,16 @@ var/const/access_explorer = 43
JOB_PILOT = /decl/hierarchy/outfit/job/pilot)
/datum/job/rd
access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_teleporter, access_sec_doors,
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_explorer, access_eva, access_external_airlocks)
minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_teleporter, access_sec_doors,
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_explorer, access_eva, access_external_airlocks)
access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
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_EXPLORER, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
ACCESS_TOX_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS,
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_EXPLORER, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
/*
alt_titles = list(
archive/maps/cynosure/cynosure_shuttles.dm
+9 -9
View File
@@ -51,7 +51,7 @@
/obj/machinery/computer/shuttle_control/multi/centcom
name = "shuttle control console"
shuttle_tag = "Centcom"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
/datum/shuttle/autodock/multi/centcom
name = "Centcom"
@@ -77,7 +77,7 @@
/obj/machinery/computer/shuttle_control/multi/administration
name = "administration shuttle console"
shuttle_tag = "Administration"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
/datum/shuttle/autodock/multi/administration
name = "Administration"
@@ -101,7 +101,7 @@
/obj/machinery/computer/shuttle_control/multi/response
name = "response shuttle console"
shuttle_tag = "Response Operations"
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/datum/shuttle/autodock/multi/response
name = "Response Operations"
@@ -151,7 +151,7 @@
/obj/machinery/computer/shuttle_control/multi/ninja
name = "ninja shuttle console"
shuttle_tag = "Ninja"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/ninja
name = "Ninja"
@@ -180,7 +180,7 @@
/obj/machinery/computer/shuttle_control/multi/heist
name = "skipjack control console"
shuttle_tag = "Skipjack"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/heist
name = "Skipjack"
@@ -206,7 +206,7 @@
/obj/machinery/computer/shuttle_control/multi/mercenary
name = "mercenary ship control console"
shuttle_tag = "Mercenary"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/mercenary
name = "Mercenary"
@@ -230,7 +230,7 @@
/obj/machinery/computer/shuttle_control/multi/mercenary_elite
name = "mercenary ship control console"
shuttle_tag = "Mercenary Elite"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
/datum/shuttle/autodock/multi/mercenary_elite
name = "Mercenary Elite"
@@ -438,7 +438,7 @@ ESCAPE_POD(1)
/obj/machinery/computer/shuttle_control/explore/explorer_shuttle
name = "takeoff and landing console"
shuttle_tag = "Exploration Shuttle"
req_one_access = list(access_explorer)
req_one_access = list(ACCESS_EXPLORER)
/*
// Compile in the map for CI testing if we're testing compileability of all the maps
@@ -468,7 +468,7 @@ ESCAPE_POD(1)
/obj/machinery/computer/shuttle_control/explore/generic_shuttle
name = "short jump console"
shuttle_tag = "Private Vessel"
req_one_access = list(access_pilot)
req_one_access = list(ACCESS_PILOT)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/generic_shuttle
archive/maps/gateway_archive_vr/labyrinth.dm
+1 -1
View File
@@ -114,7 +114,7 @@
damage_absorption = list("brute"=1.2,"fire"=1.5,"bullet"=1,"laser"=1,"energy"=1,"bomb"=1)
max_temperature = 25000
infra_luminosity = 5
operation_req_access = list(access_cent_creed)
operation_req_access = list(ACCESS_CENT_CREED)
wreckage = /obj/effect/decal/mecha_wreckage/honker/cluwne
max_equip = 4
archive/maps/northern_star/polaris-1.dmm
+191976 -10174
View File
File diff suppressed because it is too large Load Diff
archive/maps/southern_cross/datums/supplypacks/munitions.dm
+3 -3
View File
@@ -12,7 +12,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/hedberg
containername = "Hunting Rifle crate"
access = access_brig
access = ACCESS_BRIG
/datum/supply_pack/munitions/phase_carbines_explorer
name = "Weapons - Surplus Phase Carbines"
@@ -22,7 +22,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Carbine crate"
access = access_brig
access = ACCESS_BRIG
/datum/supply_pack/munitions/phase_rifles_explorer
name = "Weapons - Phase Rifles"
@@ -32,4 +32,4 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Phase Rifle crate"
access = access_brig
access = ACCESS_BRIG
archive/maps/southern_cross/shuttles/crew_shuttles.dm
+3 -3
View File
@@ -3,7 +3,7 @@
/obj/machinery/computer/shuttle_control/web/shuttle1
name = "shuttle control console"
shuttle_tag = "Shuttle 1"
req_access = list(access_pilot)
req_access = list(ACCESS_PILOT)
/datum/shuttle/autodock/web_shuttle/shuttle1
name = "Shuttle 1"
@@ -47,7 +47,7 @@
/obj/machinery/computer/shuttle_control/web/shuttle2
name = "shuttle control console"
shuttle_tag = "Shuttle 2"
req_access = list(access_pilot)
req_access = list(ACCESS_PILOT)
/datum/shuttle/autodock/web_shuttle/shuttle2
name = "Shuttle 2"
@@ -273,4 +273,4 @@
return "Attention, [master.my_shuttle.visible_name] has arrived to the Wilderness Area."
/datum/shuttle_destination/shuttle2/mining_base/get_departure_message()
return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area."
return "Attention, [master.my_shuttle.visible_name] has departed the Wilderness Area."
archive/maps/southern_cross/shuttles/ert.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/shuttle_control/multi/response
name = "response shuttle console"
shuttle_tag = "Response Operations"
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
/*
/datum/shuttle/multi_shuttle/response
name = "Response Operations"
@@ -24,7 +24,7 @@
*/
/obj/machinery/computer/shuttle_control/web/ert
name = "response shuttle control console"
req_access = list(access_cent_specops)
req_access = list(ACCESS_CENT_SPECOPS)
shuttle_tag = "Response Operations"
/datum/shuttle/autodock/web_shuttle/ert
@@ -122,4 +122,4 @@
/datum/shuttle_destination/ert/planet
name = "Sif Surface"
my_landmark = "response_ship_planet"
preferred_interim_tag = "response_ship_sky_transit"
preferred_interim_tag = "response_ship_sky_transit"
archive/maps/southern_cross/shuttles/heist.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle_control/web/heist
name = "skipjack control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
/datum/shuttle/autodock/web_shuttle/heist
@@ -102,4 +102,4 @@
/datum/shuttle_destination/heist/planet
name = "Sif Surface"
my_landmark = "skipjack_planet"
preferred_interim_tag = "skipjack_sky_transit"
preferred_interim_tag = "skipjack_sky_transit"
archive/maps/southern_cross/shuttles/merc.dm
+2 -2
View File
@@ -29,7 +29,7 @@
/obj/machinery/computer/shuttle_control/web/syndicate
name = "mercenary shuttle control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Mercenary"
/datum/shuttle/autodock/web_shuttle/syndicate
@@ -132,4 +132,4 @@
/datum/shuttle_destination/syndie/planet
name = "Sif Surface"
my_landmark = "syndie_planet"
preferred_interim_tag = "syndie_sky_transit"
preferred_interim_tag = "syndie_sky_transit"
archive/maps/southern_cross/shuttles/ninja.dm
+2 -2
View File
@@ -1,6 +1,6 @@
/obj/machinery/computer/shuttle_control/web/ninja
name = "stealth shuttle control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Ninja"
/datum/shuttle/autodock/web_shuttle/ninja
@@ -99,4 +99,4 @@
/datum/shuttle_destination/ninja/planet
name = "Sif Surface"
my_landmark = "ninja_planet"
preferred_interim_tag = "ninja_sky_transit"
preferred_interim_tag = "ninja_sky_transit"
archive/maps/southern_cross/southern_cross-1.dmm
+4 -8
View File
@@ -18677,10 +18677,6 @@
/obj/structure/closet/emcloset,
/turf/simulated/floor/plating,
/area/maintenance/firstdeck/aftstarboard)
"aLx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled/monotile,
/area/hangar/two)
"aLy" = (
/obj/machinery/light{
dir = 8
@@ -55156,7 +55152,7 @@
/turf/simulated/floor/plating,
/area/maintenance/research)
"caR" = (
/obj/structure/closet/secure_closet/RD,
/obj/structure/closet/secure_closet/research_director,
/obj/machinery/firealarm{
pixel_y = 24
},
@@ -77216,7 +77212,7 @@
/turf/simulated/floor/plating,
/area/maintenance/medbay)
"cRs" = (
/obj/structure/closet/secure_closet/CMO,
/obj/structure/closet/secure_closet/chief_medical_officer,
/obj/machinery/ai_status_display{
pixel_x = -32
},
@@ -149946,7 +149942,7 @@ aGw
aGw
aKC
aKY
aLx
aKY
aLV
aME
aNk
@@ -153544,7 +153540,7 @@ aGw
aGw
aKE
aKY
aLx
aKY
aLY
aMH
aNk
archive/maps/southern_cross/southern_cross_defines.dm
+2 -2
View File
@@ -318,13 +318,13 @@
/obj/machinery/suit_cycler/exploration
name = "Explorer suit cycler"
model_text = "Exploration"
req_one_access = list(access_pilot,access_explorer)
req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
/obj/machinery/suit_cycler/pilot
name = "Pilot suit cycler"
model_text = "Pilot"
req_access = null
req_one_access = list(access_pilot,access_explorer)
req_one_access = list(ACCESS_PILOT,ACCESS_EXPLORER)
/datum/map/southern_cross/get_map_info()
. = list()
archive/maps/southern_cross/southern_cross_jobs.dm
+10 -10
View File
@@ -4,16 +4,16 @@ var/const/SAR =(1<<11)
var/const/PILOT =(1<<13)
var/const/EXPLORER =(1<<14)
var/const/access_pilot = 67
var/const/access_explorer = 43
var/const/ACCESS_PILOT = 67
var/const/ACCESS_EXPLORER = 43
/datum/access/pilot
id = access_pilot
id = ACCESS_PILOT
desc = "Pilot"
region = ACCESS_REGION_SUPPLY
/datum/access/explorer
id = access_explorer
id = ACCESS_EXPLORER
desc = "Explorer"
region = ACCESS_REGION_GENERAL
@@ -66,8 +66,8 @@ var/const/access_explorer = 43
supervisors = "the Head of Personnel"
selection_color = "#515151"
economic_modifier = 4
access = list(access_pilot, access_cargo, access_mining, access_mining_station)
minimal_access = list(access_pilot, access_cargo, access_mining, access_mining_station)
access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_PILOT, ACCESS_CARGO, ACCESS_MINING, ACCESS_MINING_STATION)
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A Pilot flies one of the shuttles between the Southern Cross and the outpost on Sif."
@@ -83,8 +83,8 @@ var/const/access_explorer = 43
supervisors = "the Research Director"
selection_color = "#633D63"
economic_modifier = 4
access = list(access_explorer, access_research)
minimal_access = list(access_explorer, access_research)
access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
minimal_access = list(ACCESS_EXPLORER, ACCESS_RESEARCH)
banned_job_species = list(SPECIES_ZADDAT)
outfit_type = /decl/hierarchy/outfit/job/explorer2
@@ -107,8 +107,8 @@ var/const/access_explorer = 43
supervisors = "the Chief Medical Officer"
selection_color = "#515151"
economic_modifier = 4
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist, access_explorer)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_explorer)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST, ACCESS_EXPLORER)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EXPLORER)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
outfit_type = /decl/hierarchy/outfit/job/medical/sar
archive/maps/southern_cross/southern_cross_overrides.dm
+4 -4
View File
@@ -1,10 +1,10 @@
/mob/living/silicon/robot/platform/explorer
req_access = list(access_explorer)
req_access = list(ACCESS_EXPLORER)
/mob/living/silicon/robot/platform/cargo
req_access = list(access_cargo_bot)
req_access = list(ACCESS_CARGO_BOT)
/obj/item/card/id/platform/Initialize(mapload)
. = ..()
access |= access_explorer
access |= access_pilot
access |= ACCESS_EXPLORER
access |= ACCESS_PILOT
archive/maps/southern_cross/southern_cross_presets.dm
+13 -13
View File
@@ -100,17 +100,17 @@ var/const/NETWORK_MAIN_OUTPOST = "Main Outpost"
/datum/map/southern_cross/default_internal_channels()
return list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ)=list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_tox,access_robotics,access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo),
num2text(SRV_FREQ) = list(access_janitor, access_hydroponics),
num2text(EXP_FREQ) = list(access_explorer)
)
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
num2text(COMM_FREQ)= list(ACCESS_HEADS),
num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
num2text(SEC_FREQ) = list(ACCESS_SECURITY),
num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
num2text(SCI_FREQ) = list(ACCESS_TOX,ACCESS_ROBOTICS,ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_HYDROPONICS),
num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
)
archive/maps/southern_cross/southern_cross_shuttles.dm
+4 -6
View File
@@ -23,7 +23,7 @@
//Admin
/obj/machinery/computer/shuttle_control/administration
name = "shuttle control console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Administration"
/datum/shuttle/autodock/ferry/administration
@@ -51,7 +51,7 @@
/obj/machinery/computer/shuttle_control/centcom
name = "shuttle control console"
req_access = list(access_cent_general)
req_access = list(ACCESS_CENT_GENERAL)
shuttle_tag = "Centcom"
/datum/shuttle/autodock/ferry/centcom
@@ -82,7 +82,7 @@
/*
/obj/machinery/computer/shuttle_control/multi/skipjack
name = "skipjack control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Skipjack"
@@ -100,7 +100,7 @@
/*
/obj/machinery/computer/shuttle_control/multi/ninja
name = "stealth shuttle control console"
req_access = list(access_syndicate)
req_access = list(ACCESS_SYNDICATE)
shuttle_tag = "Ninja"
/datum/shuttle/multi_shuttle/ninja
@@ -367,5 +367,3 @@ ESCAPE_POD(8)
// Heist shuttle
archive/maps/southern_cross/structures/closets/engineering.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/engineering_chief_wardrobe
name = "chief engineer's wardrobe"
req_access = list(access_ce)
req_access = list(ACCESS_CE)
closet_appearance = /decl/closet_appearance/secure_closet/engineering/ce
starts_with = list(
archive/maps/southern_cross/structures/closets/medical.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/CMO_wardrobe
name = "chief medical officer's locker"
req_access = list(access_cmo)
req_access = list(ACCESS_CMO)
closet_appearance = /decl/closet_appearance/secure_closet/cmo
starts_with = list(
archive/maps/southern_cross/structures/closets/misc.dm
+6 -6
View File
@@ -2,7 +2,7 @@
/obj/structure/closet/secure_closet/guncabinet/sidearm
name = "emergency weapon cabinet"
req_one_access = list(access_armory,access_captain)
req_one_access = list(ACCESS_ARMORY,ACCESS_CAPTAIN)
starts_with = list(
/obj/item/gun/energy/gun = 4)
@@ -10,7 +10,7 @@
/obj/structure/closet/secure_closet/guncabinet/rifle
name = "rifle cabinet"
req_one_access = list(access_explorer,access_brig)
req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/ammo_magazine/clip/c762/hunter = 9,
@@ -25,7 +25,7 @@
/obj/structure/closet/secure_closet/guncabinet/phase
name = "explorer weapon cabinet"
req_one_access = list(access_explorer,access_brig)
req_one_access = list(ACCESS_EXPLORER,ACCESS_BRIG)
starts_with = list(
/obj/item/gun/energy/phasegun = 2,
@@ -37,7 +37,7 @@
/obj/structure/closet/secure_closet/explorer
name = "explorer locker"
req_access = list(access_explorer)
req_access = list(ACCESS_EXPLORER)
starts_with = list(
/obj/item/clothing/under/explorer,
@@ -76,7 +76,7 @@
/obj/structure/closet/secure_closet/sar
name = "search and rescue locker"
desc = "Supplies for a wilderness first responder."
req_access = list(access_medical_equip)
req_access = list(ACCESS_MEDICAL_EQUIP)
closet_appearance = /decl/closet_appearance/secure_closet/medical
starts_with = list(
@@ -110,7 +110,7 @@
/obj/structure/closet/secure_closet/pilot
name = "pilot locker"
req_access = list(access_pilot)
req_access = list(ACCESS_PILOT)
starts_with = list(
/obj/item/storage/backpack/parachute,
archive/maps/southern_cross/structures/closets/research.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/RD_wardrobe
name = "research director's locker"
req_access = list(access_rd)
req_access = list(ACCESS_RD)
closet_appearance = /decl/closet_appearance/secure_closet/science/rd
starts_with = list(
archive/maps/southern_cross/structures/closets/security.dm
+1 -1
View File
@@ -5,7 +5,7 @@
/obj/structure/closet/secure_closet/hos_wardrobe
name = "head of security's locker"
req_access = list(access_hos)
req_access = list(ACCESS_HOS)
closet_appearance = /decl/closet_appearance/secure_closet/security/hos
starts_with = list(
archive/maps/submaps/depreciated_vr/talon.dm
+21 -21
View File
@@ -58,7 +58,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talonboat
name = "boat control console"
shuttle_tag = "Talon's boat"
req_one_access = list(access_talon)
req_one_access = list(ACCESS_TALON)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/talonboat
@@ -102,7 +102,7 @@ GLOBAL_LIST_EMPTY(latejoin_talon)
/obj/machinery/computer/shuttle_control/explore/talon_lifeboat
name = "lifeboat control console"
shuttle_tag = "Talon lifeboat"
req_one_access = list(access_talon)
req_one_access = list(ACCESS_TALON)
// A shuttle lateloader landmark
/obj/effect/shuttle_landmark/shuttle_initializer/talon_lifeboat
@@ -173,7 +173,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/card/id/synthetic/talon/Initialize(mapload)
. = ..()
access = list(access_talon, access_synth)
access = list(ACCESS_TALON, ACCESS_SYNTH)
/obj/machinery/power/smes/buildable/offmap_spawn/Initialize(mapload)
. = ..()
@@ -185,18 +185,18 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/machinery/power/apc/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(ACCESS_TALON)
/obj/machinery/power/apc/talon/hyper
cell_type = /obj/item/cell/hyper
/obj/machinery/alarm/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon
req_access = list()
req_one_access = list(access_talon)
req_one_access = list(ACCESS_TALON)
/obj/machinery/door/firedoor/glass/talon/hidden
name = "\improper Emergency Shutter System"
@@ -261,7 +261,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_captain
name = "talon captain's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/captain
starts_with = list(
@@ -279,7 +279,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_guard
name = "talon guard's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/guard
starts_with = list(
@@ -306,7 +306,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_doctor
name = "talon doctor's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/doctor
starts_with = list(
@@ -326,7 +326,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_engineer
name = "talon engineer's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/engineer
starts_with = list(
@@ -348,7 +348,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_pilot
name = "talon pilot's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/pilot
starts_with = list(
@@ -375,7 +375,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/structure/closet/secure_closet/talon_miner
name = "talon miner's locker"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
closet_appearance = /decl/closet_appearance/secure_closet/talon/miner
starts_with = list(
@@ -401,7 +401,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
desc = "Medical drug dispenser."
icon_state = "med"
product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
req_access = list(access_talon)
req_access = list(ACCESS_TALON)
products = list(/obj/item/reagent_containers/glass/bottle/antitoxin = 4,/obj/item/reagent_containers/glass/bottle/inaprovaline = 4,
/obj/item/reagent_containers/glass/bottle/stoxin = 4,/obj/item/reagent_containers/glass/bottle/toxin = 4,
/obj/item/reagent_containers/syringe/antiviral = 4,/obj/item/reagent_containers/syringe = 12,
@@ -411,7 +411,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
/obj/item/glasses_kit = 1, /obj/item/storage/quickdraw/syringe_case = 4)
contraband = list(/obj/item/reagent_containers/pill/tox = 3,/obj/item/reagent_containers/pill/stox = 4,/obj/item/reagent_containers/pill/antitox = 6)
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
req_log_access = access_talon
req_log_access = ACCESS_TALON
has_logs = 1
///////////////////////////
@@ -423,7 +423,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
extended_desc = "This program allows remote access to Talon helmet camera systems."
size = 4 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_helmet
required_access = access_talon
required_access = ACCESS_TALON
// Talon ship cameras
/datum/computer_file/program/camera_monitor/talon_ship
@@ -432,7 +432,7 @@ Once in open space, consider disabling nonessential power-consuming electronics
extended_desc = "This program allows remote access to the Talon's camera system."
size = 10 //Smaller because limited scope
tguimodule_path = /datum/tgui_module/camera/ntos/talon_ship
required_access = access_talon
required_access = ACCESS_TALON
/datum/tgui_module/camera/ntos/talon_ship
name = "Talon Ship Camera Monitor"
@@ -447,23 +447,23 @@ Once in open space, consider disabling nonessential power-consuming electronics
/datum/computer_file/program/power_monitor/talon
filename = "tpowermonitor"
filedesc = "Power Monitoring (Talon)"
required_access = access_talon
required_access = ACCESS_TALON
/datum/computer_file/program/alarm_monitor/talon
filename = "talarmmonitoreng"
filedesc = "Alarm Monitoring (Talon)"
required_access = access_talon
required_access = ACCESS_TALON
/datum/computer_file/program/rcon_console/talon
filename = "trconconsole"
filedesc = "RCON Remote Control (Talon)"
required_access = access_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
/datum/computer_file/program/suit_sensors/talon
filename = "tsensormonitor"
filedesc = "Suit Sensors Monitoring (Talon)"
required_access = access_talon
required_access = ACCESS_TALON
// Modular computer/console presets
/obj/item/modular_computer/laptop/preset/custom_loadout/standard/talon/pilot
code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
+1 -1
View File
@@ -33,7 +33,7 @@
var/input_pressure_min = INTERNAL_PRESSURE_BOUND
var/output_pressure_max = DEFAULT_PRESSURE_DELTA
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
+1 -1
View File
@@ -23,7 +23,7 @@
var/flowing = 0 //for icons - becomes zero if the valve closes itself due to regulation mode
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/binary_devices/pump.dm
+1 -1
View File
@@ -33,7 +33,7 @@ Thus, the two variables affect pump operation are set in New():
var/max_pressure_setting = 15000 //kPa
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
+1 -1
View File
@@ -32,7 +32,7 @@ Thus, the two variables affect pump operation are set in New():
var/max_transfer_rate = ATMOS_DEFAULT_VOLUME_PUMP // Ls
var/transfer_rate = 20 // L
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/trinary_devices/filter.dm
+1 -1
View File
@@ -30,7 +30,7 @@
var/list/filtered_out = list()
var/frequency = 0
var/frequency = ZERO_FREQ
var/datum/radio_frequency/radio_connection
/obj/machinery/atmospherics/trinary/atmos_filter/proc/set_frequency(new_frequency)
code/ATMOSPHERICS/components/tvalve.dm
+1 -1
View File
@@ -258,7 +258,7 @@
icon = 'icons/atmos/digital_tvalve.dmi'
pipe_state = "dtvalve"
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/unary/outlet_injector.dm
+1 -1
View File
@@ -18,7 +18,7 @@
var/volume_rate = 50 //flow rate limit
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/ATMOSPHERICS/components/unary/vent_pump.dm
+1 -1
View File
@@ -41,7 +41,7 @@
var/internal_pressure_bound_default = INTERNAL_PRESSURE_BOUND
var/pressure_checks_default = PRESSURE_CHECKS
var/frequency = 1439
var/frequency = PUMPS_FREQ
var/datum/radio_frequency/radio_connection
var/radio_filter_out
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
+1 -1
View File
@@ -15,7 +15,7 @@
var/area/initial_loc
var/id_tag = null
var/frequency = 1439
var/frequency = PUMPS_FREQ
var/datum/radio_frequency/radio_connection
var/scrubbing = 1 //0 = siphoning, 1 = scrubbing
code/ATMOSPHERICS/components/valve.dm
+1 -1
View File
@@ -223,7 +223,7 @@
icon = 'icons/atmos/digital_valve.dmi'
pipe_state = "dvalve"
var/frequency = 0
var/frequency = ZERO_FREQ
var/id = null
var/datum/radio_frequency/radio_connection
code/__defines/access.dm
+114
View File
@@ -0,0 +1,114 @@
#define ACCESS_SECURITY 1
#define ACCESS_BRIG 2 // Brig timers and permabrig
#define ACCESS_ARMORY 3
#define ACCESS_FORENSICS_LOCKERS 4
#define ACCESS_MEDICAL 5
#define ACCESS_MORGUE 6
#define ACCESS_TOX 7
#define ACCESS_TOX_STORAGE 8
#define ACCESS_GENETICS 9
#define ACCESS_ENGINE 10
#define ACCESS_ENGINE_EQUIP 11
#define ACCESS_MAINT_TUNNELS 12
#define ACCESS_EXTERNAL_AIRLOCKS 13
#define ACCESS_EMERGENCY_STORAGE 14
#define ACCESS_CHANGE_IDS 15
#define ACCESS_AI_UPLOAD 16
#define ACCESS_TELEPORTER 17
#define ACCESS_EVA 18
#define ACCESS_HEADS 19
#define ACCESS_CAPTAIN 20
#define ACCESS_ALL_PERSONAL_LOCKERS 21
#define ACCESS_CHAPEL_OFFICE 22
#define ACCESS_TECH_STORAGE 23
#define ACCESS_ATMOSPHERICS 24
#define ACCESS_BAR 25
#define ACCESS_JANITOR 26
#define ACCESS_CREMATORIUM 27
#define ACCESS_KITCHEN 28
#define ACCESS_ROBOTICS 29
#define ACCESS_RD 30
#define ACCESS_CARGO 31
#define ACCESS_CONSTRUCTION 32
#define ACCESS_CHEMISTRY 33
#define ACCESS_CARGO_BOT 34
#define ACCESS_HYDROPONICS 35
#define ACCESS_MANUFACTURING 36
#define ACCESS_LIBRARY 37
#define ACCESS_LAWYER 38
#define ACCESS_VIROLOGY 39
#define ACCESS_CMO 40
#define ACCESS_QM 41
#define ACCESS_NETWORK 42
#define ACCESS_EXPLORER 43
#define ACCESS_PATHFINDER 44
#define ACCESS_SURGERY 45
// #define UNUSED 46
#define ACCESS_RESEARCH 47
#define ACCESS_MINING 48
#define ACCESS_MINING_OFFICE 49
#define ACCESS_MAILSORTING 50
// #define UNUSED 51
// #define UNUSED 52
#define ACCESS_HEADS_VAULT 53
#define ACCESS_MINING_STATION 54
#define ACCESS_XENOBIOLOGY 55
#define ACCESS_CE 56
#define ACCESS_HOP 57
#define ACCESS_HOS 58
#define ACCESS_RC_ANNOUNCE 59 //Request console announcements
#define ACCESS_KEYCARD_AUTH 60 //Used for events which require at least two people to confirm them
#define ACCESS_TCOMSAT 61 // has access to the entire telecomms satellite / machinery
#define ACCESS_GATEWAY 62
#define ACCESS_SEC_DOORS 63 // Security front doors
#define ACCESS_PSYCHIATRIST 64 // Psychiatrist's office
#define ACCESS_XENOARCH 65
#define ACCESS_MEDICAL_EQUIP 66
#define ACCESS_PILOT 67
#define ACCESS_ENTERTAINMENT 72
#define ACCESS_XENOBOTANY 77
#define ACCESS_CENT_GENERAL 101 //General facilities.
#define ACCESS_CENT_THUNDER 102 //Thunderdome.
#define ACCESS_CENT_SPECOPS 103 //Special Ops.
#define ACCESS_CENT_MEDICAL 104 //Medical/Research
#define ACCESS_CENT_LIVING 105 //Living quarters.
#define ACCESS_CENT_STORAGE 106 //Generic storage areas.
#define ACCESS_CENT_TELEPORTER 107 //Teleporter.
#define ACCESS_CENT_CREED 108 //Creed's office.
#define ACCESS_CENT_CAPTAIN 109 //Captain's office/ID comp/AI.
#define ACCESS_CLOWN 136
#define ACCESS_TOMFOOLERY 137
#define ACCESS_MIME 138
#define ACCESS_SYNDICATE 150 //General Syndicate Access
#define ACCESS_TRADER 160 //General Beruang Trader Access
#define ACCESS_SYNTH 199
#define ACCESS_CRATE_CASH 200
#define ACCESS_ALIEN 300 // For things like crashed ships.
#define ACCESS_TALON 301
#define ACCESS_LOST 511 // For outsider borgs
code/__defines/click.dm
+1
View File
@@ -0,0 +1 @@
#define TK_MAXRANGE 15
code/__defines/jobs.dm
+79 -1
View File
@@ -388,7 +388,7 @@
#define JOB_ARTIFICER "Artificer"
#define JOB_WRAITH "Wraith"
#define JOB_JUGGERNAUT "Juggernaut"
#define JOB_MODE = "MODE"
#define JOB_MODE "MODE"
#define JOB_DISEMBODIED_VOICE "Disembodied Voice"
#define JOB_ALIEN "Alien"
#define JOB_GOLEM "Golem"
@@ -434,3 +434,81 @@
#define DEPARTMENT_BITFLAG_SILICON (1<<7)
#define DEPARTMENT_BITFLAG_ASSISTANT (1<<8)
#define DEPARTMENT_BITFLAG_CAPTAIN (1<<9)
// Jobflags by Department
#define ENGSEC (1<<0)
#define CAPTAIN (1<<0)
#define HOS (1<<1)
#define WARDEN (1<<2)
#define DETECTIVE (1<<3)
#define OFFICER (1<<4)
#define CHIEF (1<<5)
#define ENGINEER (1<<6)
#define ATMOSTECH (1<<7)
#define AI_DEPT (1<<8)
#define CYBORG (1<<9)
#define CLOWN (1<<13)
#define MIME (1<<14)
#define INTERN (1<<15)
#define MEDSCI (1<<1)
#define RD (1<<0)
#define SCIENTIST (1<<1)
#define CHEMIST (1<<2)
#define CMO (1<<3)
#define DOCTOR (1<<4)
#define GENETICIST (1<<5)
#define VIROLOGIST (1<<6)
#define PSYCHIATRIST (1<<7)
#define ROBOTICIST (1<<8)
#define XENOBIOLOGIST (1<<9)
#define PARAMEDIC (1<<10)
#define PATHFINDER (1<<11)
#define EXPLORER (1<<12)
#define SAR (1<<13)
#define XENOBOTANIST (1<<14)
#define CIVILIAN (1<<2)
#define HOP (1<<0)
#define BARTENDER (1<<1)
#define BOTANIST (1<<2)
#define CHEF (1<<3)
#define JANITOR (1<<4)
#define LIBRARIAN (1<<5)
#define QUARTERMASTER (1<<6)
#define CARGOTECH (1<<7)
#define MINER (1<<8)
#define LAWYER (1<<9)
#define CHAPLAIN (1<<10)
#define ASSISTANT (1<<11)
#define BRIDGE (1<<12)
#define PILOT (1<<13)
#define ENTERTAINER (1<<14)
#define ENTREPRENEUR (1<<15)
#define OTHER (1<<10) //VOREStation Note: Unused on VS. Used downstream.
#define NONCREW (1<<0)
#define ANOMALY (1<<0) //VOREStation Note: Unused on VS. Used downstream.
#define TALON (1<<3)
#define TALCAP (1<<0)
#define TALPIL (1<<1)
#define TALDOC (1<<2)
#define TALSEC (1<<3)
#define TALENG (1<<4)
#define TALMIN (1<<5)
GLOBAL_LIST_INIT(command_positions, list(
JOB_SITE_MANAGER,
JOB_HEAD_OF_PERSONNEL,
JOB_HEAD_OF_SECURITY,
JOB_CHIEF_ENGINEER,
JOB_RESEARCH_DIRECTOR,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_COMMAND_SECRETARY
//JOB_BLUESHIELD_GUARD
))
code/__defines/machinery.dm
+5
View File
@@ -75,6 +75,11 @@
#define NETWORK_TALON_HELMETS "TalonHelmets" //VOREStation Add
#define NETWORK_TALON_SHIP "TalonShip" //VOREStation Add
//Camera networks
#define NETWORK_TETHER "Tether"
#define NETWORK_OUTSIDE "Outside"
#define NETWORK_HALLS "Halls"
// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.
var/list/restricted_camera_networks = list(NETWORK_ERT,NETWORK_MERCENARY,"Secret", NETWORK_COMMUNICATORS)
code/__defines/radio.dm
+98
View File
@@ -26,3 +26,101 @@
// Other Channels
#define CHANNEL_TALON "Talon"
#define CHANNEL_CASINO "Casino"
/*
Frequency range: 1200 to 1600
Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
Radio:
1459 - standard radio chat
1351 - Science
1353 - Command
1355 - Medical
1357 - Engineering
1359 - Security
1341 - deathsquad
1443 - Confession Intercom
1347 - Cargo techs
1349 - Service people
Devices:
1451 - tracking implant
1457 - RSD default
On the map:
1311 for prison shuttle console (in fact, it is not used)
1433 for engine components
1435 for status displays
1437 for atmospherics/fire alerts
1439 for air pumps, air scrubbers, atmo control
1441 for atmospherics - supply tanks
1443 for atmospherics - distribution loop/mixed air tank
1445 for bot nav beacons
1447 for mulebot, secbot and ed209 control
1449 for airlock controls, electropack, magnets
1451 for toxin lab access
1453 for engineering access
1455 for AI access
*/
#define RADIO_LOW_FREQ 1200
#define PUBLIC_LOW_FREQ 1441
#define PUBLIC_HIGH_FREQ 1489
#define RADIO_HIGH_FREQ 1600
// Machinery
#define ZERO_FREQ 0
#define AIRLOCK_FREQ 1379
#define AUTODOCK_FREQ 1381
#define ENGINE_FREQ 1433
#define DISPLAY_FREQ 1435
#define ALERT_FREQ 1437
#define PUMPS_FREQ 1439
#define BEACON_FREQ 1445
#define AMAG_ELE_FREQ 1449
#define TRACK_IMP_FREQ 1451
#define RSD_FREQ 1457
#define BOT_FREQ 1447
#define COMM_FREQ 1353
#define ERT_FREQ 1345
#define AI_FREQ 1343
#define DTH_FREQ 1341
#define SYND_FREQ 1213
#define RAID_FREQ 1277
#define ENT_FREQ 1461 //entertainment frequency. This is not a diona exclusive frequency.
#define LOCKED_COM_FREQ 1481
// department channels
#define PUB_FREQ 1459
#define SEC_FREQ 1359
#define ENG_FREQ 1357
#define MED_FREQ 1355
#define SCI_FREQ 1351
#define SRV_FREQ 1349
#define SUP_FREQ 1347
#define EXP_FREQ 1361
// internal department channels
#define MED_I_FREQ 1485
#define SEC_I_FREQ 1475
#define TALON_FREQ 1363
#define CSN_FREQ 1365
/* filters */
//When devices register with the radio controller, they might register under a certain filter.
//Other devices can then choose to send signals to only those devices that belong to a particular filter.
//This is done for performance, so we don't send signals to lots of machines unnecessarily.
//This filter is special because devices belonging to default also recieve signals sent to any other filter.
#define RADIO_DEFAULT "radio_default"
#define RADIO_TO_AIRALARM "radio_airalarm" //air alarms
#define RADIO_FROM_AIRALARM "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms
#define RADIO_CHAT "radio_telecoms"
#define RADIO_ATMOSIA "radio_atmos"
#define RADIO_NAVBEACONS "radio_navbeacon"
#define RADIO_AIRLOCK "radio_airlock"
#define RADIO_SECBOT "radio_secbot"
#define RADIO_MULEBOT "radio_mulebot"
#define RADIO_MAGNETS "radio_magnet"
code/_global_vars/__unsorted.dm
-10
View File
@@ -17,16 +17,6 @@ GLOBAL_LIST(global_map)
// Noises made when hit while typing.
GLOBAL_LIST_INIT(hit_appends, list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF"))
// var/station_name = "Northern Star"
// var/const/station_orig = "Northern Star" //station_name can't be const due to event prefix/suffix
// var/const/station_short = "Northern Star"
// var/const/dock_name = "Vir Interstellar Spaceport"
// var/const/boss_name = "Central Command"
// var/const/boss_short = "CentCom"
// var/const/company_name = "NanoTrasen"
// var/const/company_short = "NT"
// var/const/star_name = "Vir"
// var/const/starsys_name = "Vir"
GLOBAL_VAR_INIT(game_year, (text2num(time2text(world.realtime, "YYYY")) + 300))
GLOBAL_VAR_INIT(round_progressing, TRUE)
code/_global_vars/radio.dm
+4 -87
View File
@@ -1,69 +1,4 @@
/*
Frequency range: 1200 to 1600
Radiochat range: 1441 to 1489 (most devices refuse to be tune to other frequency, even during mapmaking)
Radio:
1459 - standard radio chat
1351 - Science
1353 - Command
1355 - Medical
1357 - Engineering
1359 - Security
1341 - deathsquad
1443 - Confession Intercom
1347 - Cargo techs
1349 - Service people
Devices:
1451 - tracking implant
1457 - RSD default
On the map:
1311 for prison shuttle console (in fact, it is not used)
1433 for engine components
1435 for status displays
1437 for atmospherics/fire alerts
1439 for air pumps, air scrubbers, atmo control
1441 for atmospherics - supply tanks
1443 for atmospherics - distribution loop/mixed air tank
1445 for bot nav beacons
1447 for mulebot, secbot and ed209 control
1449 for airlock controls, electropack, magnets
1451 for toxin lab access
1453 for engineering access
1455 for AI access
*/
var/const/RADIO_LOW_FREQ = 1200
var/const/PUBLIC_LOW_FREQ = 1441
var/const/PUBLIC_HIGH_FREQ = 1489
var/const/RADIO_HIGH_FREQ = 1600
var/const/BOT_FREQ = 1447
var/const/COMM_FREQ = 1353
var/const/ERT_FREQ = 1345
var/const/AI_FREQ = 1343
var/const/DTH_FREQ = 1341
var/const/SYND_FREQ = 1213
var/const/RAID_FREQ = 1277
var/const/ENT_FREQ = 1461 //entertainment frequency. This is not a diona exclusive frequency.
// department channels
var/const/PUB_FREQ = 1459
var/const/SEC_FREQ = 1359
var/const/ENG_FREQ = 1357
var/const/MED_FREQ = 1355
var/const/SCI_FREQ = 1351
var/const/SRV_FREQ = 1349
var/const/SUP_FREQ = 1347
var/const/EXP_FREQ = 1361
// internal department channels
var/const/MED_I_FREQ = 1485
var/const/SEC_I_FREQ = 1475
var/const/TALON_FREQ = 1363 //VOREStation Add
var/const/CSN_FREQ = 1365 //VOREStation Add
var/list/radiochannels = list(
GLOBAL_LIST_INIT(radiochannels, list(
CHANNEL_COMMON = PUB_FREQ,
CHANNEL_SCIENCE = SCI_FREQ,
CHANNEL_COMMAND = COMM_FREQ,
@@ -83,7 +18,7 @@ var/list/radiochannels = list(
CHANNEL_SECURITY_1 = SEC_I_FREQ,
CHANNEL_TALON = TALON_FREQ, //VOREStation Add
CHANNEL_CASINO = CSN_FREQ,
)
))
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels
// I've kept this around just for you.
@@ -92,8 +27,8 @@ var/list/radiochannels = list(
set category = "Generate TGUI Radio Constants"
var/list/channel_info = list()
for(var/i in RADIO_LOW_FREQ to RADIO_HIGH_FREQ)
for(var/key in radiochannels)
if(i == radiochannels[key])
for(var/key in GLOB.radiochannels)
if(i == GLOB.radiochannels[key])
channel_info.Add(list(list("name" = key, "freq" = i, "color" = frequency_span_class(i))))
for(var/list/channel in channel_info)
switch(channel["color"])
@@ -164,21 +99,3 @@ var/list/OFFMAP_FREQS = list(TALON_FREQ, CSN_FREQ) //VOREStation Add
return "expradio"
//VOREStation Add End
return "radio"
/* filters */
//When devices register with the radio controller, they might register under a certain filter.
//Other devices can then choose to send signals to only those devices that belong to a particular filter.
//This is done for performance, so we don't send signals to lots of machines unnecessarily.
//This filter is special because devices belonging to default also recieve signals sent to any other filter.
var/const/RADIO_DEFAULT = "radio_default"
var/const/RADIO_TO_AIRALARM = "radio_airalarm" //air alarms
var/const/RADIO_FROM_AIRALARM = "radio_airalarm_rcvr" //devices interested in recieving signals from air alarms
var/const/RADIO_CHAT = "radio_telecoms"
var/const/RADIO_ATMOSIA = "radio_atmos"
var/const/RADIO_NAVBEACONS = "radio_navbeacon"
var/const/RADIO_AIRLOCK = "radio_airlock"
var/const/RADIO_SECBOT = "radio_secbot"
var/const/RADIO_MULEBOT = "radio_mulebot"
var/const/RADIO_MAGNETS = "radio_magnet"
code/_helpers/global_lists.dm
+13 -13
View File
@@ -86,7 +86,7 @@ GLOBAL_LIST_EMPTY(escape_list)
GLOBAL_LIST_EMPTY(endgame_exits)
GLOBAL_LIST_EMPTY(endgame_safespawns)
GLOBAL_LIST_INIT(syndicate_access, list(access_maint_tunnels, access_syndicate, access_external_airlocks))
GLOBAL_LIST_INIT(syndicate_access, list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS))
// Ores (for mining)
GLOBAL_LIST_EMPTY(ore_data)
@@ -677,19 +677,19 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/paicard)
// Access check is of the type requires one. These have been carefully selected to avoid allowing the janitor to see channels he shouldn't
GLOBAL_LIST_INIT(default_internal_channels, list(
num2text(PUB_FREQ) = list(),
num2text(AI_FREQ) = list(access_synth),
num2text(AI_FREQ) = list(ACCESS_SYNTH),
num2text(ENT_FREQ) = list(),
num2text(ERT_FREQ) = list(access_cent_specops),
num2text(COMM_FREQ)= list(access_heads),
num2text(ENG_FREQ) = list(access_engine_equip, access_atmospherics),
num2text(MED_FREQ) = list(access_medical_equip),
num2text(MED_I_FREQ)=list(access_medical_equip),
num2text(SEC_FREQ) = list(access_security),
num2text(SEC_I_FREQ)=list(access_security),
num2text(SCI_FREQ) = list(access_tox, access_robotics, access_xenobiology),
num2text(SUP_FREQ) = list(access_cargo, access_mining_station),
num2text(SRV_FREQ) = list(access_janitor, access_library, access_hydroponics, access_bar, access_kitchen),
num2text(EXP_FREQ) = list(access_explorer)
num2text(ERT_FREQ) = list(ACCESS_CENT_SPECOPS),
num2text(COMM_FREQ)= list(ACCESS_HEADS),
num2text(ENG_FREQ) = list(ACCESS_ENGINE_EQUIP, ACCESS_ATMOSPHERICS),
num2text(MED_FREQ) = list(ACCESS_MEDICAL_EQUIP),
num2text(MED_I_FREQ)=list(ACCESS_MEDICAL_EQUIP),
num2text(SEC_FREQ) = list(ACCESS_SECURITY),
num2text(SEC_I_FREQ)=list(ACCESS_SECURITY),
num2text(SCI_FREQ) = list(ACCESS_TOX, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY),
num2text(SUP_FREQ) = list(ACCESS_CARGO, ACCESS_MINING_STATION),
num2text(SRV_FREQ) = list(ACCESS_JANITOR, ACCESS_LIBRARY, ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN),
num2text(EXP_FREQ) = list(ACCESS_EXPLORER)
))
GLOBAL_LIST_INIT(default_medbay_channels, list(
code/_onclick/click.dm
+1 -1
View File
@@ -220,7 +220,7 @@
if((LASER in mutations) && a_intent == I_HURT)
LaserEyes(A) // moved into a proc below
else if(has_telegrip())
if(get_dist(src, A) > tk_maxrange)
if(get_dist(src, A) > TK_MAXRANGE)
to_chat(src, TK_OUTRANGED_MESSAGE)
return
A.attack_tk(src)
code/_onclick/hud/ai.dm
+8 -8
View File
@@ -1,22 +1,22 @@
/obj/screen/ai/multicam/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.toggle_multicam()
var/mob/living/silicon/ai/ai_user = usr
ai_user.toggle_multicam()
/obj/screen/ai/add_multicam/Click()
if(..())
return
var/mob/living/silicon/ai/AI = usr
AI.drop_new_multicam()
var/mob/living/silicon/ai/ai_user = usr
ai_user.drop_new_multicam()
/obj/screen/ai/up/Click()
var/mob/living/silicon/ai/AI = usr
AI.zMove(UP)
var/mob/living/silicon/ai/ai_user = usr
ai_user.zMove(UP)
/obj/screen/ai/down/Click()
var/mob/living/silicon/ai/AI = usr
AI.zMove(DOWN)
var/mob/living/silicon/ai/ai_user = usr
ai_user.zMove(DOWN)
/mob/living/silicon/ai/create_mob_hud(datum/hud/HUD, apply_to_client = TRUE)
..()
code/_onclick/hud/screen_objects.dm
+32 -32
View File
@@ -551,77 +551,77 @@
if("AI Core")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.view_core()
var/mob/living/silicon/ai/ai_user = usr
ai_user.view_core()
if("Show Camera List")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/camera = tgui_input_list(AI, "Pick Camera:", "Camera Choice", AI.get_camera_list())
AI.ai_camera_list(camera)
var/mob/living/silicon/ai/ai_user = usr
var/camera = tgui_input_list(ai_user, "Pick Camera:", "Camera Choice", ai_user.get_camera_list())
ai_user.ai_camera_list(camera)
if("Track With Camera")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
var/target_name = tgui_input_list(AI, "Pick Mob:", "Mob Choice", AI.trackable_mobs())
AI.ai_camera_track(target_name)
var/mob/living/silicon/ai/ai_user = usr
var/target_name = tgui_input_list(ai_user, "Pick Mob:", "Mob Choice", ai_user.trackable_mobs())
ai_user.ai_camera_track(target_name)
if("Toggle Camera Light")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.toggle_camera_light()
var/mob/living/silicon/ai/ai_user = usr
ai_user.toggle_camera_light()
if("Crew Monitoring")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.subsystem_crew_monitor()
var/mob/living/silicon/ai/ai_user = usr
ai_user.subsystem_crew_monitor()
if("Show Crew Manifest")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.subsystem_crew_manifest()
var/mob/living/silicon/ai/ai_user = usr
ai_user.subsystem_crew_manifest()
if("Show Alerts")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.subsystem_alarm_monitor()
var/mob/living/silicon/ai/ai_user = usr
ai_user.subsystem_alarm_monitor()
if("Announcement")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_announcement()
var/mob/living/silicon/ai/ai_user = usr
ai_user.ai_announcement()
if("Call Emergency Shuttle")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_call_shuttle()
var/mob/living/silicon/ai/ai_user = usr
ai_user.ai_call_shuttle()
if("State Laws")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.ai_checklaws()
var/mob/living/silicon/ai/ai_user = usr
ai_user.ai_checklaws()
if("PDA - Send Message")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.aiPDA.start_program(AI.aiPDA.find_program(/datum/data/pda/app/messenger))
AI.aiPDA.cmd_pda_open_ui(usr)
var/mob/living/silicon/ai/ai_user = usr
ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
ai_user.aiPDA.cmd_pda_open_ui(usr)
if("PDA - Show Message Log")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.aiPDA.start_program(AI.aiPDA.find_program(/datum/data/pda/app/messenger))
AI.aiPDA.cmd_pda_open_ui(usr)
var/mob/living/silicon/ai/ai_user = usr
ai_user.aiPDA.start_program(ai_user.aiPDA.find_program(/datum/data/pda/app/messenger))
ai_user.aiPDA.cmd_pda_open_ui(usr)
if("Take Image")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.take_image()
var/mob/living/silicon/ai/ai_user = usr
ai_user.take_image()
if("View Images")
if(isAI(usr))
var/mob/living/silicon/ai/AI = usr
AI.view_images()
var/mob/living/silicon/ai/ai_user = usr
ai_user.view_images()
else
return attempt_vr(src,"Click_vr",list(location,control,params))
return 1
code/_onclick/other_mobs.dm
+1 -1
View File
@@ -59,7 +59,7 @@
TKG.use_grip_power(src,TRUE)
if(client.eye != src) // Extremely bad exploits if allowed to TK while remote viewing
to_chat(src, TK_DENIED_MESSAGE)
else if(get_dist(src, A) > tk_maxrange)
else if(get_dist(src, A) > TK_MAXRANGE)
to_chat(src, TK_OUTRANGED_MESSAGE)
else
A.attack_tk(src)
code/_onclick/telekinesis.dm
+1 -8
View File
@@ -1,10 +1,3 @@
/*
Telekinesis
This needs more thinking out, but I might as well.
*/
var/const/tk_maxrange = 15
/*
Telekinetic attack:
@@ -114,7 +107,7 @@ var/const/tk_maxrange = 15
var/d = get_dist(user, target)
if(focus)
d = max(d, get_dist(user, focus)) // whichever is further
if(d > tk_maxrange)
if(d > TK_MAXRANGE)
to_chat(user, TK_OUTRANGED_MESSAGE)
return
code/controllers/subsystems/communications.dm
+1 -1
View File
@@ -181,7 +181,7 @@ SUBSYSTEM_DEF(radio)
var/list/data = list()
var/encryption
var/frequency = 0
var/frequency = ZERO_FREQ
/datum/signal/proc/copy_from(datum/signal/model)
source = model.source
code/controllers/subsystems/job.dm
+1 -1
View File
@@ -90,7 +90,7 @@ SUBSYSTEM_DEF(job)
return type_occupations[jobtype]
// Determines if a job title is inside of a specific department.
// Useful to replace the old `if(job_title in command_positions)` code.
// Useful to replace the old `if(job_title in GLOB.command_positions)` code.
/datum/controller/subsystem/job/proc/is_job_in_department(rank, target_department_name)
var/datum/department/D = LAZYACCESS(department_datums, target_department_name)
if(istype(D))
code/controllers/subsystems/ticker.dm
+4 -3
View File
@@ -93,11 +93,11 @@ SUBSYSTEM_DEF(ticker)
/datum/controller/subsystem/ticker/fire(resumed = FALSE)
switch(current_state)
if(GAME_STATE_STARTUP)
if(Master.initializations_finished_with_no_players_logged_in)
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
// if(Master.initializations_finished_with_no_players_logged_in) // We want to wait the full time after the startup finished
start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
for(var/client/C in GLOB.clients)
window_flash(C, ignorepref = TRUE) //let them know lobby has opened up.
to_chat(world, span_notice("<b>Welcome to [station_name()]!</b>"))
to_chat(world, span_boldnotice("Welcome to [station_name()]!"))
//for(var/channel_tag in CONFIG_GET(str_list/channel_announce_new_game))
// send2chat(new /datum/tgs_message_content("New round starting on [SSmapping.current_map.map_name]!"), channel_tag)
current_state = GAME_STATE_PREGAME
@@ -108,6 +108,7 @@ SUBSYSTEM_DEF(ticker)
//lobby stats for statpanels
if(isnull(timeLeft))
timeLeft = max(0,start_at - world.time)
to_chat(world, span_notice("Round starting in [round(timeLeft / 10)] Seonds!"))
totalPlayers = LAZYLEN(GLOB.new_player_list)
totalPlayersReady = 0
total_admins_ready = 0
code/datums/supplypacks/atmospherics.dm
+3 -3
View File
@@ -70,7 +70,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/large/aether
containername = "Pipe Dispenser Crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/disposals_dispenser
contains = list(/obj/machinery/pipedispenser/disposal/orderable)
@@ -79,7 +79,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/large/aether
containername = "Disposal Dispenser Crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/rapid_pipe_dispenser
contains = list(/obj/item/pipe_dispenser)
@@ -88,7 +88,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/aether
containername = "Rapid Pipe Dispenser Crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/atmos/internals
name = "Internals crate"
code/datums/supplypacks/engineering.dm
+18 -18
View File
@@ -167,7 +167,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Emitter crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/engine/field_gen
name = "Field Generator crate"
@@ -175,7 +175,7 @@
contains = list(/obj/machinery/field_generator = 2)
containertype = /obj/structure/closet/crate/secure/xion
containername = "Field Generator crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/engine/sing_gen
name = "Singularity Generator crate"
@@ -183,7 +183,7 @@
contains = list(/obj/machinery/the_singularitygen)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Singularity Generator crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/engine/tesla_gen
name = "Tesla Generator crate"
@@ -191,7 +191,7 @@
contains = list(/obj/machinery/the_singularitygen/tesla)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Tesla Generator crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/engine/collector
name = "Collector crate"
@@ -215,7 +215,7 @@
)
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Particle Accelerator crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/shield_gen
contains = list(/obj/item/circuitboard/shield_gen)
@@ -224,7 +224,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "bubble shield generator circuitry crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/shield_gen_ex
contains = list(/obj/item/circuitboard/shield_gen_ex)
@@ -233,7 +233,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "hull shield generator circuitry crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/shield_cap
contains = list(/obj/item/circuitboard/shield_cap)
@@ -242,7 +242,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/focalpoint
containername = "shield capacitor circuitry crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/smbig
name = "Supermatter Core"
@@ -251,7 +251,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/phoron
containername = "Supermatter crate (CAUTION)"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/eng/teg
contains = list(/obj/machinery/power/generator)
@@ -260,7 +260,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/large/einstein
containername = "Mk1 TEG crate"
access = access_engine
access = ACCESS_ENGINE
/datum/supply_pack/eng/circulator
contains = list(/obj/machinery/atmospherics/binary/circulator)
@@ -269,7 +269,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/large/einstein
containername = "Atmospheric circulator crate"
access = access_engine
access = ACCESS_ENGINE
/datum/supply_pack/eng/radsuit
contains = list(
@@ -299,7 +299,7 @@
cost = 25
containername = "P.A.C.M.A.N. Portable Generator Construction Kit"
containertype = /obj/structure/closet/crate/secure/focalpoint
access = access_tech_storage
access = ACCESS_TECH_STORAGE
contains = list(
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
@@ -313,7 +313,7 @@
cost = 35
containername = "Super P.A.C.M.A.N. portable generator construction kit"
containertype = /obj/structure/closet/crate/secure/focalpoint
access = access_tech_storage
access = ACCESS_TECH_STORAGE
contains = list(
/obj/item/stock_parts/micro_laser,
/obj/item/stock_parts/capacitor,
@@ -327,7 +327,7 @@
cost = 50
containername = "R-UST Mk. 8 Tokamak Fusion Core crate"
containertype = /obj/structure/closet/crate/secure/einstein
access = access_engine
access = ACCESS_ENGINE
contains = list(
/obj/item/book/manual/rust_engine,
/obj/machinery/power/fusion_core,
@@ -340,7 +340,7 @@
cost = 30
containername = "R-UST Mk. 8 fuel injector crate"
containertype = /obj/structure/closet/crate/secure/einstein
access = access_engine
access = ACCESS_ENGINE
contains = list(
/obj/machinery/fusion_fuel_injector,
/obj/machinery/fusion_fuel_injector,
@@ -353,7 +353,7 @@
cost = 15
containername = "Gyrotron Crate"
containertype = /obj/structure/closet/crate/secure/einstein
access = access_engine
access = ACCESS_ENGINE
contains = list(
/obj/machinery/power/emitter/gyrotron,
/obj/item/circuitboard/gyrotron
@@ -405,7 +405,7 @@
cost = 30
containertype = /obj/structure/closet/crate/large
containername = "thermal regulator crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/eng/dosimeter
contains = list(/obj/item/storage/box/dosimeter = 6)
@@ -430,4 +430,4 @@
cost = 90 //Relatively expensive
containertype = /obj/structure/closet/crate/xion
containername = "Inducers crate"
access = access_engine
access = ACCESS_ENGINE
code/datums/supplypacks/hardsuits.dm
+12 -12
View File
@@ -16,9 +16,9 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "eva hardsuit crate"
access = list(access_mining,
access_eva,
access_pilot)
access = list(ACCESS_MINING,
ACCESS_EVA,
ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/hardsuits/mining_rig
@@ -30,8 +30,8 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "industrial hardsuit crate"
access = list(access_mining,
access_eva)
access = list(ACCESS_MINING,
ACCESS_EVA)
one_access = TRUE
/datum/supply_pack/hardsuits/medical_rig
@@ -43,7 +43,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "medical hardsuit crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/hardsuits/security_rig
name = "hazard hardsuit (empty)"
@@ -54,7 +54,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "hazard hardsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/hardsuits/science_rig
name = "ami hardsuit (empty)"
@@ -65,7 +65,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "ami hardsuit crate"
access = access_rd
access = ACCESS_RD
/datum/supply_pack/hardsuits/ce_rig
name = "advanced hardsuit (empty)"
@@ -76,7 +76,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/gear
containername = "advanced hardsuit crate"
access = access_ce
access = ACCESS_CE
/datum/supply_pack/hardsuits/com_medical_rig
name = "commonwealth medical hardsuit (loaded)"
@@ -87,7 +87,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "Commonwealth medical hardsuit crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/hardsuits/com_engineering_rig
name = "commonwealth engineering hardsuit (loaded)"
@@ -98,7 +98,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "Commonwealth engineering hardsuit crate"
access = access_engine
access = ACCESS_ENGINE
/datum/supply_pack/hardsuits/breacher_rig
name = "unathi breacher hardsuit (empty)"
@@ -109,7 +109,7 @@
cost = 250
containertype = /obj/structure/closet/crate/secure/gear
containername = "unathi breacher hardsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/hardsuits/zero_rig
name = "null hardsuit (jets)"
code/datums/supplypacks/hydroponics.dm
+10 -10
View File
@@ -89,7 +89,7 @@
cost = 20
containertype = /obj/structure/closet/crate/hydroponics
containername = "Hydroponics crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/cow
name = "Cow crate"
@@ -97,7 +97,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/cow
containername = "Cow crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/goat
name = "Goat crate"
@@ -105,7 +105,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/goat
containername = "Goat crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/chicken
name = "Chicken crate"
@@ -113,7 +113,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/chick
containername = "Chicken crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/turkey
name = "Turkey crate"
@@ -121,7 +121,7 @@
cost = 25
containertype = /obj/structure/largecrate/animal/turkey
containername = "Turkey crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/seeds
name = "Seeds crate"
@@ -148,7 +148,7 @@
cost = 10
containertype = /obj/structure/closet/crate/carp
containername = "Seeds crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/weedcontrol
name = "Weed control crate"
@@ -163,7 +163,7 @@
cost = 45
containertype = /obj/structure/closet/crate/grayson
containername = "Weed control crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/watertank
name = "Water tank crate"
@@ -185,7 +185,7 @@
cost = 40
containertype = /obj/structure/closet/crate/carp
containername = "Beekeeping crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/tray
name = "Empty hydroponics trays"
@@ -194,7 +194,7 @@
containertype = /obj/structure/closet/crate/aether
containername = "Hydroponics tray crate"
contains = list(/obj/machinery/portable_atmospherics/hydroponics{anchored = FALSE} = 3)
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/birds
name = "Birds Crate"
@@ -202,7 +202,7 @@
cost = 200 //You're getting 22 birds. Of course it's going to be a lot!
containertype = /obj/structure/largecrate/birds
containername = "Bird crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/hydro/sobaka
name = "Sobaka crate"
code/datums/supplypacks/medical.dm
+19 -19
View File
@@ -77,7 +77,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Surgery crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/med/deathalarm
name = "Death Alarm crate"
@@ -89,7 +89,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/ward
containername = "Death Alarm crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/med/clotting
name = "Clotting Medicine crate"
@@ -100,7 +100,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Clotting Medicine crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/med/sterile
name = "Sterile equipment crate"
@@ -128,7 +128,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical surplus equipment"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/med/cmogear
name = "Chief Medical Officer equipment"
@@ -154,7 +154,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Chief medical officer equipment"
access = access_cmo
access = ACCESS_CMO
/datum/supply_pack/med/doctorgear
name = JOB_MEDICAL_DOCTOR + " equipment"
@@ -178,7 +178,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_MEDICAL_DOCTOR + " equipment"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/chemistgear
name = JOB_CHEMIST + " equipment"
@@ -202,7 +202,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_CHEMIST + " equipment"
access = access_chemistry
access = ACCESS_CHEMISTRY
/datum/supply_pack/med/paramedicgear
name = JOB_PARAMEDIC + " equipment"
@@ -231,7 +231,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_PARAMEDIC + " equipment"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/psychiatristgear
name = JOB_PSYCHIATRIST + " equipment"
@@ -251,7 +251,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanomed
containername = JOB_PSYCHIATRIST + " equipment"
access = access_psychiatrist
access = ACCESS_PSYCHIATRIST
/datum/supply_pack/med/medicalscrubs
name = "Medical scrubs"
@@ -273,7 +273,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical scrubs crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/autopsy
name = "Autopsy equipment"
@@ -291,7 +291,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Autopsy equipment crate"
access = access_morgue
access = ACCESS_MORGUE
/datum/supply_pack/med/medicaluniforms
name = "Medical uniforms"
@@ -319,7 +319,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical uniform crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/medicalbiosuits
name = "Medical biohazard gear"
@@ -338,7 +338,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical biohazard equipment"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/portablefreezers
name = "Portable freezers crate"
@@ -347,7 +347,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Portable freezers"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/virus
name = "Virus culture crate"
@@ -356,7 +356,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Virus culture crate"
access = access_cmo
access = ACCESS_CMO
/datum/supply_pack/med/defib
name = "Defibrillator crate"
@@ -420,7 +420,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Virology biohazard equipment"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/disease
name = "Experimental Disease crate"
@@ -430,7 +430,7 @@
)
cost = 60
containertype = /obj/structure/closet/crate/freezer
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/disease_minor
name = "Minor Experimental Disease crate"
@@ -440,7 +440,7 @@
)
cost = 40
containertype = /obj/structure/closet/crate/freezer
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/med/compactdefib
name = "Compact Defibrillator crate"
@@ -449,4 +449,4 @@
cost = 90
containertype = /obj/structure/closet/crate/secure
containername = "Compact Defibrillator crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
code/datums/supplypacks/misc.dm
+11 -11
View File
@@ -229,8 +229,8 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/gear
containername = "Belt-miner gear crate"
access = list(access_mining,
access_xenoarch)
access = list(ACCESS_MINING,
ACCESS_XENOARCH)
one_access = TRUE
/datum/supply_pack/misc/jetpack
@@ -242,10 +242,10 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
containername = "jetpack crate"
access = list(access_mining,
access_xenoarch,
access_eva,
access_pilot)
access = list(ACCESS_MINING,
ACCESS_XENOARCH,
ACCESS_EVA,
ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/randomised/misc/explorer_shield
@@ -261,8 +261,8 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration shield crate"
access = list(access_eva,
access_pilot)
access = list(ACCESS_EVA,
ACCESS_PILOT)
one_access = TRUE
/datum/supply_pack/misc/music_players
@@ -295,9 +295,9 @@
containertype = /obj/structure/closet/crate/secure/gear
containername = "exploration radio headsets crate"
access = list(
access_explorer,
access_eva,
access_pilot
ACCESS_EXPLORER,
ACCESS_EVA,
ACCESS_PILOT
)
one_access = TRUE
code/datums/supplypacks/munitions.dm
+34 -34
View File
@@ -22,7 +22,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Security equipment crate"
access = access_security*/
access = ACCESS_SECURITY*/
/datum/supply_pack/munitions/egunpistol
name = "Weapons - Energy sidearms"
@@ -31,7 +31,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Energy sidearms crate"
access = access_armory //VOREStation Edit - Guns are for the armory.
access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/flareguns
name = "Weapons - Flare guns"
@@ -45,7 +45,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/gear
containername = "Flare gun crate"
access = access_armory //VOREStation Edit - Guns are for the armory.
access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/eweapons
name = "Weapons - Experimental weapons crate"
@@ -56,7 +56,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/science
containername = "Experimental weapons crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/energyweapons
name = "Weapons - Laser rifle crate"
@@ -65,7 +65,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy weapons crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/shotgun
name = "Weapons - Shotgun crate"
@@ -78,7 +78,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Shotgun crate"
access = access_armory
access = ACCESS_ARMORY
/* VOREStation edit -- This is a bad idea. -- So is this.
/datum/supply_pack/munitions/shotgunsemi
@@ -91,7 +91,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Semi-Auto Shotgun crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/erifle
name = "Weapons - Energy marksman"
@@ -99,7 +99,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/heph
containername = "Energy marksman crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/burstlaser
name = "Weapons - Burst laser"
@@ -107,7 +107,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Burst laser crate"
access = access_armory
access = ACCESS_ARMORY
*/
/datum/supply_pack/munitions/ionweapons
name = "Weapons - Electromagnetic Pulse Rifles"
@@ -119,7 +119,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Electromagnetic weapons crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/ionpistols
name = "Weapons - Electromagnetic Pulse pistols"
@@ -131,7 +131,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/ward
containername = "Electromagnetic weapons crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/bsmg
name = "Weapons - Ballistic SMGs"
@@ -140,7 +140,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/ward
containername = "Ballistic weapon crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/brifle
name = "Weapons - Ballistic Rifles"
@@ -149,7 +149,7 @@
cost = 80
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic weapon crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/bolt_rifles_lethal
name = "Weapons - Bolt-Action Rifles"
@@ -161,7 +161,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic Weapons crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/bolt_rifles_competitive
name = "Weapons - Competitive shooting rifles"
@@ -177,7 +177,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic Weapons crate"
access = access_armory //VOREStation Edit - Guns are for the armory.
access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/caseless
name = "Weapons - Prototype Caseless Rifle"
@@ -189,7 +189,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Caseless rifle crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/mrifle
name = "Weapons - Magnetic Rifles"
@@ -198,7 +198,7 @@
cost = 120
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/mpistol
name = "Weapons - Magnetic Pistols"
@@ -207,7 +207,7 @@
cost = 200
containertype = /obj/structure/closet/crate/secure/heph
containername = "Magnetic weapon crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/mcarbine
name = "Weapons - Magnetic Carbines"
@@ -216,7 +216,7 @@
cost = 130
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Magnetic weapon crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/mshells
name = "Weapons - Magnetic Shells"
@@ -225,7 +225,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Magnetic ammunition crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/claymore
name = "Weapons - Melee - Claymores"
@@ -234,7 +234,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Claymore crate"
access = access_armory //two swords that are a one-hit 40 brute + IB chance should be armory-locked
access = ACCESS_ARMORY //two swords that are a one-hit 40 brute + IB chance should be armory-locked
/datum/supply_pack/munitions/shotgunammo
name = "Ammunition - Shotgun shells"
@@ -246,7 +246,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/beanbagammo
name = "Ammunition - Beanbag shells"
@@ -255,7 +255,7 @@
cost = 25
containertype = /obj/structure/closet/crate
containername = "Ballistic ammunition crate"
access = access_armory //VOREStation Edit - Guns are for the armory.
access = ACCESS_ARMORY //VOREStation Edit - Guns are for the armory.
/datum/supply_pack/munitions/bsmgammo
name = "Ammunition - 9mm top mounted lethal"
@@ -264,7 +264,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/bsmgammorubber
name = "Ammunition - 9mm top mounted rubber"
@@ -273,7 +273,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/brifleammo
name = "Ammunition - 7.62mm lethal"
@@ -282,7 +282,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Ballistic ammunition crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/munitions/pcellammo
name = "Ammunition - Power cell"
@@ -291,7 +291,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/weapon
containername = "Energy ammunition crate"
access = access_security
access = ACCESS_SECURITY
/*
/datum/supply_pack/munitions/expeditionguns
@@ -303,7 +303,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure
containername = "frontier phaser crate"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/munitions/expeditionbows
name = "Frontier bows (station-locked) crate"
@@ -313,7 +313,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "phaser handbow crate"
access = access_security
access = ACCESS_SECURITY
*/
/datum/supply_pack/munitions/ofd_charge_emp
@@ -325,7 +325,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "EMP disperser charge crate"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_explosive
name = "OFD Charge - Explosive"
@@ -336,7 +336,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Explosive disperser charge crate"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_incendiary
name = "OFD Charge - Incendiary"
@@ -347,7 +347,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Incendiary disperser charge crate"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/munitions/ofd_charge_mining
name = "OFD Charge - Mining"
@@ -358,7 +358,7 @@
cost = 35
containertype = /obj/structure/closet/crate/large/secure/heph
containername = "Mining disperser charge crate"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/munitions/longsword
name = "Weapons - Melee -Longsword (Steel)"
@@ -369,4 +369,4 @@
cost = 50
containertype = /obj/structure/closet/crate/secure
containername = "longsword"
access = access_armory
access = ACCESS_ARMORY
code/datums/supplypacks/recreation.dm
+1 -1
View File
@@ -9,7 +9,7 @@
/datum/supply_pack/randomised/recreation
group = "Recreation"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/recreation/foam_weapons
name = "Foam Weapon Crate"
code/datums/supplypacks/robotics.dm
+22 -22
View File
@@ -9,7 +9,7 @@
/datum/supply_pack/randomised/robotics
group = "Robotics"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robotics_assembly
name = "Robotics assembly crate"
@@ -23,7 +23,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Robotics assembly"
access = access_robotics
access = ACCESS_ROBOTICS
/*/datum/supply_pack/robotics/robolimbs_basic
name = "Basic robolimb blueprints"
@@ -34,7 +34,7 @@
cost = 15
containertype = /obj/structure/closet/crate/secure/gear
containername = "Robolimb blueprints (basic)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs_adv
name = "All robolimb blueprints"
@@ -50,7 +50,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
containername = "Robolimb blueprints (adv)"
access = access_robotics
access = ACCESS_ROBOTICS
*/
/datum/supply_pack/robotics/robolimbs/morpheus
@@ -60,7 +60,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/morpheus
containername = "Robolimb blueprints (Morpheus)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/cybersolutions
name = "Cyber Solutions robolimb blueprints"
@@ -69,7 +69,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/cybersolutions
containername = "Robolimb blueprints (Cyber Solutions)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/xion
name = "Xion robolimb blueprints"
@@ -78,7 +78,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/xion
containername = "Robolimb blueprints (Xion)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/grayson
name = "Grayson robolimb blueprints"
@@ -87,7 +87,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Robolimb blueprints (Grayson)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/hephaestus
name = "Hephaestus robolimb blueprints"
@@ -96,7 +96,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Robolimb blueprints (Hephaestus)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/wardtakahashi
name = "Ward-Takahashi robolimb blueprints"
@@ -105,7 +105,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/ward
containername = "Robolimb blueprints (Ward-Takahashi)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/zenghu
name = "Zeng Hu robolimb blueprints"
@@ -114,7 +114,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/zenghu
containername = "Robolimb blueprints (Zeng Hu)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/bishop
name = "Bishop robolimb blueprints"
@@ -123,7 +123,7 @@
cost = 70
containertype = /obj/structure/closet/crate/secure/bishop
containername = "Robolimb blueprints (Bishop)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/robolimbs/cenilimicybernetics
name = "Cenilimi Cybernetics robolimb blueprints"
@@ -132,7 +132,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure/science
containername = "Robolimb blueprints (Cenilimi Cybernetics)"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_ripley
name = "Circuit Crate (\"Ripley\" APLU)"
@@ -145,7 +145,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/xion
containername = "APLU \"Ripley\" Circuit Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_odysseus
name = "Circuit Crate (\"Odysseus\")"
@@ -157,7 +157,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
containername = "\"Odysseus\" Circuit Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/randomised/robotics/exosuit_mod
num_contained = 1
@@ -202,7 +202,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/einstein
containername = "Jumper kit crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/restrainingbolt
name = "Restraining bolt crate"
@@ -214,7 +214,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/cybersolutions
containername = "Restraining bolt crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/bike
name = "Spacebike Crate"
@@ -250,7 +250,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Gopher\" Circuit Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_polecat
name = "Circuit Crate (\"Polecat\" APLU)"
@@ -263,7 +263,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Polecat\" Circuit Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/mecha_weasel
name = "Circuit Crate (\"Weasel\" APLU)"
@@ -276,7 +276,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/science
containername = "APLU \"Weasel\" Circuit Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/some_robolimbs
name = "Basic Robolimb Blueprints"
@@ -289,7 +289,7 @@
cost = 15
containertype = /obj/structure/closet/crate/secure
containername = "Basic Robolimb Blueprint Crate"
access = access_robotics
access = ACCESS_ROBOTICS
/datum/supply_pack/robotics/all_robolimbs
name = "Advanced Robolimb Blueprints"
@@ -317,4 +317,4 @@
cost = 40
containertype = /obj/structure/closet/crate/secure
containername = "Advanced Robolimb Blueprint Crate"
access = access_robotics
access = ACCESS_ROBOTICS
code/datums/supplypacks/science.dm
+8 -8
View File
@@ -28,7 +28,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/phoron
containername = "Phoron assembly crate"
access = access_tox_storage
access = ACCESS_TOX_STORAGE
/datum/supply_pack/sci/exoticseeds
name = "Exotic seeds crate"
@@ -44,7 +44,7 @@
cost = 15
containertype = /obj/structure/closet/crate/carp
containername = "Exotic Seeds crate"
access = access_hydroponics
access = ACCESS_HYDROPONICS
/datum/supply_pack/sci/integrated_circuit_printer
name = "Integrated circuit printer"
@@ -88,7 +88,7 @@
cost = 100
containertype = /obj/structure/closet/crate/secure/xion
containername = "Xenoarchaeology Tech crate"
access = access_research
access = ACCESS_RESEARCH
/*
/datum/supply_pack/sci/dune_buggy
@@ -107,7 +107,7 @@
cost = 40
containertype = /obj/structure/largecrate/animal/pred
containername = "Dangerous Predator crate"
access = access_xenobiology
access = ACCESS_XENOBIOLOGY
/datum/supply_pack/sci/pred_doom
name = "EXTREMELY Dangerous Predator crate"
@@ -115,7 +115,7 @@
cost = 200
containertype = /obj/structure/largecrate/animal/dangerous
containername = "EXTREMELY Dangerous Predator crate"
access = access_xenobiology
access = ACCESS_XENOBIOLOGY
contraband = 1
/datum/supply_pack/sci/weretiger
@@ -124,19 +124,19 @@
cost = 55
containertype = /obj/structure/largecrate/animal/weretiger
containername = "Weretiger crate"
access = access_xenobiology
access = ACCESS_XENOBIOLOGY
/*
/datum/supply_pack/sci/otie
name = "VARMAcorp adoptable reject (Dangerous!)"
cost = 100
containertype = /obj/structure/largecrate/animal/otie
containername = "VARMAcorp adoptable reject (Dangerous!)"
access = access_xenobiology
access = ACCESS_XENOBIOLOGY
/datum/supply_pack/sci/phoronotie
name = "VARMAcorp adaptive beta subject (Experimental)"
cost = 200
containertype = /obj/structure/largecrate/animal/otie/phoron
containername = "VARMAcorp adaptive beta subject (Experimental)"
access = access_xenobiology
access = ACCESS_XENOBIOLOGY
*/ //VORESTATION AI TEMPORARY REMOVAL. Oties commented out cuz broke.
code/datums/supplypacks/security.dm
+29 -29
View File
@@ -6,11 +6,11 @@
/datum/supply_pack/security
group = "Security"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/randomised/security
group = "Security"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/randomised/security/armor
name = "Armor - Security armor"
@@ -32,7 +32,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/gear
containername = "Armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/carriersblack
name = "Armor - Black modular armor"
@@ -280,7 +280,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot gear crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/riot_armor
name = "Armor - Riot"
@@ -294,7 +294,7 @@
cost = 30
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/riot_plates
name = "Armor - Riot plates"
@@ -306,7 +306,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot armor crate"
access = access_armory
access = ACCESS_ARMORY
/*
/datum/supply_pack/security/riot_sprayer
name = "Gear - Riot sprayer"
@@ -316,7 +316,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Riot sprayer crate"
access = access_armory*/
access = ACCESS_ARMORY*/
/datum/supply_pack/security/ablative_armor
name = "Armor - Ablative"
@@ -330,7 +330,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Ablative armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/ablative_plates
name = "Armor - Ablative plates"
@@ -342,7 +342,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/lawson
containername = "Ablative armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/bullet_resistant_armor
name = "Armor - Ballistic"
@@ -356,7 +356,7 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/heph
containername = "Ballistic armor crate"
access = access_armory
access = ACCESS_ARMORY
/* VOREStation Removal - Howabout no ERT armor being orderable?
/datum/supply_pack/security/bullet_resistant_plates
@@ -368,7 +368,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/heph
containername = "Ballistic armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/combat_armor
name = "Armor - Combat"
@@ -381,14 +381,14 @@
cost = 40
containertype = /obj/structure/closet/crate/secure/saare
containername = "Combat armor crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/tactical
name = "Armor - Tactical"
containertype = /obj/structure/closet/crate/secure/saare
containername = "Tactical armor crate"
cost = 40
access = access_armory
access = ACCESS_ARMORY
contains = list(
/obj/item/clothing/under/tactical,
/obj/item/clothing/suit/armor/tactical,
@@ -415,7 +415,7 @@
containertype = /obj/structure/closet/crate/secure/saare
containername = "Tactical Light armor crate"
cost = 75
access = access_armory
access = ACCESS_ARMORY
contains = list(
/obj/item/clothing/suit/storage/vest/heavy/flexitac,
/obj/item/clothing/head/helmet/flexitac,
@@ -448,7 +448,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/heph
containername = "Wall shield generators crate"
access = access_teleporter
access = ACCESS_TELEPORTER
/datum/supply_pack/randomised/security/holster
name = "Gear - Holsters"
@@ -506,7 +506,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Forensic equipment"
access = access_forensics_lockers
access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/detectivescan
name = "Forensic - Scanning Equipment"
@@ -520,7 +520,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/ward
containername = "Forensic equipment"
access = access_forensics_lockers
access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/detectiveclothes
name = "Forensic - Investigation apparel"
@@ -543,7 +543,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Investigation clothing"
access = access_forensics_lockers
access = ACCESS_FORENSICS_LOCKERS
/datum/supply_pack/security/officergear
name = "Gear - Officer equipment"
@@ -574,7 +574,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Officer equipment"
access = access_brig
access = ACCESS_BRIG
/datum/supply_pack/security/wardengear
name = "Gear - " + JOB_WARDEN + " equipment"
@@ -604,7 +604,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = JOB_WARDEN + " equipment"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/security/headofsecgear
name = "Gear - " + JOB_HEAD_OF_SECURITY + " equipment"
@@ -633,7 +633,7 @@
cost = 50
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = JOB_HEAD_OF_SECURITY + " equipment"
access = access_hos
access = ACCESS_HOS
/datum/supply_pack/security/securityclothing
name = "Misc - Security uniform red"
@@ -713,7 +713,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Security biohazard gear"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/security/posters
name = "Gear - Morale Posters"
@@ -724,7 +724,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/nanotrasen
containername = "Morale Posters"
access = access_maint_tunnels
access = ACCESS_MAINT_TUNNELS
/*/datum/supply_pack/security/guardbeast //VORESTATION AI TEMPORARY REMOVAL
name = "VARMAcorp autoNOMous security solution"
@@ -732,8 +732,8 @@
containertype = /obj/structure/largecrate/animal/guardbeast
containername = "VARMAcorp autoNOMous security solution crate"
access = list(
access_security,
access_xenobiology)
ACCESS_SECURITY,
ACCESS_XENOBIOLOGY)
one_access = TRUE
/datum/supply_pack/security/guardmutant
@@ -742,8 +742,8 @@
containertype = /obj/structure/largecrate/animal/guardmutant
containername = "VARMAcorp autoNOMous security phoron-proof solution crate"
access = list(
access_security,
access_xenobiology)
ACCESS_SECURITY,
ACCESS_XENOBIOLOGY)
one_access = TRUE
*/
@@ -756,7 +756,7 @@
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Tracking implants"
access = access_security
access = ACCESS_SECURITY
/datum/supply_pack/security/chemicalimplant
name = "Implants - Chemical"
@@ -767,4 +767,4 @@
cost = 25
containertype = /obj/structure/closet/crate/secure
containername = "Chemical implants"
access = access_security
access = ACCESS_SECURITY
code/datums/supplypacks/supply.dm
+4 -4
View File
@@ -143,7 +143,7 @@
cost = 10
containertype = /obj/structure/closet/crate/secure/xion
containername = "Shaft miner equipment"
access = access_mining
access = ACCESS_MINING
/* //No longer supported on our current maps, as it requires specialized dropoff beacons and the pathfinding doesn't work well on multi-z
//plus we have the destination tagger
@@ -207,7 +207,7 @@
cost=25
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_EXPLORER + " equipment"
access = list(access_eva, access_explorer)
access = list(ACCESS_EVA, ACCESS_EXPLORER)
/datum/supply_pack/pilotgear
name= JOB_PILOT + " gear"
@@ -233,7 +233,7 @@
cost=20
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_PILOT + " equipment"
access = access_pilot
access = ACCESS_PILOT
/datum/supply_pack/supply/foodcubes
name = "Emergency food cubes"
@@ -272,7 +272,7 @@
cost = 75
containertype = /obj/structure/closet/crate/secure/xion
containername = JOB_PATHFINDER + " equipment"
access = list(access_explorer)
access = list(ACCESS_EXPLORER)
/datum/supply_pack/supply/postal_service
name = "Postal Service Supplies"
code/datums/supplypacks/voidsuits.dm
+27 -27
View File
@@ -20,7 +20,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/aether
containername = "Atmospheric voidsuit crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/atmos/alt
name = "Heavy Duty Atmospheric voidsuits"
@@ -35,7 +35,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/aether
containername = "Heavy Duty Atmospheric voidsuit crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/engineering
name = "Engineering voidsuits"
@@ -50,7 +50,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering voidsuit crate"
access = access_engine_equip
access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/construction
name = "Engineering Construction voidsuits"
@@ -65,7 +65,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Construction voidsuit crate"
access = access_engine_equip
access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/hazmat
name = "Engineering Hazmat voidsuits"
@@ -80,7 +80,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Engineering Hazmat voidsuit crate"
access = access_engine_equip
access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/engineering/alt
name = "Reinforced Engineering voidsuits"
@@ -95,7 +95,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/xion
containername = "Reinforced Engineering voidsuit crate"
access = access_engine_equip
access = ACCESS_ENGINE_EQUIP
/datum/supply_pack/voidsuits/medical
name = "Medical voidsuits"
@@ -110,7 +110,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical voidsuit crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/emt
name = "Medical EMT voidsuits"
@@ -125,7 +125,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Medical EMT voidsuit crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/bio
name = "Medical Biohazard voidsuits"
@@ -140,7 +140,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/nanomed
containername = "Medical Biohazard voidsuit crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/alt
name = "Vey-Med Autoadaptive Lightweight voidsuits"
@@ -155,7 +155,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/veymed
containername = "Vey-Med Autoadaptive Lightweight voidsuit crate"
access = access_medical_equip
access = ACCESS_MEDICAL_EQUIP
/datum/supply_pack/voidsuits/medical/alt/static
name = "Vey-Med Nonadaptive Lightweight voidsuits"
@@ -183,7 +183,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security voidsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/security/crowd
name = "Security Crowd Control voidsuits"
@@ -198,7 +198,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security Crowd Control voidsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/security/alt
name = "Security EVA voidsuits"
@@ -213,7 +213,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/heph
containername = "Security EVA voidsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/supply
name = "Mining voidsuits"
@@ -227,7 +227,7 @@
cost = 35
containertype = /obj/structure/closet/crate/secure/xion
containername = "Mining voidsuit crate"
access = access_mining
access = ACCESS_MINING
/datum/supply_pack/voidsuits/supply/alt
name = "Frontier Mining voidsuits"
@@ -241,7 +241,7 @@
cost = 60
containertype = /obj/structure/closet/crate/secure/grayson
containername = "Frontier Mining voidsuit crate"
access = access_mining
access = ACCESS_MINING
/datum/supply_pack/voidsuits/zaddat
name = "Zaddat Shroud"
@@ -268,7 +268,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = JOB_EXPLORER + "voidsuit crate"
access = list(access_eva, access_explorer)
access = list(ACCESS_EVA, ACCESS_EXPLORER)
/datum/supply_pack/voidsuits/explorer_medic
name = JOB_FIELD_MEDIC + " voidsuits"
@@ -283,7 +283,7 @@
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = JOB_FIELD_MEDIC + " voidsuit crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/voidsuits/pilot
name = JOB_PILOT + " voidsuits"
@@ -298,7 +298,7 @@
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = JOB_PILOT + " voidsuit crate"
access = access_pilot
access = ACCESS_PILOT
// Surplus!
/datum/supply_pack/voidsuits/com_mining
@@ -311,7 +311,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth mining voidsuit crate"
access = access_mining
access = ACCESS_MINING
/datum/supply_pack/voidsuits/com_anomaly
name = "Commonwealth anomaly suit"
@@ -323,7 +323,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth anomaly suit crate"
access = access_xenoarch
access = ACCESS_XENOARCH
/datum/supply_pack/voidsuits/com_riot
name = "Commonwealth riot voidsuit"
@@ -335,7 +335,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth riot voidsuit crate"
access = access_armory
access = ACCESS_ARMORY
/datum/supply_pack/voidsuits/com_pilot
name = "Commonwealth pilot voidsuit"
@@ -347,7 +347,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth pilot voidsuit crate"
access = access_pilot
access = ACCESS_PILOT
/datum/supply_pack/voidsuits/com_medical
name = "Commonwealth medical voidsuit"
@@ -359,7 +359,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth medical voidsuit crate"
access = access_medical
access = ACCESS_MEDICAL
/datum/supply_pack/voidsuits/com_explore
name = "Commonwealth exploration voidsuit"
@@ -371,7 +371,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth exploration voidsuit crate"
access = list(access_eva, access_explorer)
access = list(ACCESS_EVA, ACCESS_EXPLORER)
/datum/supply_pack/voidsuits/com_engineer
name = "Commonwealth engineering voidsuit"
@@ -383,7 +383,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth engineering voidsuit crate"
access = access_engine
access = ACCESS_ENGINE
/datum/supply_pack/voidsuits/com_atmos
name = "Commonwealth atmos voidsuit"
@@ -395,7 +395,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth atmos voidsuit crate"
access = access_atmospherics
access = ACCESS_ATMOSPHERICS
/datum/supply_pack/voidsuits/com_captain
name = "Commonwealth captain voidsuit"
@@ -407,7 +407,7 @@
cost = 150
containertype = /obj/structure/closet/crate/secure
name = "Commonwealth captain voidsuit crate"
access = access_captain
access = ACCESS_CAPTAIN
/datum/supply_pack/voidsuits/csc_breaker
name = "Shipbreaker's Industrial Suit (inc. jetpack)"
code/defines/procs/radio.dm
+2 -2
View File
@@ -20,8 +20,8 @@
if(display_freq in ANTAG_FREQS)
freq_text = "#unkn"
else
for(var/channel in radiochannels)
if(radiochannels[channel] == display_freq)
for(var/channel in GLOB.radiochannels)
if(GLOB.radiochannels[channel] == display_freq)
freq_text = channel
break
code/game/antagonist/antagonist_helpers.dm
+1 -1
View File
@@ -16,7 +16,7 @@
if(J.mob_type & JOB_SILICON)
return FALSE
else // If SSjob couldn't find a job, they don't have one yet, so the next best thing we can switch on are job preferences
if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI | CYBORG)) // If they have ANY chance of being silicon
if((player.current.client.prefs.job_engsec_high | player.current.client.prefs.job_engsec_med | player.current.client.prefs.job_engsec_low) & (AI_DEPT | CYBORG)) // If they have ANY chance of being silicon
return FALSE
return TRUE
code/game/antagonist/mutiny/mutineer.dm
+1 -1
View File
@@ -47,7 +47,7 @@ var/datum/antagonist/mutineer/mutineers
var/list/candidates[0]
for(var/mob/mutineer in GLOB.player_list)
if(mutineer.client.prefs.be_special & BE_MUTINEER)
for(var/job in command_positions - JOB_SITE_MANAGER)
for(var/job in GLOB.command_positions - JOB_SITE_MANAGER)
if(mutineer.mind && mutineer.mind.assigned_role == job)
candidates.Add(mutineer.mind)
return candidates
code/game/antagonist/outsider/deathsquad.dm
+1 -1
View File
@@ -9,7 +9,7 @@ var/datum/antagonist/deathsquad/deathsquad
antag_sound = 'sound/effects/antag_notice/deathsquid_alert.ogg'
landmark_id = "Commando"
flags = ANTAG_OVERRIDE_JOB | ANTAG_OVERRIDE_MOB | ANTAG_HAS_NUKE | ANTAG_HAS_LEADER
default_access = list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
default_access = list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
antaghud_indicator = "huddeathsquad"
hard_cap = 4
code/game/antagonist/outsider/trader.dm
+1 -1
View File
@@ -52,7 +52,7 @@ var/datum/antagonist/trader/traders
var/obj/item/card/id/id = create_id("Trader", player, equip = 0)
id.name = "[player.real_name]'s Passport"
id.assignment = "Trader"
id.access |= access_trader
id.access |= ACCESS_TRADER
var/obj/item/storage/wallet/W = new(player)
W.handle_item_insertion(id)
player.equip_to_slot_or_del(W, slot_wear_id)
code/game/area/Away Mission areas.dm
+8 -8
View File
@@ -66,24 +66,24 @@
if(!isanimal(M))
log_admin("[src] spawned [M.type], which is not a simplemob, FIXIT")
return
var/datum/ai_holder/AI = M.ai_holder
var/datum/ai_holder/our_ai_holder = M.ai_holder
if(ghostjoin)
M.ghostjoin = TRUE
M.ghostjoin_icon()
if(!AI)
if(!our_ai_holder)
return
switch(mob_intent)
if("default")
return
if("hostile")
AI.hostile = TRUE
AI.retaliate = TRUE
our_ai_holder.hostile = TRUE
our_ai_holder.retaliate = TRUE
if("retaliate")
AI.hostile = FALSE
AI.retaliate = TRUE
our_ai_holder.hostile = FALSE
our_ai_holder.retaliate = TRUE
if("passive")
AI.hostile = FALSE
AI.retaliate = FALSE
our_ai_holder.hostile = FALSE
our_ai_holder.retaliate = FALSE
/area/proc/spawn_flora_on_turf()
if(!valid_flora.len)
code/game/gamemodes/cult/ritual.dm
+6 -6
View File
@@ -69,15 +69,15 @@ GLOBAL_LIST_INIT(rnwords, list("ire","ego","nahlizet","certum","veri","jatkaa","
. = ..()
blood_image = image(loc = src)
blood_image.override = 1
for(var/mob/living/silicon/ai/AI in GLOB.player_list)
if(AI.client)
AI.client.images += blood_image
for(var/mob/living/silicon/ai/our_ai in GLOB.player_list)
if(our_ai.client)
our_ai.client.images += blood_image
GLOB.rune_list.Add(src)
/obj/effect/rune/Destroy()
for(var/mob/living/silicon/ai/AI in GLOB.player_list)
if(AI.client)
AI.client.images -= blood_image
for(var/mob/living/silicon/ai/our_ai in GLOB.player_list)
if(our_ai.client)
our_ai.client.images -= blood_image
qdel(blood_image)
blood_image = null
GLOB.rune_list.Remove(src)
code/game/gamemodes/epidemic/epidemic.dm
+1 -1
View File
@@ -74,7 +74,7 @@
var/list/crew = list()
for(var/mob/living/carbon/human/H in world) if(H.client)
// heads should not be infected
if(H.mind.assigned_role in command_positions) continue
if(H.mind.assigned_role in GLOB.command_positions) continue
crew += H
if(crew.len < 2)
code/game/gamemodes/newobjective.dm
+1 -1
View File
@@ -593,7 +593,7 @@ datum
weight = 20
get_points(var/job)
if(job in science_positions || job in command_positions)
if(job in science_positions || job in GLOB.command_positions)
return 20
return 40
code/game/gamemodes/technomancer/spells/control.dm
+10 -10
View File
@@ -31,11 +31,11 @@
if(!L.has_AI())
return FALSE
var/datum/ai_holder/AI = L.ai_holder
AI.hostile = FALSE // The Technomancer chooses the target, not the AI.
AI.retaliate = TRUE
AI.wander = FALSE
AI.forget_everything()
var/datum/ai_holder/our_ai_holder = L.ai_holder
our_ai_holder.hostile = FALSE // The Technomancer chooses the target, not the our_ai_holder.
our_ai_holder.retaliate = TRUE
our_ai_holder.wander = FALSE
our_ai_holder.forget_everything()
if(isanimal(L))
var/mob/living/simple_mob/SM = L
@@ -49,11 +49,11 @@
return FALSE
if(L.has_AI())
var/datum/ai_holder/AI = L.ai_holder
AI.hostile = initial(AI.hostile)
AI.retaliate = initial(AI.retaliate)
AI.wander = initial(AI.wander)
AI.forget_everything()
var/datum/ai_holder/our_ai_holder = L.ai_holder
our_ai_holder.hostile = initial(our_ai_holder.hostile)
our_ai_holder.retaliate = initial(our_ai_holder.retaliate)
our_ai_holder.wander = initial(our_ai_holder.wander)
our_ai_holder.forget_everything()
if(isanimal(L))
var/mob/living/simple_mob/SM = L
code/game/jobs/access.dm
+8 -8
View File
@@ -47,21 +47,21 @@
/proc/get_centcom_access(job)
switch(job)
if("VIP Guest")
return list(access_cent_general)
return list(ACCESS_CENT_GENERAL)
if("Custodian")
return list(access_cent_general, access_cent_living, access_cent_storage)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
if("Thunderdome Overseer")
return list(access_cent_general, access_cent_thunder)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER)
if("Intel Officer")
return list(access_cent_general, access_cent_living)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING)
if("Medical Officer")
return list(access_cent_general, access_cent_living, access_cent_medical)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL)
if("Death Commando")
return list(access_cent_general, access_cent_specops, access_cent_living, access_cent_storage)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE)
if("Research Officer")
return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_teleporter, access_cent_storage)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_TELEPORTER, ACCESS_CENT_STORAGE)
if("BlackOps Commander")
return list(access_cent_general, access_cent_thunder, access_cent_specops, access_cent_living, access_cent_storage, access_cent_creed)
return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER, ACCESS_CENT_SPECOPS, ACCESS_CENT_LIVING, ACCESS_CENT_STORAGE, ACCESS_CENT_CREED)
if("Supreme Commander")
return get_all_centcom_access()
code/game/jobs/access_datum.dm
+85 -175
View File
@@ -10,527 +10,437 @@
/*****************
* Station access *
*****************/
/var/const/access_security = 1
/datum/access/security
id = access_security
id = ACCESS_SECURITY
desc = "Security Equipment"
region = ACCESS_REGION_SECURITY
/var/const/access_brig = 2 // Brig timers and permabrig
/datum/access/holding
id = access_brig
id = ACCESS_BRIG
desc = "Holding Cells"
region = ACCESS_REGION_SECURITY
/var/const/access_armory = 3
/datum/access/armory
id = access_armory
id = ACCESS_ARMORY
desc = "Armory"
region = ACCESS_REGION_SECURITY
/var/const/access_forensics_lockers = 4
/datum/access/forensics_lockers
id = access_forensics_lockers
id = ACCESS_FORENSICS_LOCKERS
desc = "Forensics"
region = ACCESS_REGION_SECURITY
/var/const/access_medical = 5
/datum/access/medical
id = access_medical
id = ACCESS_MEDICAL
desc = "Medical"
region = ACCESS_REGION_MEDBAY
/var/const/access_morgue = 6
/datum/access/morgue
id = access_morgue
id = ACCESS_MORGUE
desc = "Morgue"
region = ACCESS_REGION_MEDBAY
/var/const/access_tox = 7
/datum/access/tox
id = access_tox
id = ACCESS_TOX
desc = "R&D Lab"
region = ACCESS_REGION_RESEARCH
/var/const/access_tox_storage = 8
/datum/access/tox_storage
id = access_tox_storage
id = ACCESS_TOX_STORAGE
desc = "Toxins Lab"
region = ACCESS_REGION_RESEARCH
/var/const/access_genetics = 9
/datum/access/genetics
id = access_genetics
id = ACCESS_GENETICS
desc = "Genetics Lab"
region = ACCESS_REGION_MEDBAY
/var/const/access_engine = 10
/datum/access/engine
id = access_engine
id = ACCESS_ENGINE
desc = "Engineering"
region = ACCESS_REGION_ENGINEERING
/var/const/access_engine_equip = 11
/datum/access/engine_equip
id = access_engine_equip
id = ACCESS_ENGINE_EQUIP
desc = "Engine Room"
region = ACCESS_REGION_ENGINEERING
/var/const/access_maint_tunnels = 12
/datum/access/maint_tunnels
id = access_maint_tunnels
id = ACCESS_MAINT_TUNNELS
desc = "Maintenance"
region = ACCESS_REGION_ENGINEERING
/var/const/access_external_airlocks = 13
/datum/access/external_airlocks
id = access_external_airlocks
id = ACCESS_EXTERNAL_AIRLOCKS
desc = "External Airlocks"
region = ACCESS_REGION_ENGINEERING
/var/const/access_emergency_storage = 14
/datum/access/emergency_storage
id = access_emergency_storage
id = ACCESS_EMERGENCY_STORAGE
desc = "Emergency Storage"
region = ACCESS_REGION_ENGINEERING
/var/const/access_change_ids = 15
/datum/access/change_ids
id = access_change_ids
id = ACCESS_CHANGE_IDS
desc = "ID Computer"
region = ACCESS_REGION_COMMAND
/var/const/access_ai_upload = 16
/datum/access/ai_upload
id = access_ai_upload
id = ACCESS_AI_UPLOAD
desc = "AI Upload"
region = ACCESS_REGION_COMMAND
/var/const/access_teleporter = 17
/datum/access/teleporter
id = access_teleporter
id = ACCESS_TELEPORTER
desc = "Teleporter"
region = ACCESS_REGION_COMMAND
/var/const/access_eva = 18
/datum/access/eva
id = access_eva
id = ACCESS_EVA
desc = "EVA"
region = ACCESS_REGION_COMMAND
/var/const/access_heads = 19
/datum/access/heads
id = access_heads
id = ACCESS_HEADS
desc = "Bridge"
region = ACCESS_REGION_COMMAND
/var/const/access_captain = 20
/datum/access/captain
id = access_captain
id = ACCESS_CAPTAIN
desc = JOB_SITE_MANAGER
region = ACCESS_REGION_COMMAND
/var/const/access_all_personal_lockers = 21
/datum/access/all_personal_lockers
id = access_all_personal_lockers
id = ACCESS_ALL_PERSONAL_LOCKERS
desc = "Personal Lockers"
region = ACCESS_REGION_COMMAND
/var/const/access_chapel_office = 22
/datum/access/chapel_office
id = access_chapel_office
id = ACCESS_CHAPEL_OFFICE
desc = "Chapel Office"
region = ACCESS_REGION_GENERAL
/var/const/access_tech_storage = 23
/datum/access/tech_storage
id = access_tech_storage
id = ACCESS_TECH_STORAGE
desc = "Technical Storage"
region = ACCESS_REGION_ENGINEERING
/var/const/access_atmospherics = 24
/datum/access/atmospherics
id = access_atmospherics
id = ACCESS_ATMOSPHERICS
desc = "Atmospherics"
region = ACCESS_REGION_ENGINEERING
/var/const/access_bar = 25
/datum/access/bar
id = access_bar
id = ACCESS_BAR
desc = "Bar"
region = ACCESS_REGION_GENERAL
/var/const/access_janitor = 26
/datum/access/janitor
id = access_janitor
id = ACCESS_JANITOR
desc = "Custodial Closet"
region = ACCESS_REGION_GENERAL
/var/const/access_crematorium = 27
/datum/access/crematorium
id = access_crematorium
id = ACCESS_CREMATORIUM
desc = "Crematorium"
region = ACCESS_REGION_GENERAL
/var/const/access_kitchen = 28
/datum/access/kitchen
id = access_kitchen
id = ACCESS_KITCHEN
desc = "Kitchen"
region = ACCESS_REGION_GENERAL
/var/const/access_robotics = 29
/datum/access/robotics
id = access_robotics
id = ACCESS_ROBOTICS
desc = "Robotics"
region = ACCESS_REGION_RESEARCH
/var/const/access_rd = 30
/datum/access/rd
id = access_rd
id = ACCESS_RD
desc = JOB_RESEARCH_DIRECTOR
region = ACCESS_REGION_RESEARCH
/var/const/access_cargo = 31
/datum/access/cargo
id = access_cargo
id = ACCESS_CARGO
desc = "Cargo Bay"
region = ACCESS_REGION_SUPPLY
/var/const/access_construction = 32
/datum/access/construction
id = access_construction
id = ACCESS_CONSTRUCTION
desc = "Construction Areas"
region = ACCESS_REGION_ENGINEERING
/var/const/access_chemistry = 33
/datum/access/chemistry
id = access_chemistry
id = ACCESS_CHEMISTRY
desc = "Chemistry Lab"
region = ACCESS_REGION_MEDBAY
/var/const/access_cargo_bot = 34
/datum/access/cargo_bot
id = access_cargo_bot
id = ACCESS_CARGO_BOT
desc = "Cargo Bot Delivery"
region = ACCESS_REGION_SUPPLY
/var/const/access_hydroponics = 35
/datum/access/hydroponics
id = access_hydroponics
id = ACCESS_HYDROPONICS
desc = "Hydroponics"
region = ACCESS_REGION_GENERAL
/var/const/access_manufacturing = 36
/datum/access/manufacturing
id = access_manufacturing
id = ACCESS_MANUFACTURING
desc = "Manufacturing"
access_type = ACCESS_TYPE_NONE
/var/const/access_library = 37
/datum/access/library
id = access_library
id = ACCESS_LIBRARY
desc = "Library"
region = ACCESS_REGION_GENERAL
/var/const/access_lawyer = 38
/datum/access/lawyer
id = access_lawyer
id = ACCESS_LAWYER
desc = "Internal Affairs"
region = ACCESS_REGION_COMMAND
/var/const/access_virology = 39
/datum/access/virology
id = access_virology
id = ACCESS_VIROLOGY
desc = "Virology"
region = ACCESS_REGION_MEDBAY
/var/const/access_cmo = 40
/datum/access/cmo
id = access_cmo
id = ACCESS_CMO
desc = JOB_CHIEF_MEDICAL_OFFICER
region = ACCESS_REGION_COMMAND
/var/const/access_qm = 41
/datum/access/qm
id = access_qm
id = ACCESS_QM
desc = JOB_QUARTERMASTER
region = ACCESS_REGION_SUPPLY
/var/const/access_network = 42
/datum/access/network
id = access_network
id = ACCESS_NETWORK
desc = "Station Network"
region = ACCESS_REGION_RESEARCH
var/const/access_explorer = 43
/datum/access/explorer
id = access_explorer
id = ACCESS_EXPLORER
desc = JOB_EXPLORER
region = ACCESS_REGION_GENERAL
/*
/var/const/access_pathfinder = 44
/datum/access/pathfinder
id = access_pathfinder
id = ACCESS_PATHFINDER
desc = JOB_PATHFINDER
region = ACCESS_REGION_GENERAL
*/
/var/const/access_surgery = 45
/datum/access/surgery
id = access_surgery
id = ACCESS_SURGERY
desc = "Surgery"
region = ACCESS_REGION_MEDBAY
// /var/const/free_access_id = 46
/var/const/access_research = 47
/datum/access/research
id = access_research
id = ACCESS_RESEARCH
desc = "Science"
region = ACCESS_REGION_RESEARCH
/var/const/access_mining = 48
/datum/access/mining
id = access_mining
id = ACCESS_MINING
desc = "Mining"
region = ACCESS_REGION_SUPPLY
/var/const/access_mining_office = 49
/datum/access/mining_office
id = access_mining_office
id = ACCESS_MINING_OFFICE
desc = "Mining Office"
access_type = ACCESS_TYPE_NONE
/var/const/access_mailsorting = 50
/datum/access/mailsorting
id = access_mailsorting
id = ACCESS_MAILSORTING
desc = "Cargo Office"
region = ACCESS_REGION_SUPPLY
// /var/const/free_access_id = 51
// /var/const/free_access_id = 52
/var/const/access_heads_vault = 53
/datum/access/heads_vault
id = access_heads_vault
id = ACCESS_HEADS_VAULT
desc = "Main Vault"
region = ACCESS_REGION_COMMAND
/var/const/access_mining_station = 54
/datum/access/mining_station
id = access_mining_station
id = ACCESS_MINING_STATION
desc = "Mining EVA"
region = ACCESS_REGION_SUPPLY
/var/const/access_xenobiology = 55
/datum/access/xenobiology
id = access_xenobiology
id = ACCESS_XENOBIOLOGY
desc = "Xenobiology Lab"
region = ACCESS_REGION_RESEARCH
/var/const/access_ce = 56
/datum/access/ce
id = access_ce
id = ACCESS_CE
desc = JOB_CHIEF_ENGINEER
region = ACCESS_REGION_ENGINEERING
/var/const/access_hop = 57
/datum/access/hop
id = access_hop
id = ACCESS_HOP
desc = JOB_HEAD_OF_PERSONNEL
region = ACCESS_REGION_COMMAND
/var/const/access_hos = 58
/datum/access/hos
id = access_hos
id = ACCESS_HOS
desc = JOB_HEAD_OF_SECURITY
region = ACCESS_REGION_SECURITY
/var/const/access_RC_announce = 59 //Request console announcements
/datum/access/RC_announce
id = access_RC_announce
id = ACCESS_RC_ANNOUNCE
desc = "RC Announcements"
region = ACCESS_REGION_COMMAND
/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them
/datum/access/keycard_auth
id = access_keycard_auth
id = ACCESS_KEYCARD_AUTH
desc = "Keycode Auth. Device"
region = ACCESS_REGION_COMMAND
/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery
/datum/access/tcomsat
id = access_tcomsat
id = ACCESS_TCOMSAT
desc = "Telecommunications"
region = ACCESS_REGION_COMMAND
/var/const/access_gateway = 62
/datum/access/gateway
id = access_gateway
id = ACCESS_GATEWAY
desc = "Gateway"
region = ACCESS_REGION_COMMAND
/var/const/access_sec_doors = 63 // Security front doors
/datum/access/sec_doors
id = access_sec_doors
id = ACCESS_SEC_DOORS
desc = "Security"
region = ACCESS_REGION_SECURITY
/var/const/access_psychiatrist = 64 // Psychiatrist's office
/datum/access/psychiatrist
id = access_psychiatrist
id = ACCESS_PSYCHIATRIST
desc = JOB_PSYCHIATRIST + "'s Office"
region = ACCESS_REGION_MEDBAY
/var/const/access_xenoarch = 65
/datum/access/xenoarch
id = access_xenoarch
id = ACCESS_XENOARCH
desc = "Xenoarchaeology"
region = ACCESS_REGION_RESEARCH
/var/const/access_medical_equip = 66
/datum/access/medical_equip
id = access_medical_equip
id = ACCESS_MEDICAL_EQUIP
desc = "Medical Equipment"
region = ACCESS_REGION_MEDBAY
var/const/access_pilot = 67
/datum/access/pilot
id = access_pilot
id = ACCESS_PILOT
desc = JOB_PILOT
region = ACCESS_REGION_GENERAL
/var/const/access_entertainment = 72
/datum/access/entertainment
id = access_entertainment
id = ACCESS_ENTERTAINMENT
desc = "Entertainment Backstage"
region = ACCESS_REGION_GENERAL
/var/const/access_xenobotany = 77
/datum/access/xenobotany
id = access_xenobotany
id = ACCESS_XENOBOTANY
desc = "Xenobotany Garden"
region = ACCESS_REGION_RESEARCH
/******************
* Central Command *
******************/
/var/const/access_cent_general = 101//General facilities.
/datum/access/cent_general
id = access_cent_general
id = ACCESS_CENT_GENERAL
desc = "General Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_thunder = 102//Thunderdome.
/datum/access/cent_thunder
id = access_cent_thunder
id = ACCESS_CENT_THUNDER
desc = "Entertainment Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_specops = 103//Special Ops.
/datum/access/cent_specops
id = access_cent_specops
id = ACCESS_CENT_SPECOPS
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Prep"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_medical = 104//Medical/Research
/datum/access/cent_medical
id = access_cent_medical
id = ACCESS_CENT_MEDICAL
desc = "Medical Facilities"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_living = 105//Living quarters.
/datum/access/cent_living
id = access_cent_living
id = ACCESS_CENT_LIVING
desc = "Dormitories"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_storage = 106//Generic storage areas.
/datum/access/cent_storage
id = access_cent_storage
id = ACCESS_CENT_STORAGE
desc = "Storage"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_teleporter = 107//Teleporter.
/datum/access/cent_teleporter
id = access_cent_teleporter
id = ACCESS_CENT_TELEPORTER
desc = "Central Command Teleporter"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_creed = 108//Creed's office.
/datum/access/cent_creed
id = access_cent_creed
id = ACCESS_CENT_CREED
desc = JOB_EMERGENCY_RESPONSE_TEAM + " Administration"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_cent_captain = 109//Captain's office/ID comp/AI.
/datum/access/cent_captain
id = access_cent_captain
id = ACCESS_CENT_CAPTAIN
desc = "Central Command Administration"
access_type = ACCESS_TYPE_CENTCOM
/var/const/access_clown = 136
/datum/access/clown
id = access_clown
id = ACCESS_CLOWN
desc = JOB_CLOWN + " Office"
region = ACCESS_REGION_GENERAL
/var/const/access_tomfoolery = 137
/datum/access/tomfoolery
id = access_tomfoolery
id = ACCESS_TOMFOOLERY
desc = "Tomfoolery Closet"
region = ACCESS_REGION_GENERAL
/var/const/access_mime = 138
/datum/access/mime
id = access_mime
id = ACCESS_MIME
desc = JOB_MIME + " Office"
region = ACCESS_REGION_GENERAL
/***************
* Antag access *
***************/
/var/const/access_syndicate = 150//General Syndicate Access
/datum/access/syndicate
id = access_syndicate
id = ACCESS_SYNDICATE
desc = "Syndicate"
access_type = ACCESS_TYPE_SYNDICATE
/*******
* Misc *
*******/
/var/const/access_synth = 199
/datum/access/synthetic
id = access_synth
id = ACCESS_SYNTH
desc = "Synthetic"
access_type = ACCESS_TYPE_NONE
/var/const/access_crate_cash = 200
/datum/access/crate_cash
id = access_crate_cash
id = ACCESS_CRATE_CASH
desc = "Crate cash"
access_type = ACCESS_TYPE_NONE
/var/const/access_trader = 160//General Beruang Trader Access
/datum/access/trader
id = access_trader
id = ACCESS_TRADER
desc = "Trader"
access_type = ACCESS_TYPE_PRIVATE
/var/const/access_alien = 300 // For things like crashed ships.
/datum/access/alien
id = access_alien
id = ACCESS_ALIEN
desc = "#%_^&*@!"
access_type = ACCESS_TYPE_PRIVATE
/var/const/access_talon = 301
/datum/access/talon
id = access_talon
id = ACCESS_TALON
desc = "Talon"
access_type = ACCESS_TYPE_PRIVATE
/var/const/access_lost = 511 // For outsider borgs
/datum/access/lost
id = access_lost
id = ACCESS_LOST
desc = "Lost"
access_type = ACCESS_TYPE_NONE
code/game/jobs/job/assistant.dm
+2 -2
View File
@@ -25,7 +25,7 @@
/datum/job/assistant/get_access()
if(CONFIG_GET(flag/assistant_maint))
return list(access_maint_tunnels)
return list(ACCESS_MAINT_TUNNELS)
else
return list()
@@ -142,7 +142,7 @@
/datum/job/intern/get_access()
if(CONFIG_GET(flag/assistant_maint))
return list(access_maint_tunnels)
return list(ACCESS_MAINT_TUNNELS)
else
return list()
code/game/jobs/job/captain.dm
+4 -4
View File
@@ -102,8 +102,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
manage the Supply department, through the " + JOB_QUARTERMASTER + ". In addition, the " + JOB_HEAD_OF_PERSONNEL + " oversees the personal accounts \
of the crew, including their money and access. If necessary, the " + JOB_HEAD_OF_PERSONNEL + " is first in line to assume Acting Command."
access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers, access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads, access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment)
minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth, access_gateway, access_entertainment)
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS, ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_CLOWN, ACCESS_TOMFOOLERY, ACCESS_MIME, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_ENTERTAINMENT)
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_FORENSICS_LOCKERS,ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_EVA, ACCESS_HEADS,ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER,ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_CLOWN, ACCESS_TOMFOOLERY, ACCESS_MIME, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_ENTERTAINMENT)
alt_titles = list(JOB_ALT_CREW_RESOURCE_OFFICER = /datum/alt_title/cro, JOB_ALT_DEPUTY_MANAGER = /datum/alt_title/deputy_manager, JOB_ALT_STAFF_MANAGER = /datum/alt_title/staff_manager,
JOB_ALT_FACILITY_STEWARD = /datum/alt_title/facility_steward, JOB_ALT_FIRST_MATE = /datum/alt_title/first_mate)
@@ -150,8 +150,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 1)
alt_titles = list(JOB_ALT_COMMAND_LIAISON = /datum/alt_title/command_liaison, JOB_ALT_COMMAND_ASSISTANT = /datum/alt_title/command_assistant, JOB_ALT_COMMAND_INTERN = /datum/alt_title/command_intern,
JOB_ALT_BRIDGE_SECRETARY = /datum/alt_title/bridge_secretary, JOB_ALT_BRIDGE_ASSISTANT = /datum/alt_title/bridge_assistant)
access = list(access_heads, access_keycard_auth)
minimal_access = list(access_heads, access_keycard_auth)
access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH)
minimal_access = list(ACCESS_HEADS, ACCESS_KEYCARD_AUTH)
outfit_type = /decl/hierarchy/outfit/job/secretary
job_description = "A " + JOB_COMMAND_SECRETARY + " handles paperwork duty for the Heads of Staff, so they can better focus on managing their departments. \
code/game/jobs/job/cargo.dm
+6 -6
View File
@@ -16,8 +16,8 @@
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#9b633e"
economic_modifier = 5
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_RC_announce)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_RC_ANNOUNCE)
banned_job_species = list(FBP_DIGITAL, SPECIES_PROMETHEAN)
ideal_character_age = 40
@@ -54,8 +54,8 @@
pto_type = PTO_CARGO
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING)
outfit_type = /decl/hierarchy/outfit/job/cargo/cargo_tech
job_description = "A " + JOB_CARGO_TECHNICIAN + " fills and delivers cargo orders. They are encouraged to return delivered crates to the Cargo Shuttle, \
@@ -101,8 +101,8 @@
supervisors = "the " + JOB_QUARTERMASTER + " and the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#7a4f33"
economic_modifier = 5
access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_mining, access_mining_station)
minimal_access = list(access_mining, access_mining_station, access_mailsorting)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MINING, ACCESS_MINING_STATION)
minimal_access = list(ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MAILSORTING)
outfit_type = /decl/hierarchy/outfit/job/cargo/mining
job_description = "A " + JOB_SHAFT_MINER + " mines and processes minerals to be delivered to departments that need them."
code/game/jobs/job/civilian.dm
+16 -16
View File
@@ -15,8 +15,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_bar)
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_BAR)
outfit_type = /decl/hierarchy/outfit/job/service/bartender
job_description = "A " + JOB_BARTENDER + " mixes drinks for the crew. They generally have permission to charge for drinks or deny service to unruly patrons."
@@ -53,8 +53,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the "+ JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_kitchen)
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_KITCHEN)
outfit_type = /decl/hierarchy/outfit/job/service/chef
job_description = "A " + JOB_CHEF + " cooks food for the crew. They generally have permission to charge for food or deny service to unruly diners."
@@ -87,8 +87,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_hydroponics, access_bar, access_kitchen)
minimal_access = list(access_hydroponics)
access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN)
minimal_access = list(ACCESS_HYDROPONICS)
outfit_type = /decl/hierarchy/outfit/job/service/gardener
job_description = "A " + JOB_BOTANIST+ " grows plants for the " + JOB_CHEF + " and " + JOB_BARTENDER + "."
@@ -132,8 +132,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_janitor, access_maint_tunnels)
minimal_access = list(access_janitor, access_maint_tunnels)
access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_JANITOR, ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/service/janitor
job_description = "A " + JOB_JANITOR + " keeps the station clean, as long as it doesn't interfere with active crime scenes."
@@ -169,8 +169,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_library, access_maint_tunnels)
minimal_access = list(access_library)
access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_LIBRARY)
outfit_type = /decl/hierarchy/outfit/job/librarian
job_description = "The " + JOB_LIBRARIAN + " curates the book selection in the Library, so the crew might enjoy it."
@@ -234,8 +234,8 @@
supervisors = "company officials and Corporate Regulations"
selection_color = "#515151"
economic_modifier = 7
access = list(access_lawyer, access_sec_doors, access_maint_tunnels, access_heads)
minimal_access = list(access_lawyer, access_sec_doors, access_heads)
access = list(ACCESS_LAWYER, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_HEADS)
minimal_access = list(ACCESS_LAWYER, ACCESS_SEC_DOORS, ACCESS_HEADS)
minimal_player_age = 7
banned_job_species = list(SPECIES_PROMETHEAN, SPECIES_UNATHI, SPECIES_DIONA, SPECIES_TESHARI, SPECIES_ZADDAT, FBP_DIGITAL)
@@ -272,8 +272,8 @@
economic_modifier = 5
minimal_player_age = 3
pto_type = PTO_CIVILIAN
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
outfit_type = /decl/hierarchy/outfit/job/pilot
job_description = "A " + JOB_PILOT + " flies the various shuttles in the Virgo-Erigone System."
alt_titles = list(JOB_ALT_COPILOT = /datum/alt_title/co_pilot, JOB_ALT_NAVIGATOR = /datum/alt_title/navigator, JOB_ALT_HELMSMAN = /datum/alt_title/helmsman)
@@ -305,8 +305,8 @@
spawn_positions = 4
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_entertainment)
minimal_access = list(access_entertainment)
access = list(ACCESS_ENTERTAINMENT)
minimal_access = list(ACCESS_ENTERTAINMENT)
pto_type = PTO_CIVILIAN
outfit_type = /decl/hierarchy/outfit/job/assistant/entertainer
code/game/jobs/job/civilian_chaplain.dm
+2 -2
View File
@@ -10,8 +10,8 @@
pto_type = PTO_CIVILIAN
supervisors = "the " + JOB_HEAD_OF_PERSONNEL
selection_color = "#515151"
access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels)
minimal_access = list(access_chapel_office, access_crematorium)
access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM)
outfit_type = /decl/hierarchy/outfit/job/chaplain
job_description = "The " + JOB_CHAPLAIN + " ministers to the spiritual needs of the crew."
code/game/jobs/job/engineering.dm
+12 -12
View File
@@ -26,15 +26,15 @@
pto_type = PTO_ENGINEERING
dept_time_required = 60
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_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
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_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_GATEWAY)
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_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_ai_upload, access_gateway)
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_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_AI_UPLOAD, ACCESS_GATEWAY)
alt_titles = list(JOB_ALT_HEAD_ENGINEER = /datum/alt_title/head_engineer, JOB_ALT_FOREMAN = /datum/alt_title/foreman, JOB_ALT_MAINTENANCE_MANAGER = /datum/alt_title/maintenance_manager)
minimal_player_age = 7
@@ -77,8 +77,8 @@
economic_modifier = 5
pto_type = PTO_ENGINEERING
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION)
alt_titles = list(JOB_ALT_MAINTENANCE_TECHNICIAN = /datum/alt_title/maint_tech, JOB_ALT_ENGINE_TECHNICIAN = /datum/alt_title/engine_tech,
JOB_ALT_ELECTRICIAN = /datum/alt_title/electrician, JOB_ALT_CONSTRUCTION_ENGINEER = /datum/alt_title/construction_engi, JOB_ALT_ENGINEERING_CONTRACTOR = /datum/alt_title/engineering_contractor, JOB_ALT_COMPUTER_TECHNICIAN = /datum/alt_title/computer_tech, JOB_ALT_SALVAGE_TECHNICIAN = /datum/alt_title/salvage_tech)
@@ -146,8 +146,8 @@
supervisors = "the " + JOB_CHIEF_ENGINEER
selection_color = "#5B4D20"
economic_modifier = 5
access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_external_airlocks)
minimal_access = list(access_eva, access_engine, access_atmospherics, access_maint_tunnels, access_emergency_storage, access_construction, access_external_airlocks)
access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_EXTERNAL_AIRLOCKS)
alt_titles = list(JOB_ALT_ATMOSPHERIC_ENGINEER = /datum/alt_title/atmos_engi, JOB_ALT_ATMOSPHERIC_MAINTAINER = /datum/alt_title/atmos_maint, JOB_ALT_DISPOSALS_TECHNICIAN = /datum/alt_title/disposals_tech,
JOB_ALT_FUEL_TECHNICIAN = /datum/alt_title/refuel_tech, JOB_ALT_FIREFIGHTER = /datum/alt_title/firefighter)
code/game/jobs/job/exploration.dm
+6 -6
View File
@@ -45,8 +45,8 @@
pto_type = PTO_EXPLORATION
dept_time_required = 20
access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
minimal_access = list(access_eva, access_maint_tunnels, access_external_airlocks, access_pilot, access_explorer, access_gateway, access_pathfinder, access_RC_announce)
access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
minimal_access = list(ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT, ACCESS_EXPLORER, ACCESS_GATEWAY, ACCESS_PATHFINDER, ACCESS_RC_ANNOUNCE)
outfit_type = /decl/hierarchy/outfit/job/pathfinder
job_description = "The " + JOB_PATHFINDER + "'s job is to lead and manage expeditions, and is the primary authority on all off-station expeditions."
alt_titles = list(JOB_ALT_EXPEDITION_LEAD = /datum/alt_title/expedition_lead, JOB_ALT_EXPLORATION_MANAGER = /datum/alt_title/exploration_manager)
@@ -72,8 +72,8 @@
selection_color = "#999440"
economic_modifier = 6
pto_type = PTO_EXPLORATION
access = list(access_explorer, access_external_airlocks, access_eva)
minimal_access = list(access_explorer, access_external_airlocks, access_eva)
access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
minimal_access = list(ACCESS_EXPLORER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EVA)
outfit_type = /decl/hierarchy/outfit/job/explorer2
job_description = "An " + JOB_EXPLORER + " searches for interesting things, and returns them to the station."
alt_titles = list(JOB_ALT_SURVEYOR = /datum/alt_title/surveyor, JOB_ALT_OFFSITE_SCOUT = /datum/alt_title/offsite_scout)
@@ -98,8 +98,8 @@
economic_modifier = 6
minimal_player_age = 3
pto_type = PTO_EXPLORATION
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_eva, access_maint_tunnels, access_external_airlocks, access_pilot)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_pilot)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PILOT)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_PILOT)
outfit_type = /decl/hierarchy/outfit/job/medical/sar
job_description = "A " + JOB_FIELD_MEDIC + " works as the field doctor of expedition teams."
alt_titles = list(JOB_ALT_EXPEDITION_MEDIC = /datum/alt_title/expedition_medic, JOB_ALT_OFFSITE_MEDIC = /datum/alt_title/offsite_medic)
code/game/jobs/job/medical.dm
+16 -16
View File
@@ -15,13 +15,13 @@
selection_color = "#026865"
req_admin_notify = 1
economic_modifier = 10
access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
ACCESS_KEYCARD_AUTH, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_genetics, access_heads,
access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce,
access_keycard_auth, access_psychiatrist, access_eva, access_external_airlocks, access_maint_tunnels, access_gateway)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS,
ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE,
ACCESS_KEYCARD_AUTH, ACCESS_PSYCHIATRIST, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MAINT_TUNNELS, ACCESS_GATEWAY)
alt_titles = list(JOB_ALT_CHIEF_PHYSICIAN = /datum/alt_title/chief_physician, JOB_ALT_MEDICAL_DIRECTOR = /datum/alt_title/medical_director, JOB_ALT_HEALTHCARE_MANAGER = /datum/alt_title/healthcare_manager)
minimum_character_age = 25
@@ -68,8 +68,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 7
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_eva)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_virology, access_eva)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_EVA)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_VIROLOGY, ACCESS_EVA)
outfit_type = /decl/hierarchy/outfit/job/medical/doctor
job_description = "A " + JOB_MEDICAL_DOCTOR + " is a Jack-of-All-Trades Medical title, covering a variety of skill levels and minor specializations. They are likely \
familiar with basic first aid, and a number of accompanying medications, and can generally save, if not cure, a majority of the \
@@ -141,8 +141,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 5
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics)
minimal_access = list(access_medical, access_medical_equip, access_chemistry)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_CHEMISTRY)
minimal_player_age = 3
min_age_by_species = list(SPECIES_PROMETHEAN = 3)
@@ -175,8 +175,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER + " and " + JOB_RESEARCH_DIRECTOR
selection_color = "#013D3B"
economic_modifier = 7
access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research)
minimal_access = list(access_medical, access_morgue, access_genetics, access_research)
access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH)
outfit_type = /decl/hierarchy/outfit/job/medical/geneticist
job_description = "A " + JOB_GENETICIST + " operates genetic manipulation equipment to repair any genetic defects encountered in crew, from cloning or radiation as examples. \
@@ -198,8 +198,8 @@
economic_modifier = 5
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
access = list(access_medical, access_medical_equip, access_morgue, access_psychiatrist)
minimal_access = list(access_medical, access_medical_equip, access_psychiatrist)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_PSYCHIATRIST)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_PSYCHIATRIST)
outfit_type = /decl/hierarchy/outfit/job/medical/psychiatrist
job_description = "A " + JOB_PSYCHIATRIST + " provides mental health services to crew members in need. They may also be called upon to determine whatever \
ails the mentally unwell, frequently under Security supervision. They understand the effects of various psychoactive drugs."
@@ -240,8 +240,8 @@
supervisors = "the " + JOB_CHIEF_MEDICAL_OFFICER
selection_color = "#013D3B"
economic_modifier = 4
access = list(access_medical, access_medical_equip, access_morgue, access_surgery, access_chemistry, access_virology, access_eva, access_maint_tunnels, access_external_airlocks, access_psychiatrist)
minimal_access = list(access_medical, access_medical_equip, access_morgue, access_eva, access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_PSYCHIATRIST)
minimal_access = list(ACCESS_MEDICAL, ACCESS_MEDICAL_EQUIP, ACCESS_MORGUE, ACCESS_EVA, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/medical/paramedic
job_description = "A " + JOB_PARAMEDIC + " is primarily concerned with the recovery of patients who are unable to make it to the Medical Department on their own. \
They may also be called upon to keep patients stable when Medical is busy or understaffed."
code/game/jobs/job/offduty.dm
+14 -14
View File
@@ -11,8 +11,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
access = list(access_maint_tunnels)
minimal_access = list(access_maint_tunnels)
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/worker
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CIVILIAN
@@ -27,8 +27,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#9b633e"
access = list(access_maint_tunnels)
minimal_access = list(access_maint_tunnels)
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/cargo
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_CARGO
@@ -43,8 +43,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#5B4D20"
access = list(access_maint_tunnels, access_external_airlocks, access_construction)
minimal_access = list(access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/engineer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_ENGINEERING
@@ -59,8 +59,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#013D3B"
access = list(access_maint_tunnels, access_external_airlocks)
minimal_access = list(access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/medic
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_MEDICAL
@@ -75,8 +75,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#633D63"
access = list(access_maint_tunnels)
minimal_access = list(access_maint_tunnels)
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/scientist
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SCIENCE
@@ -91,8 +91,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#601C1C"
access = list(access_maint_tunnels)
minimal_access = list(access_maint_tunnels)
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
outfit_type = /decl/hierarchy/outfit/job/assistant/officer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_SECURITY
@@ -107,8 +107,8 @@
departments = list(DEPARTMENT_OFFDUTY)
supervisors = "nobody! Enjoy your time off"
selection_color = "#999440"
access = list(access_maint_tunnels, access_external_airlocks)
minimal_access = list(access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
outfit_type = /decl/hierarchy/outfit/job/assistant/explorer
job_description = "Off-duty crew has no responsibilities or authority and is just there to spend their well-deserved time off."
pto_type = PTO_EXPLORATION
code/game/jobs/job/science.dm
+16 -16
View File
@@ -15,14 +15,14 @@
selection_color = "#AD6BAD"
req_admin_notify = 1
economic_modifier = 15
access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_teleporter,
access_research, access_robotics, access_xenobiology, access_ai_upload, access_tech_storage,
access_RC_announce, access_keycard_auth, access_tcomsat, access_xenoarch, access_eva, access_network, access_xenobotany)
minimal_access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue,
access_tox_storage, access_teleporter,
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_eva, access_network, access_xenobotany)
access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
ACCESS_TOX_STORAGE, ACCESS_TELEPORTER,
ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, ACCESS_TECH_STORAGE,
ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_XENOARCH, ACCESS_EVA, ACCESS_NETWORK, ACCESS_XENOBOTANY)
minimal_access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE,
ACCESS_TOX_STORAGE, ACCESS_TELEPORTER,
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_EVA, ACCESS_NETWORK, ACCESS_XENOBOTANY)
minimum_character_age = 25
minimal_player_age = 14
@@ -73,8 +73,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_xenobotany)
minimal_access = list(access_tox, access_tox_storage, access_research, access_xenoarch)
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_XENOBOTANY)
minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOARCH)
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list(FBP_DIGITAL)
@@ -152,8 +152,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_hydroponics)
minimal_access = list(access_research, access_xenobiology, access_hydroponics, access_tox_storage)
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_HYDROPONICS)
minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_HYDROPONICS, ACCESS_TOX_STORAGE)
banned_job_species = list(FBP_DIGITAL)
minimal_player_age = 14
@@ -193,8 +193,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 5
access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
minimal_access = list(access_robotics, access_tech_storage, access_morgue, access_research) //As a job that handles so many corpses, it makes sense for them to have morgue access.
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH) //As a job that handles so many corpses, it makes sense for them to have morgue access.
minimal_access = list(ACCESS_ROBOTICS, ACCESS_TECH_STORAGE, ACCESS_MORGUE, ACCESS_RESEARCH) //As a job that handles so many corpses, it makes sense for them to have morgue access.
minimal_player_age = 7
min_age_by_species = list(SPECIES_PROMETHEAN = 2)
banned_job_species = list(FBP_DIGITAL)
@@ -243,8 +243,8 @@
supervisors = "the " + JOB_RESEARCH_DIRECTOR
selection_color = "#633D63"
economic_modifier = 7
access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobotany, access_hydroponics)
minimal_access = list(access_research, access_xenobotany, access_hydroponics, access_tox_storage)
access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_HYDROPONICS)
minimal_access = list(ACCESS_RESEARCH, ACCESS_XENOBOTANY, ACCESS_HYDROPONICS, ACCESS_TOX_STORAGE)
pto_type = PTO_SCIENCE
minimal_player_age = 14
code/game/jobs/job/security.dm
+14 -14
View File
@@ -15,14 +15,14 @@
selection_color = "#8E2929"
req_admin_notify = 1
economic_modifier = 10
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_construction,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
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_construction,
access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_external_airlocks)
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_CONSTRUCTION,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_EXTERNAL_AIRLOCKS)
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_CONSTRUCTION,
ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_EXTERNAL_AIRLOCKS)
minimum_character_age = 25
min_age_by_species = list(SPECIES_HUMAN_VATBORN = 14)
minimal_player_age = 14
@@ -69,8 +69,8 @@
economic_modifier = 5
pto_type = PTO_SECURITY
dept_time_required = 20
access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_morgue, access_external_airlocks)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_armory, access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_player_age = 5
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_TESHARI, SPECIES_DIONA)
alt_titles = list(JOB_ALT_BRIG_SENTRY = /datum/alt_title/brig_sentry, JOB_ALT_ARMORY_SUPERINTENDENT = /datum/alt_title/armory_superintendent, JOB_ALT_MASTERATARMS = /datum/alt_title/master_at_arms)
@@ -107,8 +107,8 @@
pto_type = PTO_SECURITY
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks, access_brig) //Vorestation edit - access_brig
minimal_access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_eva, access_external_airlocks)
access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_BRIG) //Vorestation edit - ACCESS_BRIG
minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_EVA, ACCESS_EXTERNAL_AIRLOCKS)
economic_modifier = 5
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_PROMETHEAN, SPECIES_DIONA)
@@ -148,8 +148,8 @@
supervisors = "the " + JOB_HEAD_OF_SECURITY
selection_color = "#601C1C"
economic_modifier = 4
access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_morgue, access_external_airlocks)
minimal_access = list(access_security, access_eva, access_sec_doors, access_brig, access_maint_tunnels, access_external_airlocks)
access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_EXTERNAL_AIRLOCKS)
minimal_access = list(ACCESS_SECURITY, ACCESS_EVA, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS)
minimal_player_age = 3
banned_job_species = list(SPECIES_ZADDAT, SPECIES_TESHARI, SPECIES_DIONA)
code/game/jobs/job/silicon.dm
+1 -1
View File
@@ -3,7 +3,7 @@
//////////////////////////////////
/datum/job/ai
title = JOB_AI
flag = AI
flag = AI_DEPT
departments = list(DEPARTMENT_SYNTHETIC)
sorting_order = 1 // Be above their borgs.
department_flag = ENGSEC
code/game/jobs/job/special.dm
+6 -6
View File
@@ -77,9 +77,9 @@
/datum/job/clown/get_access()
if(CONFIG_GET(flag/assistant_maint))
return list(access_maint_tunnels, access_entertainment, access_clown, access_tomfoolery)
return list(ACCESS_MAINT_TUNNELS, ACCESS_ENTERTAINMENT, ACCESS_CLOWN, ACCESS_TOMFOOLERY)
else
return list(access_entertainment, access_clown, access_tomfoolery)
return list(ACCESS_ENTERTAINMENT, ACCESS_CLOWN, ACCESS_TOMFOOLERY)
/datum/job/mime
title = JOB_MIME
@@ -105,9 +105,9 @@
/datum/job/mime/get_access()
if(CONFIG_GET(flag/assistant_maint))
return list(access_maint_tunnels, access_entertainment, access_tomfoolery, access_mime)
return list(ACCESS_MAINT_TUNNELS, ACCESS_ENTERTAINMENT, ACCESS_TOMFOOLERY, ACCESS_MIME)
else
return list(access_entertainment, access_tomfoolery, access_mime)
return list(ACCESS_ENTERTAINMENT, ACCESS_TOMFOOLERY, ACCESS_MIME)
/obj/item/card/id/civilian/lurker
desc = "A rather old and scuffed-looking ID. It seems legit, but something also seems very off somehow. Say, what's the issue/expiry date..?"
@@ -128,5 +128,5 @@
latejoin_only = 1
requestable = FALSE
outfit_type = /decl/hierarchy/outfit/maint_lurker
access = list(access_maint_tunnels)
minimal_access = list(access_maint_tunnels)
access = list(ACCESS_MAINT_TUNNELS)
minimal_access = list(ACCESS_MAINT_TUNNELS)
code/game/jobs/jobs.dm
-78
View File
@@ -1,81 +1,3 @@
var/const/ENGSEC =(1<<0)
var/const/CAPTAIN =(1<<0)
var/const/HOS =(1<<1)
var/const/WARDEN =(1<<2)
var/const/DETECTIVE =(1<<3)
var/const/OFFICER =(1<<4)
var/const/CHIEF =(1<<5)
var/const/ENGINEER =(1<<6)
var/const/ATMOSTECH =(1<<7)
var/const/AI =(1<<8)
var/const/CYBORG =(1<<9)
var/const/CLOWN =(1<<13)
var/const/MIME =(1<<14)
var/const/INTERN =(1<<15)
var/const/MEDSCI =(1<<1)
var/const/RD =(1<<0)
var/const/SCIENTIST =(1<<1)
var/const/CHEMIST =(1<<2)
var/const/CMO =(1<<3)
var/const/DOCTOR =(1<<4)
var/const/GENETICIST =(1<<5)
var/const/VIROLOGIST =(1<<6)
var/const/PSYCHIATRIST =(1<<7)
var/const/ROBOTICIST =(1<<8)
var/const/XENOBIOLOGIST =(1<<9)
var/const/PARAMEDIC =(1<<10)
var/const/PATHFINDER =(1<<11)
var/const/EXPLORER =(1<<12)
var/const/SAR =(1<<13)
var/const/XENOBOTANIST =(1<<14)
var/const/CIVILIAN =(1<<2)
var/const/HOP =(1<<0)
var/const/BARTENDER =(1<<1)
var/const/BOTANIST =(1<<2)
var/const/CHEF =(1<<3)
var/const/JANITOR =(1<<4)
var/const/LIBRARIAN =(1<<5)
var/const/QUARTERMASTER =(1<<6)
var/const/CARGOTECH =(1<<7)
var/const/MINER =(1<<8)
var/const/LAWYER =(1<<9)
var/const/CHAPLAIN =(1<<10)
var/const/ASSISTANT =(1<<11)
var/const/BRIDGE =(1<<12)
var/const/PILOT =(1<<13)
var/const/ENTERTAINER =(1<<14)
var/const/ENTREPRENEUR =(1<<15)
var/const/OTHER =(1<<10) //VOREStation Note: Unused on VS. Used downstream.
var/const/NONCREW =(1<<0)
var/const/ANOMALY =(1<<0) //VOREStation Note: Unused on VS. Used downstream.
var/const/TALON =(1<<3)
var/const/TALCAP =(1<<0)
var/const/TALPIL =(1<<1)
var/const/TALDOC =(1<<2)
var/const/TALSEC =(1<<3)
var/const/TALENG =(1<<4)
var/const/TALMIN =(1<<5)
var/list/command_positions = list(
JOB_SITE_MANAGER,
JOB_HEAD_OF_PERSONNEL,
JOB_HEAD_OF_SECURITY,
JOB_CHIEF_ENGINEER,
JOB_RESEARCH_DIRECTOR,
JOB_CHIEF_MEDICAL_OFFICER,
JOB_COMMAND_SECRETARY
//JOB_BLUESHIELD_GUARD
)
/proc/guest_jobbans(var/job)
return ( (job in SSjob.get_job_titles_in_department(DEPARTMENT_COMMAND)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SYNTHETIC)) || (job in SSjob.get_job_titles_in_department(DEPARTMENT_SECURITY)) )
code/game/machinery/ai_slipper.dm
+1 -1
View File
@@ -12,7 +12,7 @@
var/cooldown_time = 0
var/cooldown_timeleft = 0
var/cooldown_on = 0
req_access = list(access_ai_upload)
req_access = list(ACCESS_AI_UPLOAD)
/obj/machinery/ai_slipper/Initialize(mapload)
. = ..()
code/game/machinery/air_alarm.dm
+4 -4
View File
@@ -63,16 +63,16 @@
idle_power_usage = 80
active_power_usage = 1000 //For heating/cooling rooms. 1000 joules equates to about 1 degree every 2 seconds for a single tile of air.
power_channel = ENVIRON
req_one_access = list(access_atmospherics, access_engine_equip)
req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
clicksound = "button"
clickvol = 30
blocks_emissive = NONE
light_power = 0.25
var/alarm_id = null
var/breach_detection = 1 // Whether to use automatic breach detection or not
var/frequency = 1439
var/frequency = PUMPS_FREQ
//var/skipprocess = 0 //Experimenting
var/alarm_frequency = 1437
var/alarm_frequency = ALERT_FREQ
var/remote_control = 0
var/rcon_setting = 2
var/rcon_time = 0
@@ -862,7 +862,7 @@
/obj/machinery/alarm/server/Initialize(mapload)
. = ..()
req_access = list(access_rd, access_atmospherics, access_engine_equip)
req_access = list(ACCESS_RD, ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP)
TLV[GAS_O2] = list(-1.0, -1.0,-1.0,-1.0) // Partial pressure, kpa
TLV[GAS_CO2] = list(-1.0, -1.0, 5, 10) // Partial pressure, kpa
TLV[GAS_PHORON] = list(-1.0, -1.0, 0, 0.5) // Partial pressure, kpa
code/game/machinery/atmo_control.dm
+9 -9
View File
@@ -1,7 +1,7 @@
#define SENSOR_PRESSURE (1<<0)
#define SENSOR_TEMPERATURE (1<<1)
#define SENSOR_O2 (1<<2)
#define SENSOR_PLASMA (1<<3)
#define SENSOR_PHORON (1<<3)
#define SENSOR_N2 (1<<4)
#define SENSOR_CO2 (1<<5)
#define SENSOR_N2O (1<<6)
@@ -16,7 +16,7 @@
var/state = 0
var/id_tag
var/frequency = 1439
var/frequency = PUMPS_FREQ
var/on = 1
var/output = 3
@@ -106,7 +106,7 @@
"Pressure: [ONOFF_TOGGLE(SENSOR_PRESSURE)]" = SENSOR_PRESSURE,
"Temperature: [ONOFF_TOGGLE(SENSOR_TEMPERATURE)]" = SENSOR_TEMPERATURE,
"Oxygen: [ONOFF_TOGGLE(SENSOR_O2)]" = SENSOR_O2,
"Toxins: [ONOFF_TOGGLE(SENSOR_PLASMA)]" = SENSOR_PLASMA,
"Toxins: [ONOFF_TOGGLE(SENSOR_PHORON)]" = SENSOR_PHORON,
"Nitrogen: [ONOFF_TOGGLE(SENSOR_N2)]" = SENSOR_N2,
"Carbon Dioxide: [ONOFF_TOGGLE(SENSOR_CO2)]" = SENSOR_CO2,
"Nitrous Oxide: [ONOFF_TOGGLE(SENSOR_N2O)]" = SENSOR_N2O,
@@ -126,8 +126,8 @@
output ^= SENSOR_TEMPERATURE
if(SENSOR_O2)
output ^= SENSOR_O2
if(SENSOR_PLASMA)
output ^= SENSOR_PLASMA
if(SENSOR_PHORON)
output ^= SENSOR_PHORON
if(SENSOR_N2)
output ^= SENSOR_N2
if(SENSOR_CO2)
@@ -156,7 +156,7 @@
icon_screen = "tank"
name = "Computer"
desc = "Control atmospheric systems, remotely."
var/frequency = 1439
var/frequency = PUMPS_FREQ
var/list/sensors = list()
var/list/sensor_information = list()
var/datum/radio_frequency/radio_connection
@@ -284,7 +284,7 @@
/obj/machinery/computer/general_air_control/large_tank_control
icon = 'icons/obj/computer.dmi'
frequency = 1441
frequency = PUBLIC_LOW_FREQ
name = "Large Tank Computer"
desc = "Controls various devices for managing a gas tank."
var/input_tag
@@ -454,7 +454,7 @@
/obj/machinery/computer/general_air_control/supermatter_core
icon = 'icons/obj/computer.dmi'
frequency = 1433
frequency = ENGINE_FREQ
var/input_tag
var/output_tag
var/list/input_info
@@ -744,7 +744,7 @@
#undef SENSOR_PRESSURE
#undef SENSOR_TEMPERATURE
#undef SENSOR_O2
#undef SENSOR_PLASMA
#undef SENSOR_PHORON
#undef SENSOR_N2
#undef SENSOR_CO2
#undef SENSOR_N2O
code/game/machinery/cloning.dm
+1 -1
View File
@@ -33,7 +33,7 @@
circuit = /obj/item/circuitboard/clonepod
icon = 'icons/obj/cloning.dmi'
icon_state = "pod_0"
req_access = list(access_genetics) // For premature unlocking.
req_access = list(ACCESS_GENETICS) // For premature unlocking.
VAR_PRIVATE/datum/weakref/weakref_occupant = null
var/heal_level = 20 // The clone is released once its health reaches this level.
var/heal_rate = 1
code/game/machinery/computer/RCON_Console.dm
+1 -1
View File
@@ -11,7 +11,7 @@
icon_screen = "ai-fixer"
light_color = "#a97faa"
circuit = /obj/item/circuitboard/rcon_console
req_one_access = list(access_engine)
req_one_access = list(ACCESS_ENGINE)
var/current_tag = null
var/datum/tgui_module/rcon/rcon
code/game/machinery/computer/aifixer.dm
+1 -1
View File
@@ -1,7 +1,7 @@
/obj/machinery/computer/aifixer
name = "\improper AI system integrity restorer"
desc = "Used with intelliCards containing nonfunctional AIs to restore them to working order."
req_one_access = list(access_robotics, access_heads)
req_one_access = list(ACCESS_ROBOTICS, ACCESS_HEADS)
circuit = /obj/item/circuitboard/aifixer
icon_keyboard = "tech_key"
icon_screen = "ai-fixer"
code/game/machinery/computer/atmos_control.dm
+1 -1
View File
@@ -11,7 +11,7 @@
density = TRUE
anchored = TRUE
circuit = /obj/item/circuitboard/atmoscontrol
req_access = list(access_ce)
req_access = list(ACCESS_CE)
var/list/monitored_alarm_ids = null
var/datum/tgui_module/atmos_control/atmos_control
code/game/machinery/computer/camera.dm
+1 -1
View File
@@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(entertainment_screens)
desc = "Used to watch over mining operations."
icon_keyboard = "mining_key"
icon_screen = "mining"
network = list("Mining Outpost")
network = list(NETWORK_MINE)
circuit = /obj/item/circuitboard/security/mining
light_color = "#F9BBFC"
code/game/machinery/computer/camera_vr.dm
+20 -20
View File
@@ -3,26 +3,26 @@
desc = "Used for hacking into camera networks"
icon = 'icons/obj/abductor.dmi'
icon_state = "camera"
network = list( "Mercenary",
"Cargo",
"Circuits",
"Civilian",
"Command",
"Engine",
"Engineering",
"Exploration",
"Medical",
"Mining Outpost",
"Outside",
"Research",
"Research Outpost",
"Robots",
"Security",
"Telecommunications",
"Tether",
"TalonShip",
"Entertainment",
"Communicators"
network = list(NETWORK_MERCENARY,
NETWORK_CARGO,
NETWORK_CIRCUITS,
NETWORK_CIVILIAN,
NETWORK_COMMAND,
NETWORK_ENGINE,
NETWORK_ENGINEERING,
NETWORK_EXPLORATION,
NETWORK_MEDICAL,
NETWORK_MINE,
NETWORK_OUTSIDE,
NETWORK_RESEARCH,
NETWORK_RESEARCH_OUTPOST,
NETWORK_ROBOTS,
NETWORK_SECURITY,
NETWORK_TELECOM,
NETWORK_TETHER,
NETWORK_TALON_SHIP,
NETWORK_THUNDER,
NETWORK_COMMUNICATORS
)
/obj/machinery/computer/security/xenobio
code/game/machinery/computer/card.dm
+3 -3
View File
@@ -6,7 +6,7 @@
icon_keyboard = "id_key"
icon_screen = "id"
light_color = "#0099ff"
req_access = list(access_change_ids)
req_access = list(ACCESS_CHANGE_IDS)
circuit = /obj/item/circuitboard/card
var/obj/item/card/id/scan = null
var/obj/item/card/id/modify = null
@@ -59,7 +59,7 @@
if(!istype(id_card))
return ..()
if(!scan && (access_change_ids in id_card.GetAccess()) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
if(!scan && (ACCESS_CHANGE_IDS in id_card.GetAccess()) && (user.unEquip(id_card) || (id_card.loc == user && istype(user,/mob/living/silicon/robot)))) //Grippers. Again. ~Mechoid
user.drop_item()
id_card.forceMove(src)
scan = id_card
@@ -291,7 +291,7 @@
/obj/machinery/computer/card/centcom
name = "\improper CentCom ID card modification console"
circuit = /obj/item/circuitboard/card/centcom
req_access = list(access_cent_captain)
req_access = list(ACCESS_CENT_CAPTAIN)
/obj/machinery/computer/card/centcom/is_centcom()
code/game/machinery/computer/cloning.dm
+1 -1
View File
@@ -7,7 +7,7 @@
icon_keyboard = "med_key"
icon_screen = "dna"
circuit = /obj/item/circuitboard/cloning
req_access = list(access_heads) //Only used for record deletion right now.
req_access = list(ACCESS_HEADS) //Only used for record deletion right now.
var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning.
var/list/pods = null //Linked cloning pods.
var/list/temp = null

Some files were not shown because too many files have changed in this diff Show More