From c64bc93649c99c2b105d3ee9d217d4000ac17ace Mon Sep 17 00:00:00 2001 From: AffectedArc07 Date: Tue, 28 Jan 2020 21:25:20 +0000 Subject: [PATCH 1/4] Replaces all var/const with #define --- .../components/binary_devices/circulator.dm | 6 +- code/LINDA/LINDA_system.dm | 27 +- code/__DEFINES/access.dm | 111 ++++++ code/__DEFINES/job.dm | 64 +++ code/__DEFINES/js.dm | 91 +++++ code/__DEFINES/machines.dm | 4 + code/__DEFINES/misc.dm | 17 +- code/__DEFINES/reagents.dm | 3 + code/__HELPERS/constants.dm | 4 +- code/__HELPERS/maths.dm | 4 +- code/__HELPERS/mobs.dm | 2 +- code/_onclick/telekinesis.dm | 4 +- code/datums/ai_laws.dm | 2 +- .../diseases/advance/symptoms/symptoms.dm | 2 - code/datums/outfits/outfit_admin.dm | 22 +- code/datums/supplypacks.dm | 106 ++--- code/datums/wires/airlock.dm | 20 +- code/datums/wires/alarm.dm | 10 +- code/datums/wires/apc.dm | 8 +- code/datums/wires/autolathe.dm | 6 +- code/datums/wires/camera.dm | 4 +- code/datums/wires/explosive.dm | 2 +- code/datums/wires/mulebot.dm | 60 +-- code/datums/wires/nuclearbomb.dm | 6 +- code/datums/wires/particle_accelerator.dm | 8 +- code/datums/wires/radio.dm | 40 +- code/datums/wires/robot.dm | 18 +- code/datums/wires/smartfridge.dm | 6 +- code/datums/wires/suitstorage.dm | 8 +- code/datums/wires/syndicatebomb.dm | 38 +- code/datums/wires/tesla_coil.dm | 6 +- code/datums/wires/vending.dm | 8 +- code/datums/wires/wires.dm | 14 +- code/game/area/areas/depot-areas.dm | 4 +- code/game/atoms_movable.dm | 2 +- code/game/gamemodes/blob/powers.dm | 2 +- code/game/gamemodes/devil/devilinfo.dm | 2 +- .../gamemodes/miniantags/abduction/gland.dm | 2 +- code/game/gamemodes/nuclear/nuclear.dm | 2 +- code/game/gamemodes/wizard/artefact.dm | 4 +- code/game/jobs/access.dm | 374 ++++++------------ code/game/jobs/job/central.dm | 8 +- code/game/jobs/job/civilian.dm | 6 +- code/game/jobs/job/engineering.dm | 44 +-- code/game/jobs/job/medical.dm | 72 ++-- code/game/jobs/job/science.dm | 36 +- code/game/jobs/job/security.dm | 60 +-- code/game/jobs/job/silicon.dm | 8 +- code/game/jobs/job/supervisor.dm | 106 ++--- code/game/jobs/job/support.dm | 88 ++--- code/game/jobs/job/support_chaplain.dm | 8 +- code/game/jobs/job/syndicate.dm | 4 +- code/game/jobs/jobs.dm | 58 --- code/game/machinery/ai_slipper.dm | 2 +- code/game/machinery/alarm.dm | 4 +- code/game/machinery/cloning.dm | 2 +- code/game/machinery/computer/aifixer.dm | 2 +- code/game/machinery/computer/atmos_control.dm | 2 +- code/game/machinery/computer/brigcells.dm | 2 +- .../game/machinery/computer/buildandrepair.dm | 2 +- code/game/machinery/computer/camera.dm | 42 +- code/game/machinery/computer/card.dm | 16 +- code/game/machinery/computer/cloning.dm | 2 +- .../game/machinery/computer/communications.dm | 6 +- code/game/machinery/computer/depot.dm | 4 +- code/game/machinery/computer/honkputer.dm | 2 +- code/game/machinery/computer/medical.dm | 2 +- code/game/machinery/computer/pod.dm | 2 +- .../computer/pod_tracking_console.dm | 2 +- code/game/machinery/computer/prisoner.dm | 2 +- code/game/machinery/computer/robot.dm | 2 +- code/game/machinery/computer/salvage_ship.dm | 2 +- code/game/machinery/computer/security.dm | 2 +- code/game/machinery/computer/skills.dm | 2 +- .../machinery/computer/specops_shuttle.dm | 2 +- .../computer/syndicate_specops_shuttle.dm | 2 +- code/game/machinery/cryo.dm | 2 +- code/game/machinery/cryopod.dm | 2 +- code/game/machinery/defib_mount.dm | 2 +- .../machinery/doors/airlock_electronics.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 2 +- code/game/machinery/doors/brigdoors.dm | 2 +- code/game/machinery/doors/firedoor.dm | 3 - code/game/machinery/doors/windowdoor.dm | 2 +- code/game/machinery/guestpass.dm | 2 +- code/game/machinery/hologram.dm | 2 +- code/game/machinery/navbeacon.dm | 2 +- code/game/machinery/pipe/construction.dm | 6 +- code/game/machinery/portable_tag_turret.dm | 4 +- code/game/machinery/portable_turret.dm | 8 +- code/game/machinery/recycler.dm | 2 +- code/game/machinery/requests_console.dm | 2 +- code/game/machinery/shieldgen.dm | 4 +- code/game/machinery/suit_storage_unit.dm | 30 +- code/game/machinery/syndicatebomb.dm | 2 +- code/game/machinery/telecomms/logbrowser.dm | 2 +- .../machinery/telecomms/traffic_control.dm | 2 +- code/game/machinery/turret_control.dm | 4 +- code/game/machinery/vending.dm | 4 +- code/game/mecha/combat/gygax.dm | 2 +- code/game/mecha/combat/honker.dm | 6 +- code/game/mecha/combat/marauder.dm | 6 +- code/game/mecha/combat/reticence.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 6 +- code/game/mecha/mech_fabricator.dm | 4 +- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_control_console.dm | 2 +- code/game/mecha/mecha_topic.dm | 4 +- code/game/objects/effects/anomalies.dm | 2 +- .../effects/effect_system/effects_foam.dm | 4 +- code/game/objects/effects/mines.dm | 6 +- .../effects/spawners/airlock_spawner.dm | 22 +- code/game/objects/items/control_wand.dm | 2 +- code/game/objects/items/dehy_carp.dm | 2 +- .../objects/items/devices/radio/intercom.dm | 6 +- .../game/objects/items/devices/radio/radio.dm | 38 +- code/game/objects/items/random_items.dm | 6 +- .../objects/items/stacks/sheets/leather.dm | 2 +- .../objects/items/stacks/sheets/mineral.dm | 2 +- .../objects/items/stacks/tiles/tile_types.dm | 2 +- code/game/objects/items/weapons/RCD.dm | 2 +- code/game/objects/items/weapons/cards_ids.dm | 56 +-- .../items/weapons/grenades/atmosgrenade.dm | 6 +- code/game/objects/items/weapons/mop.dm | 2 +- code/game/objects/items/weapons/paint.dm | 2 +- .../objects/items/weapons/storage/fancy.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 4 +- .../objects/items/weapons/storage/lockbox.dm | 10 +- code/game/objects/objs.dm | 2 +- code/game/objects/structures/barsign.dm | 4 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 4 +- .../crates_lockers/closets/secure/chaplain.dm | 2 +- .../crates_lockers/closets/secure/depot.dm | 2 +- .../closets/secure/engineering.dm | 10 +- .../crates_lockers/closets/secure/freezer.dm | 4 +- .../closets/secure/guncabinet.dm | 2 +- .../closets/secure/hydroponics.dm | 2 +- .../crates_lockers/closets/secure/medical.dm | 22 +- .../crates_lockers/closets/secure/miscjobs.dm | 6 +- .../crates_lockers/closets/secure/personal.dm | 2 +- .../closets/secure/scientist.dm | 8 +- .../crates_lockers/closets/secure/security.dm | 30 +- code/game/objects/structures/displaycase.dm | 6 +- code/game/objects/structures/false_walls.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 2 +- code/game/objects/structures/morgue.dm | 2 +- code/game/objects/structures/statues.dm | 2 +- code/game/turfs/simulated/floor/mineral.dm | 2 +- code/game/turfs/simulated/walls_mineral.dm | 2 +- code/js/byjax.dm | 50 --- code/js/menus.dm | 37 -- code/modules/admin/secrets.dm | 2 +- code/modules/admin/topic.dm | 12 +- code/modules/admin/verbs/honksquad.dm | 8 +- .../admin/verbs/infiltratorteam_syndicate.dm | 4 +- code/modules/admin/verbs/striketeam.dm | 6 +- .../admin/verbs/striketeam_syndicate.dm | 6 +- code/modules/awaymissions/corpse.dm | 2 +- code/modules/awaymissions/exile.dm | 2 +- .../mission_code/UO71-terrorspiders.dm | 2 +- .../mission_code/ruins/oldstation.dm | 4 +- code/modules/client/preference/preferences.dm | 28 +- code/modules/clothing/masks/miscellaneous.dm | 2 +- .../spacesuits/rig/suits/ert_suits.dm | 2 +- .../clothing/spacesuits/rig/suits/light.dm | 6 +- .../clothing/spacesuits/rig/suits/station.dm | 6 +- .../clothing/under/accessories/accessory.dm | 2 +- .../detective_work/footprints_and_rag.dm | 2 +- code/modules/economy/Accounts_DB.dm | 6 +- code/modules/economy/EFTPOS.dm | 2 +- code/modules/economy/POS.dm | 4 +- .../food_and_drinks/drinks/drinks/bottle.dm | 2 +- .../drinks/drinks/shotglass.dm | 2 +- code/modules/food_and_drinks/food.dm | 2 +- .../modules/food_and_drinks/food/condiment.dm | 2 +- .../food_and_drinks/food/foods/meat.dm | 4 +- .../kitchen_machinery/smartfridge.dm | 6 +- code/modules/hydroponics/plant_genes.dm | 2 +- code/modules/mining/laborcamp/laborshuttle.dm | 2 +- .../mining/lavaland/loot/tendril_loot.dm | 2 +- code/modules/mining/machine_redemption.dm | 8 +- code/modules/mining/machine_vending.dm | 2 +- code/modules/mining/mine_items.dm | 2 +- .../living/carbon/alien/special/facehugger.dm | 8 +- .../mob/living/carbon/brain/robotic_brain.dm | 2 +- .../mob/living/carbon/carbon_defense.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 2 +- .../mob/living/carbon/human/human_defense.dm | 2 +- .../living/carbon/human/species/_species.dm | 2 +- .../mob/living/carbon/human/species/grey.dm | 4 +- code/modules/mob/living/carbon/superheroes.dm | 4 +- code/modules/mob/living/living_defense.dm | 2 +- .../living/silicon/ai/freelook/cameranet.dm | 2 +- code/modules/mob/living/silicon/ai/say.dm | 4 +- code/modules/mob/living/silicon/laws.dm | 2 +- .../mob/living/silicon/robot/drone/drone.dm | 4 +- .../silicon/robot/drone/drone_console.dm | 2 +- .../modules/mob/living/silicon/robot/robot.dm | 6 +- .../mob/living/silicon/robot/syndicate.dm | 2 +- .../mob/living/simple_animal/bot/bot.dm | 2 +- .../mob/living/simple_animal/bot/cleanbot.dm | 2 +- .../living/simple_animal/bot/construction.dm | 4 +- .../mob/living/simple_animal/bot/ed209bot.dm | 2 +- .../mob/living/simple_animal/bot/floorbot.dm | 2 +- .../mob/living/simple_animal/bot/griefsky.dm | 2 +- .../mob/living/simple_animal/bot/honkbot.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 6 +- .../mob/living/simple_animal/bot/mulebot.dm | 2 +- .../mob/living/simple_animal/bot/secbot.dm | 2 +- .../mob/living/simple_animal/bot/syndicate.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 4 +- .../simple_animal/friendly/farm_animals.dm | 2 +- .../simple_animal/friendly/spiderbot.dm | 2 +- .../mob/living/simple_animal/hostile/bees.dm | 4 +- .../simple_animal/hostile/mining/hivelord.dm | 2 +- .../mob/living/simple_animal/slime/slime.dm | 2 +- .../mob/new_player/preferences_setup.dm | 82 ++-- .../modular_computers/documentation.md | 4 +- .../file_system/programs/command/card.dm | 4 +- .../file_system/programs/command/comms.dm | 8 +- .../programs/engineering/power_monitor.dm | 2 +- .../programs/engineering/sm_monitor.dm | 2 +- .../programs/generic/ntnrc_client.dm | 2 +- .../programs/research/airestorer.dm | 2 +- .../programs/research/ntmonitor.dm | 2 +- code/modules/paperwork/faxmachine.dm | 4 +- code/modules/power/apc.dm | 4 +- code/modules/power/gravitygenerator.dm | 38 +- code/modules/power/singularity/collector.dm | 2 +- code/modules/power/singularity/emitter.dm | 2 +- code/modules/reagents/chem_splash.dm | 2 +- code/modules/reagents/chemistry/holder.dm | 8 +- code/modules/reagents/chemistry/reagents.dm | 6 +- .../reagents/chemistry/reagents/alcohol.dm | 12 +- .../reagents/chemistry/reagents/blob.dm | 30 +- .../reagents/chemistry/reagents/drinks.dm | 4 +- .../reagents/chemistry/reagents/drugs.dm | 8 +- .../reagents/chemistry/reagents/food.dm | 24 +- .../reagents/chemistry/reagents/medicine.dm | 26 +- .../reagents/chemistry/reagents/misc.dm | 14 +- .../chemistry/reagents/pyrotechnic.dm | 38 +- .../reagents/chemistry/reagents/toxins.dm | 36 +- .../reagents/chemistry/reagents/water.dm | 24 +- .../chemistry/recipes/slime_extracts.dm | 2 +- .../reagents/reagent_containers/dropper.dm | 6 +- .../reagent_containers/glass_containers.dm | 8 +- .../reagents/reagent_containers/iv_bag.dm | 2 +- .../reagents/reagent_containers/patch.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 2 +- code/modules/research/designs.dm | 2 +- .../research/designs/weapon_designs.dm | 2 +- code/modules/research/rdconsole.dm | 6 +- code/modules/research/server.dm | 2 +- .../ruins/lavalandruin_code/syndicate_base.dm | 2 +- .../security_levels/keycard authentication.dm | 2 +- code/modules/shuttle/emergency.dm | 2 +- code/modules/shuttle/ert.dm | 2 +- code/modules/shuttle/navigation_computer.dm | 4 +- code/modules/shuttle/shuttle.dm | 4 +- code/modules/shuttle/supply.dm | 9 +- code/modules/shuttle/syndicate.dm | 8 +- code/modules/shuttle/vox.dm | 2 +- code/modules/surgery/dental_implant.dm | 2 +- code/modules/surgery/organs_internal.dm | 4 +- code/modules/surgery/other.dm | 4 +- code/modules/telesci/telesci_computer.dm | 2 +- paradise.dme | 5 +- .../midi2piano.csprojAssemblyReference.cache | Bin 0 -> 13166 bytes 269 files changed, 1481 insertions(+), 1474 deletions(-) create mode 100644 code/__DEFINES/access.dm create mode 100644 code/__DEFINES/job.dm create mode 100644 code/__DEFINES/js.dm delete mode 100644 code/js/byjax.dm delete mode 100644 code/js/menus.dm create mode 100644 tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csprojAssemblyReference.cache diff --git a/code/ATMOSPHERICS/components/binary_devices/circulator.dm b/code/ATMOSPHERICS/components/binary_devices/circulator.dm index e2dd952213a..a8bd792daa0 100644 --- a/code/ATMOSPHERICS/components/binary_devices/circulator.dm +++ b/code/ATMOSPHERICS/components/binary_devices/circulator.dm @@ -1,5 +1,8 @@ //node1, air1, network1 correspond to input //node2, air2, network2 correspond to output +#define CIRC_LEFT WEST +#define CIRC_RIGHT EAST + /obj/machinery/atmospherics/binary/circulator name = "circulator/heat exchanger" desc = "A gas circulator pump and heat exchanger. Its input port is on the south side, and its output port is on the north side." @@ -8,9 +11,6 @@ var/side = CIRC_LEFT - var/global/const/CIRC_LEFT = WEST - var/global/const/CIRC_RIGHT = EAST - var/last_pressure_delta = 0 var/obj/machinery/power/generator/generator diff --git a/code/LINDA/LINDA_system.dm b/code/LINDA/LINDA_system.dm index c9d168a0159..fd24dcc0c77 100644 --- a/code/LINDA/LINDA_system.dm +++ b/code/LINDA/LINDA_system.dm @@ -142,44 +142,33 @@ turf/CanPass(atom/movable/mover, turf/target, height=1.5) return T.atmos_spawn_air(text, amount) -var/const/SPAWN_HEAT = 1 -var/const/SPAWN_20C = 2 -var/const/SPAWN_TOXINS = 4 -var/const/SPAWN_OXYGEN = 8 -var/const/SPAWN_CO2 = 16 -var/const/SPAWN_NITROGEN = 32 - -var/const/SPAWN_N2O = 64 - -var/const/SPAWN_AIR = 256 - /turf/simulated/proc/atmos_spawn_air(var/flag, var/amount) if(!text || !amount || !air) return var/datum/gas_mixture/G = new - if(flag & SPAWN_20C) + if(flag & LINDA_SPAWN_20C) G.temperature = T20C - if(flag & SPAWN_HEAT) + if(flag & LINDA_SPAWN_HEAT) G.temperature += 1000 - if(flag & SPAWN_TOXINS) + if(flag & LINDA_SPAWN_TOXINS) G.toxins += amount - if(flag & SPAWN_OXYGEN) + if(flag & LINDA_SPAWN_OXYGEN) G.oxygen += amount - if(flag & SPAWN_CO2) + if(flag & LINDA_SPAWN_CO2) G.carbon_dioxide += amount - if(flag & SPAWN_NITROGEN) + if(flag & LINDA_SPAWN_NITROGEN) G.nitrogen += amount - if(flag & SPAWN_N2O) + if(flag & LINDA_SPAWN_N2O) var/datum/gas/sleeping_agent/T = new T.moles += amount G.trace_gases += T - if(flag & SPAWN_AIR) + if(flag & LINDA_SPAWN_AIR) G.oxygen += MOLES_O2STANDARD * amount G.nitrogen += MOLES_N2STANDARD * amount diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm new file mode 100644 index 00000000000..55ea1d663f8 --- /dev/null +++ b/code/__DEFINES/access.dm @@ -0,0 +1,111 @@ +#define ACCESS_SECURITY 1 // Security equipment +#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_COURT 42 +#define ACCESS_CLOWN 43 +#define ACCESS_MIME 44 +#define ACCESS_SURGERY 45 +#define ACCESS_THEATRE 46 +#define ACCESS_RESEARCH 47 +#define ACCESS_MINING 48 +#define ACCESS_MINING_OFFICE 49 //not in use +#define ACCESS_MAILSORTING 50 +#define ACCESS_MINT 51 +#define ACCESS_MINT_VAULT 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_PARAMEDIC 66 +#define ACCESS_BLUESHIELD 67 +#define ACCESS_SALVAGE_CAPTAIN 69 // Salvage ship captain's quarters +#define ACCESS_MECHANIC 70 +#define ACCESS_PILOT 71 +#define ACCESS_NTREP 73 +#define ACCESS_MAGISTRATE 74 +#define ACCESS_MINISAT 75 +#define ACCESS_MINERAL_STOREROOM 76 +#define ACCESS_NETWORK 77 + +#define ACCESS_WEAPONS 99 //Weapon authorization for secbots + + //BEGIN CENTCOM ACCESS +#define ACCESS_CENT_GENERAL 101//General facilities. +#define ACCESS_CENT_LIVING 102//Living quarters. +#define ACCESS_CENT_MEDICAL 103//Medical. +#define ACCESS_CENT_SECURITY 104//Security. +#define ACCESS_CENT_STORAGE 105//Storage areas. +#define ACCESS_CENT_SHUTTLES 106//Shuttle docks. +#define ACCESS_CENT_TELECOMMS 107//Telecomms. +#define ACCESS_CENT_TELEPORTER 108//Teleporter +#define ACCESS_CENT_SPECOPS 109//Special Ops. +#define ACCESS_CENT_SPECOPS_COMMANDER 110//Special Ops Commander. +#define ACCESS_CENT_BLACKOPS 111//Black Ops. +#define ACCESS_CENT_THUNDER 112//Thunderdome. +#define ACCESS_CENT_BRIDGE 113//Bridge. +#define ACCESS_CENT_COMMANDER 114//Commander's Office/ID computer. + +//The Syndicate +#define ACCESS_SYNDICATE 150//General Syndicate Access +#define ACCESS_SYNDICATE_LEADER 151//Nuke Op Leader Access +#define ACCESS_VOX 152//Vox Access +#define ACCESS_SYNDICATE_COMMAND 153//Admin syndi officer + +//Trade Stations +#define ACCESS_TRADE_SOL 160 + +//MONEY +#define ACCESS_CRATE_CASH 200 + +//Awaymissions +#define ACCESS_AWAY01 271 + +//Ghost roles +#define ACCESS_FREE_GOLEMS 300 \ No newline at end of file diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm new file mode 100644 index 00000000000..ff7dda4fa94 --- /dev/null +++ b/code/__DEFINES/job.dm @@ -0,0 +1,64 @@ +/////////////////////////////// +// WARNING // +//////////////////////////////////////////////////////////////////////// +// Do NOT touch the values associated with these defines, as they are // +// used by the game database to keep track of job flags. Do NOT touch // +//////////////////////////////////////////////////////////////////////// + +#define JOBCAT_ENGSEC (1<<0) + +#define JOB_CAPTAIN (1<<0) +#define JOB_HOS (1<<1) +#define JOB_WARDEN (1<<2) +#define JOB_DETECTIVE (1<<3) +#define JOB_OFFICER (1<<4) +#define JOB_CHIEF (1<<5) +#define JOB_ENGINEER (1<<6) +#define JOB_ATMOSTECH (1<<7) +#define JOB_AI (1<<8) +#define JOB_CYBORG (1<<9) +#define JOB_CENTCOM (1<<10) +#define JOB_SYNDICATE (1<<11) + +#define JOBCAT_MEDSCI (1<<1) + +#define JOB_RD (1<<0) +#define JOB_SCIENTIST (1<<1) +#define JOB_CHEMIST (1<<2) +#define JOB_CMO (1<<3) +#define JOB_DOCTOR (1<<4) +#define JOB_GENETICIST (1<<5) +#define JOB_VIROLOGIST (1<<6) +#define JOB_PSYCHIATRIST (1<<7) +#define JOB_ROBOTICIST (1<<8) +#define JOB_PARAMEDIC (1<<9) +#define JOB_CORONER (1<<10) + + +#define JOBCAT_SUPPORT (1<<2) + +#define JOB_HOP (1<<0) +#define JOB_BARTENDER (1<<1) +#define JOB_BOTANIST (1<<2) +#define JOB_CHEF (1<<3) +#define JOB_JANITOR (1<<4) +#define JOB_LIBRARIAN (1<<5) +#define JOB_QUARTERMASTER (1<<6) +#define JOB_CARGOTECH (1<<7) +#define JOB_MINER (1<<8) +#define JOB_LAWYER (1<<9) +#define JOB_CHAPLAIN (1<<10) +#define JOB_CLOWN (1<<11) +#define JOB_MIME (1<<12) +#define JOB_CIVILIAN (1<<13) + + +#define JOBCAT_KARMA (1<<3) + +#define JOB_NANO (1<<0) +#define JOB_BLUESHIELD (1<<1) +#define JOB_BARBER (1<<3) +#define JOB_MECHANIC (1<<4) +#define JOB_BRIGDOC (1<<5) +#define JOB_JUDGE (1<<6) +#define JOB_PILOT (1<<7) diff --git a/code/__DEFINES/js.dm b/code/__DEFINES/js.dm new file mode 100644 index 00000000000..65b70e04d63 --- /dev/null +++ b/code/__DEFINES/js.dm @@ -0,0 +1,91 @@ +//this function places received data into element with specified id. +#define JS_BYJAX {" + +function replaceContent() { + var args = Array.prototype.slice.call(arguments); + var id = args\[0\]; + var content = args\[1\]; + var callback = null; + if(args\[2\]){ + callback = args\[2\]; + if(args\[3\]){ + args = args.slice(3); + } + } + var parent = document.getElementById(id); + if(typeof(parent)!=='undefined' && parent!=null){ + parent.innerHTML = content?content:''; + } + if(callback && window\[callback\]){ + window\[callback\].apply(null,args); + } +} +"} + +/* +sends data to control_id:replaceContent + +receiver - mob +control_id - window id (for windows opened with browse(), it'll be "windowname.browser") +target_element - HTML element id +new_content - HTML content +callback - js function that will be called after the data is sent +callback_args - arguments for callback function + +Be sure to include required js functions in your page, or it'll raise an exception. + +And yes I know this is a proc in a defines file, but its highly relevant so it can be here +*/ +proc/send_byjax(receiver, control_id, target_element, new_content=null, callback=null, list/callback_args=null) + if(receiver && target_element && control_id) // && winexists(receiver, control_id)) + var/list/argums = list(target_element, new_content) + if(callback) + argums += callback + if(callback_args) + argums += callback_args + argums = list2params(argums) +/* if(callback_args) + argums += "&[list2params(callback_args)]" +*/ + receiver << output(argums,"[control_id]:replaceContent") + return + + +// Misc JS for some dropdowns +#define JS_DROPDOWNS {" +function dropdowns() { + var divs = document.getElementsByTagName('div'); + var headers = new Array(); + var links = new Array(); + for(var i=0;i=0) { + elem.className = elem.className.replace('visible','hidden'); + this.className = this.className.replace('open','closed'); + this.innerHTML = this.innerHTML.replace('-','+'); + } + else { + elem.className = elem.className.replace('hidden','visible'); + this.className = this.className.replace('closed','open'); + this.innerHTML = this.innerHTML.replace('+','-'); + } + return false; + } + })(links\[i\]); + } + } +} +"} \ No newline at end of file diff --git a/code/__DEFINES/machines.dm b/code/__DEFINES/machines.dm index 7a691c44df2..b56024bfab8 100644 --- a/code/__DEFINES/machines.dm +++ b/code/__DEFINES/machines.dm @@ -88,3 +88,7 @@ #define SUPERMATTER_DANGER 4 // Integrity < 75% #define SUPERMATTER_EMERGENCY 5 // Integrity < 50% #define SUPERMATTER_DELAMINATING 6 // Pretty obvious, Integrity < 25% + +// Firelock states +#define FD_OPEN 1 +#define FD_CLOSED 2 diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index 6e1fa5e01fd..69e89020431 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -419,4 +419,19 @@ #define ENGTYPE_TESLA "Tesla" #define SUMMON_GUNS "guns" -#define SUMMON_MAGIC "magic" \ No newline at end of file +#define SUMMON_MAGIC "magic" + +// Medical stuff +#define SYMPTOM_ACTIVATION_PROB 3 + +// Atmos stuff that fucking terrifies me +#define LINDA_SPAWN_HEAT 1 +#define LINDA_SPAWN_20C 2 +#define LINDA_SPAWN_TOXINS 4 +#define LINDA_SPAWN_OXYGEN 8 +#define LINDA_SPAWN_CO2 16 +#define LINDA_SPAWN_NITROGEN 32 + +#define LINDA_SPAWN_N2O 64 + +#define LINDA_SPAWN_AIR 256 \ No newline at end of file diff --git a/code/__DEFINES/reagents.dm b/code/__DEFINES/reagents.dm index e2dd3ee3ac7..ce4767f8b89 100644 --- a/code/__DEFINES/reagents.dm +++ b/code/__DEFINES/reagents.dm @@ -16,3 +16,6 @@ // Is an open container for all intents and purposes. #define OPENCONTAINER (REFILLABLE | DRAINABLE | TRANSPARENT) + +#define REAGENT_TOUCH 1 +#define REAGENT_INGEST 2 \ No newline at end of file diff --git a/code/__HELPERS/constants.dm b/code/__HELPERS/constants.dm index f7db3166605..3b801a541e1 100644 --- a/code/__HELPERS/constants.dm +++ b/code/__HELPERS/constants.dm @@ -1,2 +1,2 @@ -var/global/const/TICKS_IN_DAY = 864000 -var/global/const/TICKS_IN_SECOND = 10 \ No newline at end of file +#define TICKS_IN_DAY 864000 +#define TICKS_IN_SECOND 10 \ No newline at end of file diff --git a/code/__HELPERS/maths.dm b/code/__HELPERS/maths.dm index ec9fcb5fb31..8491182ab9a 100644 --- a/code/__HELPERS/maths.dm +++ b/code/__HELPERS/maths.dm @@ -1,7 +1,7 @@ // Credits to Nickr5 for the useful procs I've taken from his library resource. -var/const/E = 2.71828183 -var/const/Sqrt2 = 1.41421356 +#define MATH_E 2.71828183 +#define SQRT2 1.41421356 /proc/Atan2(x, y) if(!x && !y) return 0 diff --git a/code/__HELPERS/mobs.dm b/code/__HELPERS/mobs.dm index 7c61cf832b5..994602828a0 100644 --- a/code/__HELPERS/mobs.dm +++ b/code/__HELPERS/mobs.dm @@ -248,7 +248,7 @@ proc/age2agedescription(age) if("none") status = "None" if("execute") - if((access_magistrate in authcard_access) || (access_armory in authcard_access)) + if((ACCESS_MAGISTRATE in authcard_access) || (ACCESS_ARMORY in authcard_access)) status = "*Execute*" message_admins("[ADMIN_FULLMONTY(usr)] authorized EXECUTION for [their_rank] [their_name], with comment: [comment]") else diff --git a/code/_onclick/telekinesis.dm b/code/_onclick/telekinesis.dm index 6ef7a797136..e684707d460 100644 --- a/code/_onclick/telekinesis.dm +++ b/code/_onclick/telekinesis.dm @@ -3,7 +3,7 @@ This needs more thinking out, but I might as well. */ -var/const/tk_maxrange = 15 +#define TK_MAXRANGE 15 /* Telekinetic attack: @@ -118,7 +118,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, "Your mind won't reach that far.") return diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 3494d7b20d5..47a8122d163 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -1,4 +1,4 @@ -var/global/const/base_law_type = /datum/ai_laws/nanotrasen +#define BASE_LAW_TYPE /datum/ai_laws/nanotrasen /datum/ai_law var/law = "" diff --git a/code/datums/diseases/advance/symptoms/symptoms.dm b/code/datums/diseases/advance/symptoms/symptoms.dm index 74da571836b..f2c5beee400 100644 --- a/code/datums/diseases/advance/symptoms/symptoms.dm +++ b/code/datums/diseases/advance/symptoms/symptoms.dm @@ -2,8 +2,6 @@ var/list/list_symptoms = subtypesof(/datum/symptom) -var/global/const/SYMPTOM_ACTIVATION_PROB = 3 - /datum/symptom // Buffs/Debuffs the symptom has to the overall engineered disease. var/name = "" diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index 93e4015233b..d2c19f61bfa 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -291,7 +291,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), name) + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), name) /datum/outfit/admin/pirate/first_mate name = "Space Pirate First Mate" @@ -375,7 +375,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_clown, access_theatre, access_maint_tunnels), "Tunnel Clown") + apply_to_card(I, H, list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS), "Tunnel Clown") /datum/outfit/admin/mime_assassin name = "Mime Assassin" @@ -424,7 +424,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_mime, access_theatre, access_maint_tunnels), "Mime") + apply_to_card(I, H, list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS), "Mime") H.sec_hud_set_ID() /datum/outfit/admin/greytide @@ -450,7 +450,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Greytide") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Greytide") /datum/outfit/admin/greytide/leader name = "Greytide Leader" @@ -471,7 +471,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Greytide Leader") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Greytide Leader") /datum/outfit/admin/greytide/xeno name = "Greytide Xeno" @@ -499,7 +499,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Legit Xenomorph") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Legit Xenomorph") @@ -534,7 +534,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Bard") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Bard") var/obj/item/clothing/ears/headphones/P = r_ear if(istype(P)) @@ -555,7 +555,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), name) + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), name) /datum/outfit/admin/soviet/tourist name = "Soviet Tourist" @@ -719,7 +719,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_trade_sol, access_maint_tunnels, access_external_airlocks), name) + apply_to_card(I, H, list(ACCESS_TRADE_SOL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS), name) /datum/outfit/admin/chrono name = "Chrono Legionnaire" @@ -907,7 +907,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Survivor") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Survivor") /datum/outfit/admin/masked_killer name = "Masked Killer" @@ -942,7 +942,7 @@ var/obj/item/card/id/I = H.wear_id if(istype(I)) - apply_to_card(I, H, list(access_maint_tunnels), "Masked Killer", "syndie") + apply_to_card(I, H, list(ACCESS_MAINT_TUNNELS), "Masked Killer", "syndie") /datum/outfit/admin/singuloth_knight name = "Singuloth Knight" diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index 8e20ebb7a93..f17e9840e4f 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -6,37 +6,37 @@ //NEW NOTE: Do NOT set the price of any crates below 7 points. Doing so allows infinite points. // Supply Groups -var/const/supply_emergency = 1 -var/const/supply_security = 2 -var/const/supply_engineer = 3 -var/const/supply_medical = 4 -var/const/supply_science = 5 -var/const/supply_organic = 6 -var/const/supply_materials = 7 -var/const/supply_misc = 8 -var/const/supply_vend = 9 +#define SUPPLY_EMERGENCY 1 +#define SUPPLY_SECURITY 2 +#define SUPPLY_ENGINEER 3 +#define SUPPLY_MEDICAL 4 +#define SUPPLY_SCIENCE 5 +#define SUPPLY_ORGANIC 6 +#define SUPPLY_MATERIALS 7 +#define SUPPLY_MISC 8 +#define SUPPLY_VEND 9 -var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engineer,supply_medical,supply_science,supply_organic,supply_materials,supply_misc,supply_vend) +var/list/all_supply_groups = list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY_ENGINEER,SUPPLY_MEDICAL,SUPPLY_SCIENCE,SUPPLY_ORGANIC,SUPPLY_MATERIALS,SUPPLY_MISC,SUPPLY_VEND) /proc/get_supply_group_name(var/cat) switch(cat) - if(1) + if(SUPPLY_EMERGENCY) return "Emergency" - if(2) + if(SUPPLY_SECURITY) return "Security" - if(3) + if(SUPPLY_ENGINEER) return "Engineering" - if(4) + if(SUPPLY_MEDICAL) return "Medical" - if(5) + if(SUPPLY_SCIENCE) return "Science" - if(6) + if(SUPPLY_ORGANIC) return "Food and Livestock" - if(7) + if(SUPPLY_MATERIALS) return "Raw Materials" - if(8) + if(SUPPLY_MISC) return "Miscellaneous" - if(9) + if(SUPPLY_VEND) return "Vending" @@ -51,7 +51,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine var/access = null var/hidden = 0 var/contraband = 0 - var/group = supply_misc + var/group = SUPPLY_MISC var/list/announce_beacons = list() // Particular beacons that we'll notify the relevant department when we reach var/special = FALSE //Event/Station Goals/Admin enabled packs var/special_enabled = FALSE @@ -74,7 +74,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/emergency // Section header - use these to set default supply group and crate type for sections name = "HEADER" // Use "HEADER" to denote section headers, this is needed for the supply computers to filter them containertype = /obj/structure/closet/crate/internals - group = supply_emergency + group = SUPPLY_EMERGENCY /datum/supply_packs/emergency/evac @@ -98,7 +98,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 35 containertype = /obj/structure/closet/crate/internals containername = "emergency crate" - group = supply_emergency + group = SUPPLY_EMERGENCY /datum/supply_packs/emergency/internals name = "Internals Crate" @@ -135,7 +135,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure containername = "firefighting watertank crate" - access = access_atmospherics + access = ACCESS_ATMOSPHERICS /datum/supply_packs/emergency/weedcontrol name = "Weed Control Crate" @@ -146,7 +146,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 15 containertype = /obj/structure/closet/crate/secure/hydrosec containername = "weed control crate" - access = access_hydroponics + access = ACCESS_HYDROPONICS announce_beacons = list("Hydroponics" = list("Hydroponics")) /datum/supply_packs/emergency/voxsupport @@ -172,7 +172,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 20 containertype = /obj/structure/closet/crate/secure/plasma containername = "plasmaman life support supplies crate" - access = access_eva + access = ACCESS_EVA /datum/supply_packs/emergency/specialops name = "Special Ops Supplies" @@ -202,8 +202,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security name = "HEADER" containertype = /obj/structure/closet/crate/secure/gear - access = access_security - group = supply_security + access = ACCESS_SECURITY + group = SUPPLY_SECURITY announce_beacons = list("Security" = list("Head of Security's Desk", "Warden", "Security")) @@ -299,7 +299,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/security/armory name = "HEADER" containertype = /obj/structure/closet/crate/secure/weapon - access = access_armory + access = ACCESS_ARMORY announce_beacons = list("Security" = list("Warden", "Head of Security's Desk")) ///// Armor: Specialist @@ -442,7 +442,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 15 // its a fecking flamethrower and some plasma, why the shit did this cost so much before!? containertype = /obj/structure/closet/crate/secure/plasma containername = "incendiary weapons crate" - access = access_heads + access = ACCESS_HEADS /datum/supply_packs/security/armory/wt550 name = "WT-550 Auto Rifle Crate" @@ -534,7 +534,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/engineering name = "HEADER" - group = supply_engineer + group = SUPPLY_ENGINEER announce_beacons = list("Engineering" = list("Engineering", "Chief Engineer's Desk")) containertype = /obj/structure/closet/crate/engineering @@ -635,7 +635,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure containername = "emitter crate" - access = access_ce + access = ACCESS_CE containertype = /obj/structure/closet/crate/secure/engineering /datum/supply_packs/engineering/engine/field_gen @@ -703,7 +703,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 30 containertype = /obj/structure/closet/crate/secure containername = "space suit crate" - access = access_eva + access = ACCESS_EVA /datum/supply_packs/engineering/inflatable name = "Inflatable barriers Crate" @@ -719,7 +719,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 50 //So cargo thinks twice before killing themselves with it containertype = /obj/structure/closet/crate/secure containername = "supermatter shard crate" - access = access_ce + access = ACCESS_CE /datum/supply_packs/engineering/engine/teg name = "Thermo-Electric Generator Crate" @@ -730,7 +730,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 25 containertype = /obj/structure/closet/crate/secure containername = "thermo-electric generator crate" - access = access_ce + access = ACCESS_CE announce_beacons = list("Engineering" = list("Chief Engineer's Desk", "Atmospherics")) /datum/supply_packs/engineering/conveyor @@ -753,7 +753,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/medical name = "HEADER" containertype = /obj/structure/closet/crate/medical - group = supply_medical + group = SUPPLY_MEDICAL announce_beacons = list("Medbay" = list("Medbay", "Chief Medical Officer's Desk"), "Security" = list("Brig Medbay")) @@ -858,7 +858,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 25 containertype = /obj/structure/closet/crate/secure/plasma containername = "virus crate" - access = access_cmo + access = ACCESS_CMO announce_beacons = list("Medbay" = list("Virology", "Chief Medical Officer's Desk")) /datum/supply_packs/medical/vending @@ -888,7 +888,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 30 containertype = /obj/structure/closet/crate/secure containername = "IV drip crate" - access = access_medical + access = ACCESS_MEDICAL /datum/supply_packs/medical/surgery name = "Surgery Crate" @@ -906,7 +906,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 25 containertype = /obj/structure/closet/crate/secure containername = "surgery crate" - access = access_medical + access = ACCESS_MEDICAL ////////////////////////////////////////////////////////////////////////////// @@ -915,7 +915,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/science name = "HEADER" - group = supply_science + group = SUPPLY_SCIENCE announce_beacons = list("Research Division" = list("Science", "Research Director's Desk")) containertype = /obj/structure/closet/crate/sci @@ -931,7 +931,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure/scisec containername = "robotics assembly crate" - access = access_robotics + access = ACCESS_ROBOTICS announce_beacons = list("Research Division" = list("Robotics", "Research Director's Desk")) @@ -967,8 +967,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure/plasma containername = "plasma assembly crate" - access = access_tox_storage - group = supply_science + access = ACCESS_TOX_STORAGE + group = SUPPLY_SCIENCE /datum/supply_packs/science/shieldwalls name = "Shield Generators Crate" @@ -979,7 +979,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 20 containertype = /obj/structure/closet/crate/secure/scisec containername = "shield generators crate" - access = access_teleporter + access = ACCESS_TELEPORTER /datum/supply_packs/science/modularpc name = "Deluxe Silicate Selections restocking unit" @@ -994,7 +994,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 60 containertype = /obj/structure/closet/crate/secure/scisec containername = "tank transfer valves crate" - access = access_rd + access = ACCESS_RD /datum/supply_packs/science/prototype name = "Machine Prototype Crate" @@ -1002,7 +1002,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 80 containertype = /obj/structure/closet/crate/secure/scisec containername = "machine prototype crate" - access = access_research + access = ACCESS_RESEARCH /datum/supply_packs/science/oil name = "Oil Tank Crate" @@ -1018,7 +1018,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/organic name = "HEADER" - group = supply_organic + group = SUPPLY_ORGANIC containertype = /obj/structure/closet/crate/freezer @@ -1210,7 +1210,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure containername = "hydroponics watertank crate" - access = access_hydroponics + access = ACCESS_HYDROPONICS announce_beacons = list("Hydroponics" = list("Hydroponics")) /datum/supply_packs/organic/hydroponics/seeds @@ -1296,7 +1296,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/materials name = "HEADER" - group = supply_materials + group = SUPPLY_MATERIALS announce_beacons = list("Engineering" = list("Engineering", "Chief Engineer's Desk", "Atmospherics")) @@ -1363,7 +1363,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc name = "HEADER" - group = supply_misc + group = SUPPLY_MISC /datum/supply_packs/misc/mule name = "MULEbot Crate" @@ -1421,7 +1421,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/misc/minerkit name = "Shaft Miner Starter Kit" cost = 30 - access = access_qm + access = ACCESS_QM contains = list(/obj/item/storage/backpack/duffel/mining_conscript) containertype = /obj/structure/closet/crate/secure containername = "shaft miner starter kit" @@ -1550,7 +1550,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure containername = "janitor watertank crate" - access = access_janitor + access = ACCESS_JANITOR /datum/supply_packs/misc/janitor/lightbulbs name = "Replacement Lights Crate" @@ -1588,7 +1588,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine cost = 10 containertype = /obj/structure/closet/crate/secure containername = "standard costumes" - access = access_theatre + access = ACCESS_THEATRE /datum/supply_packs/misc/wizard name = "Wizard Costume Crate" @@ -1855,7 +1855,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /datum/supply_packs/vending name = "HEADER" - group = supply_vend + group = SUPPLY_VEND /datum/supply_packs/vending/autodrobe name = "Autodrobe Supply Crate" diff --git a/code/datums/wires/airlock.dm b/code/datums/wires/airlock.dm index 3e9f488bb29..e3d90b8d075 100644 --- a/code/datums/wires/airlock.dm +++ b/code/datums/wires/airlock.dm @@ -9,16 +9,16 @@ window_x = 410 window_y = 570 -var/const/AIRLOCK_WIRE_IDSCAN = 1 -var/const/AIRLOCK_WIRE_MAIN_POWER1 = 2 -var/const/AIRLOCK_WIRE_DOOR_BOLTS = 4 -var/const/AIRLOCK_WIRE_BACKUP_POWER1 = 8 -var/const/AIRLOCK_WIRE_OPEN_DOOR = 16 -var/const/AIRLOCK_WIRE_AI_CONTROL = 32 -var/const/AIRLOCK_WIRE_ELECTRIFY = 64 -var/const/AIRLOCK_WIRE_SAFETY = 128 -var/const/AIRLOCK_WIRE_SPEED = 256 -var/const/AIRLOCK_WIRE_LIGHT = 512 +#define AIRLOCK_WIRE_IDSCAN 1 +#define AIRLOCK_WIRE_MAIN_POWER1 2 +#define AIRLOCK_WIRE_DOOR_BOLTS 4 +#define AIRLOCK_WIRE_BACKUP_POWER1 8 +#define AIRLOCK_WIRE_OPEN_DOOR 16 +#define AIRLOCK_WIRE_AI_CONTROL 32 +#define AIRLOCK_WIRE_ELECTRIFY 64 +#define AIRLOCK_WIRE_SAFETY 128 +#define AIRLOCK_WIRE_SPEED 256 +#define AIRLOCK_WIRE_LIGHT 512 /datum/wires/airlock/GetWireName(index) switch(index) diff --git a/code/datums/wires/alarm.dm b/code/datums/wires/alarm.dm index f412e96b5ee..e29a40240c5 100644 --- a/code/datums/wires/alarm.dm +++ b/code/datums/wires/alarm.dm @@ -3,11 +3,11 @@ holder_type = /obj/machinery/alarm wire_count = 5 -var/const/AALARM_WIRE_IDSCAN = 1 -var/const/AALARM_WIRE_POWER = 2 -var/const/AALARM_WIRE_SYPHON = 4 -var/const/AALARM_WIRE_AI_CONTROL = 8 -var/const/AALARM_WIRE_AALARM = 16 +#define AALARM_WIRE_IDSCAN 1 +#define AALARM_WIRE_POWER 2 +#define AALARM_WIRE_SYPHON 4 +#define AALARM_WIRE_AI_CONTROL 8 +#define AALARM_WIRE_AALARM 16 /datum/wires/alarm/GetWireName(index) switch(index) diff --git a/code/datums/wires/apc.dm b/code/datums/wires/apc.dm index df014edd4f4..8c1108a3b1b 100644 --- a/code/datums/wires/apc.dm +++ b/code/datums/wires/apc.dm @@ -2,10 +2,10 @@ holder_type = /obj/machinery/power/apc wire_count = 4 -var/const/APC_WIRE_IDSCAN = 1 -var/const/APC_WIRE_MAIN_POWER1 = 2 -var/const/APC_WIRE_MAIN_POWER2 = 4 -var/const/APC_WIRE_AI_CONTROL = 8 +#define APC_WIRE_IDSCAN 1 +#define APC_WIRE_MAIN_POWER1 2 +#define APC_WIRE_MAIN_POWER2 4 +#define APC_WIRE_AI_CONTROL 8 /datum/wires/apc/GetWireName(index) switch(index) diff --git a/code/datums/wires/autolathe.dm b/code/datums/wires/autolathe.dm index a901695c880..f0cb85b6d52 100644 --- a/code/datums/wires/autolathe.dm +++ b/code/datums/wires/autolathe.dm @@ -2,9 +2,9 @@ holder_type = /obj/machinery/autolathe wire_count = 10 -var/const/AUTOLATHE_HACK_WIRE = 1 -var/const/AUTOLATHE_SHOCK_WIRE = 2 -var/const/AUTOLATHE_DISABLE_WIRE = 4 +#define AUTOLATHE_HACK_WIRE 1 +#define AUTOLATHE_SHOCK_WIRE 2 +#define AUTOLATHE_DISABLE_WIRE 4 /datum/wires/autolathe/GetWireName(index) switch(index) diff --git a/code/datums/wires/camera.dm b/code/datums/wires/camera.dm index 609dce59e84..f5f0c5df633 100644 --- a/code/datums/wires/camera.dm +++ b/code/datums/wires/camera.dm @@ -17,8 +17,8 @@ return FALSE return TRUE -var/const/CAMERA_WIRE_FOCUS = 1 -var/const/CAMERA_WIRE_POWER = 2 +#define CAMERA_WIRE_FOCUS 1 +#define CAMERA_WIRE_POWER 2 /datum/wires/camera/GetWireName(index) switch(index) diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 045923c7dcf..47fd627d597 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -1,7 +1,7 @@ /datum/wires/explosive wire_count = 1 -var/const/WIRE_EXPLODE = 1 +#define WIRE_EXPLODE 1 /datum/wires/explosive/GetWireName(index) switch(index) diff --git a/code/datums/wires/mulebot.dm b/code/datums/wires/mulebot.dm index cbc92497f33..0b970d38e5d 100644 --- a/code/datums/wires/mulebot.dm +++ b/code/datums/wires/mulebot.dm @@ -4,43 +4,43 @@ wire_count = 10 window_x = 410 -var/const/WIRE_POWER1 = 1 // power connections -var/const/WIRE_POWER2 = 2 -var/const/WIRE_AVOIDANCE = 4 // mob avoidance -var/const/WIRE_LOADCHECK = 8 // load checking (non-crate) -var/const/WIRE_MOTOR1 = 16 // motor wires -var/const/WIRE_MOTOR2 = 32 // -var/const/WIRE_REMOTE_RX = 64 // remote recv functions -var/const/WIRE_REMOTE_TX = 128 // remote trans status -var/const/WIRE_BEACON_RX = 256 // beacon ping recv +#define MULEBOT_WIRE_POWER1 1 // power connections +#define MULEBOT_WIRE_POWER2 2 +#define MULEBOT_WIRE_AVOIDANCE 4 // mob avoidance +#define MULEBOT_WIRE_LOADCHECK 8 // load checking (non-crate) +#define MULEBOT_WIRE_MOTOR1 16 // motor wires +#define MULEBOT_WIRE_MOTOR2 32 // +#define MULEBOT_WIRE_REMOTE_RX 64 // remote recv functions +#define MULEBOT_WIRE_REMOTE_TX 128 // remote trans status +#define MULEBOT_WIRE_BEACON_RX 256 // beacon ping recv /datum/wires/mulebot/GetWireName(index) switch(index) - if(WIRE_POWER1) + if(MULEBOT_WIRE_POWER1) return "Primary Power" - if(WIRE_POWER2) + if(MULEBOT_WIRE_POWER2) return "Secondary Power" - if(WIRE_AVOIDANCE) + if(MULEBOT_WIRE_AVOIDANCE) return "Mob Avoidance" - if(WIRE_LOADCHECK) + if(MULEBOT_WIRE_LOADCHECK) return "Load Checking" - if(WIRE_MOTOR1) + if(MULEBOT_WIRE_MOTOR1) return "Primary Motor" - if(WIRE_MOTOR2) + if(MULEBOT_WIRE_MOTOR2) return "Secondary Motor" - if(WIRE_REMOTE_RX) + if(MULEBOT_WIRE_REMOTE_RX) return "Remote Signal Receiver" - if(WIRE_REMOTE_TX) + if(MULEBOT_WIRE_REMOTE_TX) return "Remote Signal Sender" - if(WIRE_BEACON_RX) + if(MULEBOT_WIRE_BEACON_RX) return "Navigation Beacon Receiver" /datum/wires/mulebot/CanUse(mob/living/L) @@ -51,13 +51,13 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv /datum/wires/mulebot/UpdatePulsed(index) switch(index) - if(WIRE_POWER1, WIRE_POWER2) + if(MULEBOT_WIRE_POWER1, MULEBOT_WIRE_POWER2) holder.visible_message("[bicon(holder)] The charge light flickers.") - if(WIRE_AVOIDANCE) + if(MULEBOT_WIRE_AVOIDANCE) holder.visible_message("[bicon(holder)] The external warning lights flash briefly.") - if(WIRE_LOADCHECK) + if(MULEBOT_WIRE_LOADCHECK) holder.visible_message("[bicon(holder)] The load platform clunks.") - if(WIRE_MOTOR1, WIRE_MOTOR2) + if(MULEBOT_WIRE_MOTOR1, MULEBOT_WIRE_MOTOR2) holder.visible_message("[bicon(holder)] The drive motor whines briefly.") else holder.visible_message("[bicon(holder)] You hear a radio crackle.") @@ -66,25 +66,25 @@ var/const/WIRE_BEACON_RX = 256 // beacon ping recv // HELPER PROCS /datum/wires/mulebot/proc/Motor1() - return !(wires_status & WIRE_MOTOR1) + return !(wires_status & MULEBOT_WIRE_MOTOR1) /datum/wires/mulebot/proc/Motor2() - return !(wires_status & WIRE_MOTOR2) + return !(wires_status & MULEBOT_WIRE_MOTOR2) /datum/wires/mulebot/proc/HasPower() - return !(wires_status & WIRE_POWER1) && !(wires_status & WIRE_POWER2) + return !(wires_status & MULEBOT_WIRE_POWER1) && !(wires_status & MULEBOT_WIRE_POWER2) /datum/wires/mulebot/proc/LoadCheck() - return !(wires_status & WIRE_LOADCHECK) + return !(wires_status & MULEBOT_WIRE_LOADCHECK) /datum/wires/mulebot/proc/MobAvoid() - return !(wires_status & WIRE_AVOIDANCE) + return !(wires_status & MULEBOT_WIRE_AVOIDANCE) /datum/wires/mulebot/proc/RemoteTX() - return !(wires_status & WIRE_REMOTE_TX) + return !(wires_status & MULEBOT_WIRE_REMOTE_TX) /datum/wires/mulebot/proc/RemoteRX() - return !(wires_status & WIRE_REMOTE_RX) + return !(wires_status & MULEBOT_WIRE_REMOTE_RX) /datum/wires/mulebot/proc/BeaconRX() - return !(wires_status & WIRE_BEACON_RX) \ No newline at end of file + return !(wires_status & MULEBOT_WIRE_BEACON_RX) \ No newline at end of file diff --git a/code/datums/wires/nuclearbomb.dm b/code/datums/wires/nuclearbomb.dm index 5b704a4526b..83fa911506d 100644 --- a/code/datums/wires/nuclearbomb.dm +++ b/code/datums/wires/nuclearbomb.dm @@ -3,9 +3,9 @@ random = 1 wire_count = 7 -var/const/NUCLEARBOMB_WIRE_LIGHT = 1 -var/const/NUCLEARBOMB_WIRE_TIMING = 2 -var/const/NUCLEARBOMB_WIRE_SAFETY = 4 +#define NUCLEARBOMB_WIRE_LIGHT 1 +#define NUCLEARBOMB_WIRE_TIMING 2 +#define NUCLEARBOMB_WIRE_SAFETY 4 /datum/wires/nuclearbomb/GetWireName(index) switch(index) diff --git a/code/datums/wires/particle_accelerator.dm b/code/datums/wires/particle_accelerator.dm index 1ed68b799f4..64705e6c215 100644 --- a/code/datums/wires/particle_accelerator.dm +++ b/code/datums/wires/particle_accelerator.dm @@ -2,10 +2,10 @@ wire_count = 5 holder_type = /obj/machinery/particle_accelerator/control_box -var/const/PARTICLE_TOGGLE_WIRE = 1 // Toggles whether the PA is on or not. -var/const/PARTICLE_STRENGTH_WIRE = 2 // Determines the strength of the PA. -var/const/PARTICLE_INTERFACE_WIRE = 4 // Determines the interface showing up. -var/const/PARTICLE_LIMIT_POWER_WIRE = 8 // Determines how strong the PA can be. +#define PARTICLE_TOGGLE_WIRE 1 // Toggles whether the PA is on or not. +#define PARTICLE_STRENGTH_WIRE 2 // Determines the strength of the PA. +#define PARTICLE_INTERFACE_WIRE 4 // Determines the interface showing up. +#define PARTICLE_LIMIT_POWER_WIRE 8 // Determines how strong the PA can be. /datum/wires/particle_acc/control_box/GetWireName(index) switch(index) diff --git a/code/datums/wires/radio.dm b/code/datums/wires/radio.dm index 18a2ef73f65..90a72935c53 100644 --- a/code/datums/wires/radio.dm +++ b/code/datums/wires/radio.dm @@ -2,19 +2,19 @@ holder_type = /obj/item/radio wire_count = 3 -var/const/WIRE_SIGNAL = 1 -var/const/WIRE_RECEIVE = 2 -var/const/WIRE_TRANSMIT = 4 +#define RADIO_WIRE_SIGNAL 1 +#define RADIO_WIRE_RECEIVE 2 +#define RADIO_WIRE_TRANSMIT 4 /datum/wires/radio/GetWireName(index) switch(index) - if(WIRE_SIGNAL) + if(RADIO_WIRE_SIGNAL) return "Signal" - if(WIRE_RECEIVE) + if(RADIO_WIRE_RECEIVE) return "Receiver" - if(WIRE_TRANSMIT) + if(RADIO_WIRE_TRANSMIT) return "Transmitter" /datum/wires/radio/CanUse(mob/living/L) @@ -26,27 +26,27 @@ var/const/WIRE_TRANSMIT = 4 /datum/wires/radio/UpdatePulsed(index) var/obj/item/radio/R = holder switch(index) - if(WIRE_SIGNAL) - R.listening = !R.listening && !IsIndexCut(WIRE_RECEIVE) - R.broadcasting = R.listening && !IsIndexCut(WIRE_TRANSMIT) + if(RADIO_WIRE_SIGNAL) + R.listening = !R.listening && !IsIndexCut(RADIO_WIRE_RECEIVE) + R.broadcasting = R.listening && !IsIndexCut(RADIO_WIRE_TRANSMIT) - if(WIRE_RECEIVE) - R.listening = !R.listening && !IsIndexCut(WIRE_SIGNAL) + if(RADIO_WIRE_RECEIVE) + R.listening = !R.listening && !IsIndexCut(RADIO_WIRE_SIGNAL) - if(WIRE_TRANSMIT) - R.broadcasting = !R.broadcasting && !IsIndexCut(WIRE_SIGNAL) + if(RADIO_WIRE_TRANSMIT) + R.broadcasting = !R.broadcasting && !IsIndexCut(RADIO_WIRE_SIGNAL) ..() /datum/wires/radio/UpdateCut(index, mended) var/obj/item/radio/R = holder switch(index) - if(WIRE_SIGNAL) - R.listening = mended && !IsIndexCut(WIRE_RECEIVE) - R.broadcasting = mended && !IsIndexCut(WIRE_TRANSMIT) + if(RADIO_WIRE_SIGNAL) + R.listening = mended && !IsIndexCut(RADIO_WIRE_RECEIVE) + R.broadcasting = mended && !IsIndexCut(RADIO_WIRE_TRANSMIT) - if(WIRE_RECEIVE) - R.listening = mended && !IsIndexCut(WIRE_SIGNAL) + if(RADIO_WIRE_RECEIVE) + R.listening = mended && !IsIndexCut(RADIO_WIRE_SIGNAL) - if(WIRE_TRANSMIT) - R.broadcasting = mended && !IsIndexCut(WIRE_SIGNAL) + if(RADIO_WIRE_TRANSMIT) + R.broadcasting = mended && !IsIndexCut(RADIO_WIRE_SIGNAL) ..() diff --git a/code/datums/wires/robot.dm b/code/datums/wires/robot.dm index bc03e80c327..f55cee5951f 100644 --- a/code/datums/wires/robot.dm +++ b/code/datums/wires/robot.dm @@ -3,21 +3,13 @@ holder_type = /mob/living/silicon/robot wire_count = 5 -/* /tg/ ordering doesn't work for us, we need lawsync at the end for MoMMIs. -var/const/BORG_WIRE_LAWCHECK = 1 -var/const/BORG_WIRE_MAIN_POWER = 2 // The power wires do nothing whyyyyyyyyyyyyy -var/const/BORG_WIRE_LOCKED_DOWN = 4 -var/const/BORG_WIRE_AI_CONTROL = 8 -var/const/BORG_WIRE_CAMERA = 16 -*/ - // /vg/ ordering -var/const/BORG_WIRE_MAIN_POWER = 1 // The power wires do nothing whyyyyyyyyyyyyy -var/const/BORG_WIRE_LOCKED_DOWN = 2 -var/const/BORG_WIRE_CAMERA = 4 -var/const/BORG_WIRE_AI_CONTROL = 8 // Not used on MoMMIs -var/const/BORG_WIRE_LAWCHECK = 16 // Not used on MoMMIs +#define BORG_WIRE_MAIN_POWER 1 // The power wires do nothing whyyyyyyyyyyyyy +#define BORG_WIRE_LOCKED_DOWN 2 +#define BORG_WIRE_CAMERA 4 +#define BORG_WIRE_AI_CONTROL 8 // Not used on MoMMIs +#define BORG_WIRE_LAWCHECK 16 // Not used on MoMMIs /datum/wires/robot/GetWireName(index) switch(index) diff --git a/code/datums/wires/smartfridge.dm b/code/datums/wires/smartfridge.dm index 53b33e0fd72..a65377ead1a 100644 --- a/code/datums/wires/smartfridge.dm +++ b/code/datums/wires/smartfridge.dm @@ -6,9 +6,9 @@ random = 1 wire_count = 4 -var/const/SMARTFRIDGE_WIRE_ELECTRIFY = 1 -var/const/SMARTFRIDGE_WIRE_THROW = 2 -var/const/SMARTFRIDGE_WIRE_IDSCAN = 4 +#define SMARTFRIDGE_WIRE_ELECTRIFY 1 +#define SMARTFRIDGE_WIRE_THROW 2 +#define SMARTFRIDGE_WIRE_IDSCAN 4 /datum/wires/smartfridge/GetWireName(index) switch(index) diff --git a/code/datums/wires/suitstorage.dm b/code/datums/wires/suitstorage.dm index b519b449c86..ddd0fda2bb6 100644 --- a/code/datums/wires/suitstorage.dm +++ b/code/datums/wires/suitstorage.dm @@ -2,10 +2,10 @@ holder_type = /obj/machinery/suit_storage_unit wire_count = 8 -var/const/SSU_WIRE_ID = 1 -var/const/SSU_WIRE_SHOCK = 2 -var/const/SSU_WIRE_SAFETY = 4 -var/const/SSU_WIRE_UV = 8 +#define SSU_WIRE_ID 1 +#define SSU_WIRE_SHOCK 2 +#define SSU_WIRE_SAFETY 4 +#define SSU_WIRE_UV 8 /datum/wires/suitstorage/GetWireName(index) diff --git a/code/datums/wires/syndicatebomb.dm b/code/datums/wires/syndicatebomb.dm index 616429b8cd8..27ea28a90ad 100644 --- a/code/datums/wires/syndicatebomb.dm +++ b/code/datums/wires/syndicatebomb.dm @@ -3,27 +3,27 @@ holder_type = /obj/machinery/syndicatebomb wire_count = 5 -var/const/WIRE_BOOM = 1 // Explodes if pulsed or cut while active, defuses a bomb that isn't active on cut -var/const/WIRE_UNBOLT = 2 // Unbolts the bomb if cut, hint on pulsed -var/const/WIRE_DELAY = 4 // Raises the timer on pulse, does nothing on cut -var/const/WIRE_PROCEED = 8 // Lowers the timer, explodes if cut while the bomb is active -var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if pulsed while already active, will stop a timer a bomb on cut +#define BOMB_WIRE_BOOM 1 // Explodes if pulsed or cut while active, defuses a bomb that isn't active on cut +#define BOMB_WIRE_UNBOLT 2 // Unbolts the bomb if cut, hint on pulsed +#define BOMB_WIRE_DELAY 4 // Raises the timer on pulse, does nothing on cut +#define BOMB_WIRE_PROCEED 8 // Lowers the timer, explodes if cut while the bomb is active +#define BOMB_WIRE_ACTIVATE 16 // Will start a bombs timer if pulsed, will hint if pulsed while already active, will stop a timer a bomb on cut /datum/wires/syndicatebomb/GetWireName(index) switch(index) - if(WIRE_BOOM) + if(BOMB_WIRE_BOOM) return "Explode" - if(WIRE_UNBOLT) + if(BOMB_WIRE_UNBOLT) return "Unbolt" - if(WIRE_DELAY) + if(BOMB_WIRE_DELAY) return "Delay" - if(WIRE_PROCEED) + if(BOMB_WIRE_PROCEED) return "Proceed" - if(WIRE_ACTIVATE) + if(BOMB_WIRE_ACTIVATE) return "Activate" /datum/wires/syndicatebomb/CanUse(mob/living/L) @@ -35,13 +35,13 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if /datum/wires/syndicatebomb/UpdatePulsed(index) var/obj/machinery/syndicatebomb/B = holder switch(index) - if(WIRE_BOOM) + if(BOMB_WIRE_BOOM) if(B.active) holder.visible_message("[bicon(B)] An alarm sounds! It's go-") B.explode_now = TRUE - if(WIRE_UNBOLT) + if(BOMB_WIRE_UNBOLT) holder.visible_message("[bicon(holder)] The bolts spin in place for a moment.") - if(WIRE_DELAY) + if(BOMB_WIRE_DELAY) if(B.delayedbig) holder.visible_message("[bicon(B)] The bomb has already been delayed.") else @@ -49,7 +49,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if playsound(B, 'sound/machines/chime.ogg', 30, 1) B.detonation_timer += 300 B.delayedbig = TRUE - if(WIRE_PROCEED) + if(BOMB_WIRE_PROCEED) holder.visible_message("[bicon(B)] The bomb buzzes ominously!") playsound(B, 'sound/machines/buzz-sigh.ogg', 30, 1) var/seconds = B.seconds_remaining() @@ -59,7 +59,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if B.detonation_timer -= 100 else if(seconds >= 11) // Both to prevent negative timers and to have a little mercy. B.detonation_timer = world.time + 100 - if(WIRE_ACTIVATE) + if(BOMB_WIRE_ACTIVATE) if(!B.active && !B.defused) holder.visible_message("[bicon(B)] You hear the bomb start ticking!") B.activate() @@ -75,7 +75,7 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if /datum/wires/syndicatebomb/UpdateCut(index, mended) var/obj/machinery/syndicatebomb/B = holder switch(index) - if(WIRE_EXPLODE) + if(BOMB_WIRE_BOOM) if(mended) B.defused = FALSE // Cutting and mending all the wires of an inactive bomb will thus cure any sabotage. else @@ -84,16 +84,16 @@ var/const/WIRE_ACTIVATE = 16 // Will start a bombs timer if pulsed, will hint if B.explode_now = TRUE else B.defused = TRUE - if(WIRE_UNBOLT) + if(BOMB_WIRE_UNBOLT) if(!mended && B.anchored) holder.visible_message("[bicon(B)] The bolts lift out of the ground!") playsound(B, 'sound/effects/stealthoff.ogg', 30, 1) B.anchored = FALSE - if(WIRE_PROCEED) + if(BOMB_WIRE_PROCEED) if(!mended && B.active) holder.visible_message("[bicon(B)] An alarm sounds! It's go-") B.explode_now = TRUE - if(WIRE_ACTIVATE) + if(BOMB_WIRE_ACTIVATE) if(!mended && B.active) holder.visible_message("[bicon(B)] The timer stops! The bomb has been defused!") B.active = FALSE diff --git a/code/datums/wires/tesla_coil.dm b/code/datums/wires/tesla_coil.dm index ed60e927f45..b0b0a57ede4 100644 --- a/code/datums/wires/tesla_coil.dm +++ b/code/datums/wires/tesla_coil.dm @@ -2,11 +2,11 @@ wire_count = 1 holder_type = /obj/machinery/power/tesla_coil -var/const/WIRE_ZAP = 1 +#define TESLACOIL_WIRE_ZAP 1 /datum/wires/tesla_coil/GetWireName(index) switch(index) - if(WIRE_ZAP) + if(TESLACOIL_WIRE_ZAP) return "Zap" /datum/wires/tesla_coil/CanUse(mob/living/L) @@ -18,6 +18,6 @@ var/const/WIRE_ZAP = 1 /datum/wires/tesla_coil/UpdatePulsed(index) var/obj/machinery/power/tesla_coil/T = holder switch(index) - if(WIRE_ZAP) + if(TESLACOIL_WIRE_ZAP) T.zap() ..() \ No newline at end of file diff --git a/code/datums/wires/vending.dm b/code/datums/wires/vending.dm index 3861cc68203..704c6bad750 100644 --- a/code/datums/wires/vending.dm +++ b/code/datums/wires/vending.dm @@ -2,10 +2,10 @@ holder_type = /obj/machinery/vending wire_count = 4 -var/const/VENDING_WIRE_THROW = 1 -var/const/VENDING_WIRE_CONTRABAND = 2 -var/const/VENDING_WIRE_ELECTRIFY = 4 -var/const/VENDING_WIRE_IDSCAN = 8 +#define VENDING_WIRE_THROW 1 +#define VENDING_WIRE_CONTRABAND 2 +#define VENDING_WIRE_ELECTRIFY 4 +#define VENDING_WIRE_IDSCAN 8 /datum/wires/vending/GetWireName(index) switch(index) diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 5220fd83a6d..d055310eddf 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -208,20 +208,20 @@ var/list/wireColours = list("red", "blue", "green", "black", "orange", "brown", // Example of use: /* -var/const/BOLTED= 1 -var/const/SHOCKED = 2 -var/const/SAFETY = 4 -var/const/POWER = 8 +#define NAME_WIRE_BOLTED 1 +#define NAME_WIRE_SHOCKED 2 +#define NAME_WIRE_SAFETY 4 +#define NAME_WIRE_POWER 8 /datum/wires/door/UpdateCut(var/index, var/mended) var/obj/machinery/door/airlock/A = holder switch(index) - if(BOLTED) + if(NAME_WIRE_BOLTED) if(!mended) A.bolt() - if(SHOCKED) + if(NAME_WIRE_SHOCKED) A.shock() - if(SAFETY ) + if(NAME_WIRE_SAFETY) A.safety() */ diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm index 86940fcb412..d0ae6fc5588 100644 --- a/code/game/area/areas/depot-areas.dm +++ b/code/game/area/areas/depot-areas.dm @@ -174,7 +174,7 @@ L.close() if(!L.locked) L.locked = !L.locked - L.req_access = list(access_syndicate_leader) + L.req_access = list(ACCESS_SYNDICATE_LEADER) L.update_icon() else log_game("Depot visit: ended") @@ -182,7 +182,7 @@ for(var/mob/living/simple_animal/hostile/syndicate/N in src) N.a_intent = INTENT_HARM for(var/obj/machinery/door/airlock/A in src) - A.req_access_txt = "[access_syndicate_leader]" + A.req_access_txt = "[ACCESS_SYNDICATE_LEADER]" for(var/obj/structure/closet/secure_closet/syndicate/depot/L in src) if(L.locked) L.locked = !L.locked diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index cf7f931ff32..feb2e59f6cd 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -424,7 +424,7 @@ if(master) return master.attack_hand(a, b, c) -/atom/movable/proc/water_act(volume, temperature, source, method = TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins) +/atom/movable/proc/water_act(volume, temperature, source, method = REAGENT_TOUCH) //amount of water acting : temperature of water in kelvin : object that called it (for shennagins) return TRUE /atom/movable/proc/handle_buckled_mob_movement(newloc,direct) diff --git a/code/game/gamemodes/blob/powers.dm b/code/game/gamemodes/blob/powers.dm index d4c429a6f53..548f2759ba0 100644 --- a/code/game/gamemodes/blob/powers.dm +++ b/code/game/gamemodes/blob/powers.dm @@ -336,7 +336,7 @@ if(ROLE_BLOB in L.faction) //no friendly/dead fire continue var/mob_protection = L.get_permeability_protection() - blob_reagent_datum.reaction_mob(L, TOUCH, 25, 1, mob_protection) + blob_reagent_datum.reaction_mob(L, REAGENT_TOUCH, 25, 1, mob_protection) blob_reagent_datum.send_message(L) OB.color = blob_reagent_datum.color return diff --git a/code/game/gamemodes/devil/devilinfo.dm b/code/game/gamemodes/devil/devilinfo.dm index 89d997831a3..abd90172ee9 100644 --- a/code/game/gamemodes/devil/devilinfo.dm +++ b/code/game/gamemodes/devil/devilinfo.dm @@ -555,5 +555,5 @@ var/global/list/lawlorify = list ( W.rank = W.assignment W.age = H.age W.sex = capitalize(H.gender) - W.access = list(access_maint_tunnels, access_syndicate, access_external_airlocks) + W.access = list(ACCESS_MAINT_TUNNELS, ACCESS_SYNDICATE, ACCESS_EXTERNAL_AIRLOCKS) W.photo = get_id_photo(H) diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 419b53d50a3..23d9792ca4c 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -346,5 +346,5 @@ owner.visible_message("[owner] vomits a cloud of plasma!") var/turf/simulated/T = get_turf(owner) if(istype(T)) - T.atmos_spawn_air(SPAWN_TOXINS|SPAWN_20C,50) + T.atmos_spawn_air(LINDA_SPAWN_TOXINS|LINDA_SPAWN_20C,50) owner.vomit() diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 2d7c9cff015..578cc8ac3a7 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -226,7 +226,7 @@ proc/issyndicate(mob/living/M as mob) ID.name = "[synd_mind.current.real_name] ID card" ID.registered_name = synd_mind.current.real_name if(is_leader) - ID.access += access_syndicate_leader + ID.access += ACCESS_SYNDICATE_LEADER else message_admins("Warning: Operative [key_name_admin(synd_mind.current)] spawned without an ID card!") diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 187ac0f0ea1..d818ad715b3 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -582,10 +582,10 @@ var/global/list/multiverse = list() W.access = duplicated_id.access W.icon_state = duplicated_id.icon_state else - W.access += access_maint_tunnels + W.access += ACCESS_MAINT_TUNNELS W.icon_state = "centcom" else - W.access += access_maint_tunnels + W.access += ACCESS_MAINT_TUNNELS W.icon_state = "centcom" W.assignment = "Multiverse Traveller" W.registered_name = M.real_name diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm index a31f694f7fc..6ac2daef330 100644 --- a/code/game/jobs/access.dm +++ b/code/game/jobs/access.dm @@ -1,115 +1,3 @@ -/var/const/access_security = 1 // Security equipment -/var/const/access_brig = 2 // Brig timers and permabrig -/var/const/access_armory = 3 -/var/const/access_forensics_lockers= 4 -/var/const/access_medical = 5 -/var/const/access_morgue = 6 -/var/const/access_tox = 7 -/var/const/access_tox_storage = 8 -/var/const/access_genetics = 9 -/var/const/access_engine = 10 -/var/const/access_engine_equip = 11 -/var/const/access_maint_tunnels = 12 -/var/const/access_external_airlocks = 13 -/var/const/access_emergency_storage = 14 -/var/const/access_change_ids = 15 -/var/const/access_ai_upload = 16 -/var/const/access_teleporter = 17 -/var/const/access_eva = 18 -/var/const/access_heads = 19 -/var/const/access_captain = 20 -/var/const/access_all_personal_lockers = 21 -/var/const/access_chapel_office = 22 -/var/const/access_tech_storage = 23 -/var/const/access_atmospherics = 24 -/var/const/access_bar = 25 -/var/const/access_janitor = 26 -/var/const/access_crematorium = 27 -/var/const/access_kitchen = 28 -/var/const/access_robotics = 29 -/var/const/access_rd = 30 -/var/const/access_cargo = 31 -/var/const/access_construction = 32 -/var/const/access_chemistry = 33 -/var/const/access_cargo_bot = 34 -/var/const/access_hydroponics = 35 -/var/const/access_manufacturing = 36 -/var/const/access_library = 37 -/var/const/access_lawyer = 38 -/var/const/access_virology = 39 -/var/const/access_cmo = 40 -/var/const/access_qm = 41 -/var/const/access_court = 42 -/var/const/access_clown = 43 -/var/const/access_mime = 44 -/var/const/access_surgery = 45 -/var/const/access_theatre = 46 -/var/const/access_research = 47 -/var/const/access_mining = 48 -/var/const/access_mining_office = 49 //not in use -/var/const/access_mailsorting = 50 -/var/const/access_mint = 51 -/var/const/access_mint_vault = 52 -/var/const/access_heads_vault = 53 -/var/const/access_mining_station = 54 -/var/const/access_xenobiology = 55 -/var/const/access_ce = 56 -/var/const/access_hop = 57 -/var/const/access_hos = 58 -/var/const/access_RC_announce = 59 //Request console announcements -/var/const/access_keycard_auth = 60 //Used for events which require at least two people to confirm them -/var/const/access_tcomsat = 61 // has access to the entire telecomms satellite / machinery -/var/const/access_gateway = 62 -/var/const/access_sec_doors = 63 // Security front doors -/var/const/access_psychiatrist = 64 // Psychiatrist's office -/var/const/access_xenoarch = 65 -/var/const/access_paramedic = 66 -/var/const/access_blueshield = 67 -/var/const/access_salvage_captain = 69 // Salvage ship captain's quarters -/var/const/access_mechanic = 70 -/var/const/access_pilot = 71 -/var/const/access_ntrep = 73 -/var/const/access_magistrate = 74 -/var/const/access_minisat = 75 -/var/const/access_mineral_storeroom = 76 -/var/const/access_network = 77 - -/var/const/access_weapons = 99 //Weapon authorization for secbots - - //BEGIN CENTCOM ACCESS -/var/const/access_cent_general = 101//General facilities. -/var/const/access_cent_living = 102//Living quarters. -/var/const/access_cent_medical = 103//Medical. -/var/const/access_cent_security = 104//Security. -/var/const/access_cent_storage = 105//Storage areas. -/var/const/access_cent_shuttles = 106//Shuttle docks. -/var/const/access_cent_telecomms = 107//Telecomms. -/var/const/access_cent_teleporter = 108//Teleporter -/var/const/access_cent_specops = 109//Special Ops. -/var/const/access_cent_specops_commander = 110//Special Ops Commander. -/var/const/access_cent_blackops = 111//Black Ops. -/var/const/access_cent_thunder = 112//Thunderdome. -/var/const/access_cent_bridge = 113//Bridge. -/var/const/access_cent_commander = 114//Commander's Office/ID computer. - -//The Syndicate -/var/const/access_syndicate = 150//General Syndicate Access -/var/const/access_syndicate_leader = 151//Nuke Op Leader Access -/var/const/access_vox = 152//Vox Access -/var/const/access_syndicate_command = 153//Admin syndi officer - -//Trade Stations -var/const/access_trade_sol = 160 - -//MONEY -/var/const/access_crate_cash = 200 - -//Awaymissions -/var/const/access_away01 = 271 - -//Ghost roles -var/const/access_free_golems = 300 - /obj/var/list/req_access = null /obj/var/req_access_txt = "0" /obj/var/list/req_one_access = null @@ -191,23 +79,23 @@ var/const/access_free_golems = 300 /proc/get_centcom_access(job) switch(job) if("VIP Guest") - return list(access_cent_general, access_cent_living) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING) if("Custodian") - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_storage) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) if("Thunderdome Overseer") - return list(access_cent_general, access_cent_thunder) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_THUNDER) if("Emergency Response Team Member") - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_specops) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS) + get_all_accesses() if("Emergency Response Team Leader") - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_specops, access_cent_specops_commander) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER) + get_all_accesses() if("Medical Officer") - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_storage) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE) + get_all_accesses() if("Intel Officer") - return list(access_cent_general, access_cent_living, access_cent_security, access_cent_storage) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE) + get_all_accesses() if("Research Officer") - return list(access_cent_general, access_cent_specops, access_cent_medical, access_cent_storage, access_cent_telecomms, access_cent_teleporter) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_SPECOPS, ACCESS_CENT_MEDICAL, ACCESS_CENT_STORAGE, ACCESS_CENT_TELECOMMS, ACCESS_CENT_TELEPORTER) + get_all_accesses() if("Death Commando") - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_specops, access_cent_specops_commander, access_cent_blackops) + get_all_accesses() + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_BLACKOPS) + get_all_accesses() if("Deathsquad Officer") return get_all_centcom_access() + get_all_accesses() if("NT Undercover Operative") @@ -226,42 +114,42 @@ var/const/access_free_golems = 300 /proc/get_syndicate_access(job) switch(job) if("Syndicate Operative") - return list(access_syndicate) + return list(ACCESS_SYNDICATE) if("Syndicate Operative Leader") - return list(access_syndicate, access_syndicate_leader) + return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) if("Syndicate Agent") - return list(access_syndicate, access_maint_tunnels) + return list(ACCESS_SYNDICATE, ACCESS_MAINT_TUNNELS) if("Vox Raider") - return list(access_vox) + return list(ACCESS_VOX) if("Vox Trader") - return list(access_vox) + return list(ACCESS_VOX) if("Syndicate Commando") - return list(access_syndicate, access_syndicate_leader) + return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER) if("Syndicate Officer") - return list(access_syndicate, access_syndicate_leader, access_syndicate_command) + return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_SYNDICATE_COMMAND) /proc/get_all_accesses() - return list(access_security, access_sec_doors, access_brig, access_armory, access_forensics_lockers, access_court, - access_medical, access_genetics, access_morgue, access_rd, - access_tox, access_tox_storage, access_chemistry, access_engine, access_engine_equip, access_maint_tunnels, - access_external_airlocks, access_change_ids, access_ai_upload, - access_teleporter, access_eva, access_heads, access_captain, access_all_personal_lockers, - access_tech_storage, access_chapel_office, access_atmospherics, access_kitchen, - access_bar, access_janitor, access_crematorium, access_robotics, access_cargo, access_construction, - access_hydroponics, access_library, access_lawyer, access_virology, access_psychiatrist, access_cmo, access_qm, access_clown, access_mime, access_surgery, - access_theatre, access_research, access_mining, access_mailsorting, - access_heads_vault, access_mining_station, access_xenobiology, access_ce, access_hop, access_hos, access_RC_announce, - access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_paramedic, access_blueshield, access_mechanic,access_weapons, - access_pilot, access_ntrep, access_magistrate, access_mineral_storeroom, access_minisat, access_network) + return list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, + ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_RD, + ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_CHEMISTRY, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_MAINT_TUNNELS, + ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, + ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_HEADS, ACCESS_CAPTAIN, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_TECH_STORAGE, ACCESS_CHAPEL_OFFICE, ACCESS_ATMOSPHERICS, ACCESS_KITCHEN, + ACCESS_BAR, ACCESS_JANITOR, ACCESS_CREMATORIUM, ACCESS_ROBOTICS, ACCESS_CARGO, ACCESS_CONSTRUCTION, + ACCESS_HYDROPONICS, ACCESS_LIBRARY, ACCESS_LAWYER, ACCESS_VIROLOGY, ACCESS_PSYCHIATRIST, ACCESS_CMO, ACCESS_QM, ACCESS_CLOWN, ACCESS_MIME, ACCESS_SURGERY, + ACCESS_THEATRE, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_MAILSORTING, + ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, ACCESS_XENOBIOLOGY, ACCESS_CE, ACCESS_HOP, ACCESS_HOS, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_PARAMEDIC, ACCESS_BLUESHIELD, ACCESS_MECHANIC,ACCESS_WEAPONS, + ACCESS_PILOT, ACCESS_NTREP, ACCESS_MAGISTRATE, ACCESS_MINERAL_STOREROOM, ACCESS_MINISAT, ACCESS_NETWORK) /proc/get_all_centcom_access() - return list(access_cent_general, access_cent_living, access_cent_medical, access_cent_security, access_cent_storage, access_cent_shuttles, access_cent_telecomms, access_cent_teleporter, access_cent_specops, access_cent_specops_commander, access_cent_blackops, access_cent_thunder, access_cent_bridge, access_cent_commander) + return list(ACCESS_CENT_GENERAL, ACCESS_CENT_LIVING, ACCESS_CENT_MEDICAL, ACCESS_CENT_SECURITY, ACCESS_CENT_STORAGE, ACCESS_CENT_SHUTTLES, ACCESS_CENT_TELECOMMS, ACCESS_CENT_TELEPORTER, ACCESS_CENT_SPECOPS, ACCESS_CENT_SPECOPS_COMMANDER, ACCESS_CENT_BLACKOPS, ACCESS_CENT_THUNDER, ACCESS_CENT_BRIDGE, ACCESS_CENT_COMMANDER) /proc/get_all_syndicate_access() - return list(access_syndicate, access_syndicate_leader, access_vox, access_syndicate_command) + return list(ACCESS_SYNDICATE, ACCESS_SYNDICATE_LEADER, ACCESS_VOX, ACCESS_SYNDICATE_COMMAND) /proc/get_all_misc_access() - return list(access_salvage_captain, access_trade_sol, access_crate_cash, access_away01) + return list(ACCESS_SALVAGE_CAPTAIN, ACCESS_TRADE_SOL, ACCESS_CRATE_CASH, ACCESS_AWAY01) /proc/get_absolutely_all_accesses() return (get_all_accesses() | get_all_centcom_access() | get_all_syndicate_access() | get_all_misc_access()) @@ -271,19 +159,19 @@ var/const/access_free_golems = 300 if(REGION_ALL) return get_all_accesses() if(REGION_GENERAL) //station general - return list(access_kitchen, access_bar, access_hydroponics, access_janitor, access_chapel_office, access_crematorium, access_library, access_theatre, access_lawyer, access_magistrate, access_clown, access_mime) + return list(ACCESS_KITCHEN, ACCESS_BAR, ACCESS_HYDROPONICS, ACCESS_JANITOR, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_LIBRARY, ACCESS_THEATRE, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_CLOWN, ACCESS_MIME) if(REGION_SECURITY) //security - return list(access_sec_doors, access_weapons, access_security, access_brig, access_armory, access_forensics_lockers, access_court, access_pilot, access_hos) + return list(ACCESS_SEC_DOORS, ACCESS_WEAPONS, ACCESS_SECURITY, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_FORENSICS_LOCKERS, ACCESS_COURT, ACCESS_PILOT, ACCESS_HOS) if(REGION_MEDBAY) //medbay - return list(access_medical, access_genetics, access_morgue, access_chemistry, access_psychiatrist, access_virology, access_surgery, access_cmo, access_paramedic) + return list(ACCESS_MEDICAL, ACCESS_GENETICS, ACCESS_MORGUE, ACCESS_CHEMISTRY, ACCESS_PSYCHIATRIST, ACCESS_VIROLOGY, ACCESS_SURGERY, ACCESS_CMO, ACCESS_PARAMEDIC) if(REGION_RESEARCH) //research - return list(access_research, access_tox, access_tox_storage, access_genetics, access_robotics, access_xenobiology, access_xenoarch, access_minisat, access_rd, access_network) + return list(ACCESS_RESEARCH, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_GENETICS, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_RD, ACCESS_NETWORK) if(REGION_ENGINEERING) //engineering and maintenance - return list(access_construction, access_maint_tunnels, access_engine, access_engine_equip, access_external_airlocks, access_tech_storage, access_atmospherics, access_minisat, access_ce, access_mechanic) + return list(ACCESS_CONSTRUCTION, ACCESS_MAINT_TUNNELS, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_TECH_STORAGE, ACCESS_ATMOSPHERICS, ACCESS_MINISAT, ACCESS_CE, ACCESS_MECHANIC) if(REGION_SUPPLY) //supply - return list(access_mailsorting, access_mining, access_mining_station, access_mineral_storeroom, access_cargo, access_qm) + return list(ACCESS_MAILSORTING, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM, ACCESS_CARGO, ACCESS_QM) if(REGION_COMMAND) //command - return list(access_heads, access_RC_announce, access_keycard_auth, access_change_ids, access_ai_upload, access_teleporter, access_eva, access_tcomsat, access_gateway, access_all_personal_lockers, access_heads_vault, access_blueshield, access_ntrep, access_hop, access_captain) + return list(ACCESS_HEADS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_CHANGE_IDS, ACCESS_AI_UPLOAD, ACCESS_TELEPORTER, ACCESS_EVA, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_HEADS_VAULT, ACCESS_BLUESHIELD, ACCESS_NTREP, ACCESS_HOP, ACCESS_CAPTAIN) if(REGION_CENTCOMM) //because why the heck not return get_all_centcom_access() + get_all_accesses() @@ -311,197 +199,197 @@ var/const/access_free_golems = 300 /proc/get_access_desc(A) switch(A) - if(access_cargo) + if(ACCESS_CARGO) return "Cargo Bay" - if(access_cargo_bot) + if(ACCESS_CARGO_BOT) return "Cargo Bot Delivery" - if(access_security) + if(ACCESS_SECURITY) return "Security" - if(access_brig) + if(ACCESS_BRIG) return "Holding Cells" - if(access_court) + if(ACCESS_COURT) return "Courtroom" - if(access_forensics_lockers) + if(ACCESS_FORENSICS_LOCKERS) return "Forensics" - if(access_medical) + if(ACCESS_MEDICAL) return "Medical" - if(access_genetics) + if(ACCESS_GENETICS) return "Genetics Lab" - if(access_morgue) + if(ACCESS_MORGUE) return "Morgue" - if(access_tox) + if(ACCESS_TOX) return "R&D Lab" - if(access_tox_storage) + if(ACCESS_TOX_STORAGE) return "Toxins Lab" - if(access_chemistry) + if(ACCESS_CHEMISTRY) return "Chemistry Lab" - if(access_rd) + if(ACCESS_RD) return "Research Director" - if(access_bar) + if(ACCESS_BAR) return "Bar" - if(access_janitor) + if(ACCESS_JANITOR) return "Custodial Closet" - if(access_engine) + if(ACCESS_ENGINE) return "Engineering" - if(access_engine_equip) + if(ACCESS_ENGINE_EQUIP) return "Power Equipment" - if(access_maint_tunnels) + if(ACCESS_MAINT_TUNNELS) return "Maintenance" - if(access_external_airlocks) + if(ACCESS_EXTERNAL_AIRLOCKS) return "External Airlocks" - if(access_emergency_storage) + if(ACCESS_EMERGENCY_STORAGE) return "Emergency Storage" - if(access_change_ids) + if(ACCESS_CHANGE_IDS) return "ID Computer" - if(access_ai_upload) + if(ACCESS_AI_UPLOAD) return "AI Upload" - if(access_teleporter) + if(ACCESS_TELEPORTER) return "Teleporter" - if(access_eva) + if(ACCESS_EVA) return "EVA" - if(access_heads) + if(ACCESS_HEADS) return "Bridge" - if(access_captain) + if(ACCESS_CAPTAIN) return "Captain" - if(access_all_personal_lockers) + if(ACCESS_ALL_PERSONAL_LOCKERS) return "Personal Lockers" - if(access_chapel_office) + if(ACCESS_CHAPEL_OFFICE) return "Chapel Office" - if(access_tech_storage) + if(ACCESS_TECH_STORAGE) return "Technical Storage" - if(access_atmospherics) + if(ACCESS_ATMOSPHERICS) return "Atmospherics" - if(access_crematorium) + if(ACCESS_CREMATORIUM) return "Crematorium" - if(access_armory) + if(ACCESS_ARMORY) return "Armory" - if(access_construction) + if(ACCESS_CONSTRUCTION) return "Construction Areas" - if(access_kitchen) + if(ACCESS_KITCHEN) return "Kitchen" - if(access_hydroponics) + if(ACCESS_HYDROPONICS) return "Hydroponics" - if(access_library) + if(ACCESS_LIBRARY) return "Library" - if(access_lawyer) + if(ACCESS_LAWYER) return "Law Office" - if(access_robotics) + if(ACCESS_ROBOTICS) return "Robotics" - if(access_virology) + if(ACCESS_VIROLOGY) return "Virology" - if(access_psychiatrist) + if(ACCESS_PSYCHIATRIST) return "Psychiatrist's Office" - if(access_cmo) + if(ACCESS_CMO) return "Chief Medical Officer" - if(access_qm) + if(ACCESS_QM) return "Quartermaster" - if(access_clown) + if(ACCESS_CLOWN) return "Clown's Office" - if(access_mime) + if(ACCESS_MIME) return "Mime's Office" - if(access_surgery) + if(ACCESS_SURGERY) return "Surgery" - if(access_theatre) + if(ACCESS_THEATRE) return "Theatre" - if(access_manufacturing) + if(ACCESS_MANUFACTURING) return "Manufacturing" - if(access_research) + if(ACCESS_RESEARCH) return "Science" - if(access_mining) + if(ACCESS_MINING) return "Mining" - if(access_mining_office) + if(ACCESS_MINING_OFFICE) return "Mining Office" - if(access_mailsorting) + if(ACCESS_MAILSORTING) return "Cargo Office" - if(access_mint) + if(ACCESS_MINT) return "Mint" - if(access_mint_vault) + if(ACCESS_MINT_VAULT) return "Mint Vault" - if(access_heads_vault) + if(ACCESS_HEADS_VAULT) return "Main Vault" - if(access_mining_station) + if(ACCESS_MINING_STATION) return "Mining EVA" - if(access_xenobiology) + if(ACCESS_XENOBIOLOGY) return "Xenobiology Lab" - if(access_xenoarch) + if(ACCESS_XENOARCH) return "Xenoarchaeology" - if(access_hop) + if(ACCESS_HOP) return "Head of Personnel" - if(access_hos) + if(ACCESS_HOS) return "Head of Security" - if(access_ce) + if(ACCESS_CE) return "Chief Engineer" - if(access_RC_announce) + if(ACCESS_RC_ANNOUNCE) return "RC Announcements" - if(access_keycard_auth) + if(ACCESS_KEYCARD_AUTH) return "Keycode Auth. Device" - if(access_tcomsat) + if(ACCESS_TCOMSAT) return "Telecommunications" - if(access_network) + if(ACCESS_NETWORK) return "Network Access" - if(access_gateway) + if(ACCESS_GATEWAY) return "Gateway" - if(access_sec_doors) + if(ACCESS_SEC_DOORS) return "Brig" - if(access_blueshield) + if(ACCESS_BLUESHIELD) return "Blueshield" - if(access_ntrep) + if(ACCESS_NTREP) return "Nanotrasen Rep." - if(access_paramedic) + if(ACCESS_PARAMEDIC) return "Paramedic" - if(access_mechanic) + if(ACCESS_MECHANIC) return "Mechanic Workshop" - if(access_pilot) + if(ACCESS_PILOT) return "Security Pod Pilot" - if(access_magistrate) + if(ACCESS_MAGISTRATE) return "Magistrate" - if(access_mineral_storeroom) + if(ACCESS_MINERAL_STOREROOM) return "Mineral Storage" - if(access_minisat) + if(ACCESS_MINISAT) return "AI Satellite" - if(access_weapons) + if(ACCESS_WEAPONS) return "Weapon Permit" /proc/get_centcom_access_desc(A) switch(A) - if(access_cent_general) + if(ACCESS_CENT_GENERAL) return "General Access" - if(access_cent_living) + if(ACCESS_CENT_LIVING) return "Living Quarters" - if(access_cent_medical) + if(ACCESS_CENT_MEDICAL) return "Medical" - if(access_cent_security) + if(ACCESS_CENT_SECURITY) return "Security" - if(access_cent_storage) + if(ACCESS_CENT_STORAGE) return "Storage" - if(access_cent_shuttles) + if(ACCESS_CENT_SHUTTLES) return "Shuttles" - if(access_cent_telecomms) + if(ACCESS_CENT_TELECOMMS) return "Telecommunications" - if(access_cent_teleporter) + if(ACCESS_CENT_TELEPORTER) return "Teleporter" - if(access_cent_specops) + if(ACCESS_CENT_SPECOPS) return "Special Ops" - if(access_cent_specops_commander) + if(ACCESS_CENT_SPECOPS_COMMANDER) return "Special Ops Commander" - if(access_cent_blackops) + if(ACCESS_CENT_BLACKOPS) return "Black Ops" - if(access_cent_thunder) + if(ACCESS_CENT_THUNDER) return "Thunderdome" - if(access_cent_bridge) + if(ACCESS_CENT_BRIDGE) return "Bridge" - if(access_cent_commander) + if(ACCESS_CENT_COMMANDER) return "Commander" /proc/get_syndicate_access_desc(A) switch(A) - if(access_syndicate) + if(ACCESS_SYNDICATE) return "Syndicate Operative" - if(access_syndicate_leader) + if(ACCESS_SYNDICATE_LEADER) return "Syndicate Operative Leader" - if(access_vox) + if(ACCESS_VOX) return "Vox" - if(access_syndicate_command) + if(ACCESS_SYNDICATE_COMMAND) return "Syndicate Command" /proc/get_all_jobs() diff --git a/code/game/jobs/job/central.dm b/code/game/jobs/job/central.dm index 1d6ae0162a2..93a5cdd6759 100644 --- a/code/game/jobs/job/central.dm +++ b/code/game/jobs/job/central.dm @@ -2,8 +2,8 @@ // General-purpose CC official. Can hear out grievances, investigate cases, issue demotions, etc. /datum/job/ntnavyofficer title = "Nanotrasen Navy Officer" - flag = CENTCOM - department_flag = CENTCOM + flag = JOB_CENTCOM + department_flag = JOB_CENTCOM // This gets its job as its own flag because admin jobs dont have flags total_positions = 5 spawn_positions = 5 supervisors = "the admins" @@ -48,8 +48,8 @@ // CC Officials who lead ERTs, Death Squads, etc. /datum/job/ntspecops title = "Special Operations Officer" - flag = CENTCOM - department_flag = CENTCOM + flag = JOB_CENTCOM + department_flag = JOB_CENTCOM // This gets its job as its own flag because admin jobs dont have flags total_positions = 5 spawn_positions = 5 supervisors = "the admins" diff --git a/code/game/jobs/job/civilian.dm b/code/game/jobs/job/civilian.dm index 4535e1c6c41..757f4b007c2 100644 --- a/code/game/jobs/job/civilian.dm +++ b/code/game/jobs/job/civilian.dm @@ -1,7 +1,7 @@ /datum/job/civilian title = "Civilian" - flag = CIVILIAN - department_flag = SUPPORT + flag = JOB_CIVILIAN + department_flag = JOBCAT_SUPPORT total_positions = -1 spawn_positions = -1 supervisors = "the head of personnel" @@ -14,7 +14,7 @@ /datum/job/civilian/get_access() if(config.assistant_maint) - return list(access_maint_tunnels) + return list(ACCESS_MAINT_TUNNELS) else return list() diff --git a/code/game/jobs/job/engineering.dm b/code/game/jobs/job/engineering.dm index ecae6919813..6fe3d89fb67 100644 --- a/code/game/jobs/job/engineering.dm +++ b/code/game/jobs/job/engineering.dm @@ -1,7 +1,7 @@ /datum/job/chief_engineer title = "Chief Engineer" - flag = CHIEF - department_flag = ENGSEC + flag = JOB_CHIEF + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 is_engineering = 1 @@ -9,14 +9,14 @@ department_head = list("Captain") selection_color = "#ffeeaa" req_admin_notify = 1 - access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, access_sec_doors, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_minisat, access_mechanic, access_mineral_storeroom) - minimal_access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, - access_teleporter, access_external_airlocks, access_atmospherics, access_emergency_storage, access_eva, - access_heads, access_construction, access_sec_doors, - access_ce, access_RC_announce, access_keycard_auth, access_tcomsat, access_minisat, access_mechanic, access_mineral_storeroom) + access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, + ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA, + ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, + ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, + ACCESS_TELEPORTER, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_ATMOSPHERICS, ACCESS_EMERGENCY_STORAGE, ACCESS_EVA, + ACCESS_HEADS, ACCESS_CONSTRUCTION, ACCESS_SEC_DOORS, + ACCESS_CE, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_MINISAT, ACCESS_MECHANIC, ACCESS_MINERAL_STOREROOM) minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_ENGINEERING @@ -47,16 +47,16 @@ /datum/job/engineer title = "Station Engineer" - flag = ENGINEER - department_flag = ENGSEC + flag = JOB_ENGINEER + department_flag = JOBCAT_ENGSEC total_positions = 5 spawn_positions = 5 is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") selection_color = "#fff5cc" - access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_mineral_storeroom) - minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_mineral_storeroom) + access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM) alt_titles = list("Maintenance Technician","Engine Technician","Electrician") minimal_player_age = 7 exp_requirements = 300 @@ -85,16 +85,16 @@ /datum/job/atmos title = "Life Support Specialist" - flag = ATMOSTECH - department_flag = ENGSEC + flag = JOB_ATMOSTECH + department_flag = JOBCAT_ENGSEC total_positions = 3 spawn_positions = 2 is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") selection_color = "#fff5cc" - access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_mineral_storeroom) - minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction, access_mineral_storeroom, access_tech_storage) + access = list(ACCESS_EVA, ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_CONSTRUCTION, ACCESS_ATMOSPHERICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_EVA, ACCESS_ATMOSPHERICS, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_EMERGENCY_STORAGE, ACCESS_CONSTRUCTION, ACCESS_MINERAL_STOREROOM, ACCESS_TECH_STORAGE) alt_titles = list("Atmospheric Technician") minimal_player_age = 7 exp_requirements = 300 @@ -119,16 +119,16 @@ /datum/job/mechanic title = "Mechanic" - flag = MECHANIC - department_flag = KARMA + flag = JOB_MECHANIC + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 is_engineering = 1 supervisors = "the chief engineer" department_head = list("Chief Engineer") selection_color = "#fff5cc" - access = list(access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_mechanic, access_external_airlocks, access_mineral_storeroom) - minimal_access = list(access_maint_tunnels, access_emergency_storage, access_mechanic, access_external_airlocks, access_mineral_storeroom) + access = list(ACCESS_ENGINE, ACCESS_ENGINE_EQUIP, ACCESS_TECH_STORAGE, ACCESS_MAINT_TUNNELS, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_EMERGENCY_STORAGE, ACCESS_MECHANIC, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/mechanic /datum/outfit/job/mechanic diff --git a/code/game/jobs/job/medical.dm b/code/game/jobs/job/medical.dm index 49e6b4486ac..425cd9252e5 100644 --- a/code/game/jobs/job/medical.dm +++ b/code/game/jobs/job/medical.dm @@ -1,7 +1,7 @@ /datum/job/cmo title = "Chief Medical Officer" - flag = CMO - department_flag = MEDSCI + flag = JOB_CMO + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_medical = 1 @@ -9,12 +9,12 @@ department_head = list("Captain") selection_color = "#ffddf0" req_admin_notify = 1 - access = list(access_medical, access_morgue, access_genetics, access_heads, - access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth, access_sec_doors, access_psychiatrist, access_paramedic, access_mineral_storeroom) - minimal_access = list(access_eva, access_medical, access_morgue, access_genetics, access_heads, - access_chemistry, access_virology, access_cmo, access_surgery, access_RC_announce, - access_keycard_auth, access_sec_doors, access_psychiatrist, access_maint_tunnels, access_paramedic, access_mineral_storeroom) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS, + ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_PARAMEDIC, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_EVA, ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_HEADS, + ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_CMO, ACCESS_SURGERY, ACCESS_RC_ANNOUNCE, + ACCESS_KEYCARD_AUTH, ACCESS_SEC_DOORS, ACCESS_PSYCHIATRIST, ACCESS_MAINT_TUNNELS, ACCESS_PARAMEDIC, ACCESS_MINERAL_STOREROOM) minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_MEDICAL @@ -42,16 +42,16 @@ /datum/job/doctor title = "Medical Doctor" - flag = DOCTOR - department_flag = MEDSCI + flag = JOB_DOCTOR + department_flag = JOBCAT_MEDSCI total_positions = 5 spawn_positions = 3 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) - minimal_access = list(access_medical, access_morgue, access_surgery, access_maint_tunnels) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_MAINT_TUNNELS) alt_titles = list("Surgeon","Nurse") minimal_player_age = 3 exp_requirements = 180 @@ -77,16 +77,16 @@ /datum/job/coroner title = "Coroner" - flag = CORONER - department_flag = MEDSCI + flag = JOB_CORONER + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) - minimal_access = list(access_medical, access_morgue, access_maint_tunnels) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS) minimal_player_age = 3 exp_requirements = 180 exp_type = EXP_TYPE_CREW @@ -139,16 +139,16 @@ //Chemist is a medical job damnit //YEAH FUCK YOU SCIENCE -Pete //Guys, behave -Erro /datum/job/chemist title = "Chemist" - flag = CHEMIST - department_flag = MEDSCI + flag = JOB_CHEMIST + department_flag = JOBCAT_MEDSCI total_positions = 2 spawn_positions = 2 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_mineral_storeroom) - minimal_access = list(access_medical, access_chemistry, access_maint_tunnels, access_mineral_storeroom) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_CHEMISTRY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Pharmacist","Pharmacologist") minimal_player_age = 7 exp_requirements = 300 @@ -173,16 +173,16 @@ /datum/job/geneticist title = "Geneticist" - flag = GENETICIST - department_flag = MEDSCI + flag = JOB_GENETICIST + department_flag = JOBCAT_MEDSCI total_positions = 2 spawn_positions = 2 is_medical = 1 supervisors = "the chief medical officer and the research director" department_head = list("Chief Medical Officer", "Research Director") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_research, access_mineral_storeroom) - minimal_access = list(access_medical, access_morgue, access_genetics, access_research, access_maint_tunnels) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_GENETICS, ACCESS_RESEARCH, ACCESS_MAINT_TUNNELS) minimal_player_age = 3 exp_requirements = 180 exp_type = EXP_TYPE_CREW @@ -207,16 +207,16 @@ /datum/job/virologist title = "Virologist" - flag = VIROLOGIST - department_flag = MEDSCI + flag = JOB_VIROLOGIST + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_virology, access_maint_tunnels, access_mineral_storeroom) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS) + minimal_access = list(ACCESS_MEDICAL, ACCESS_VIROLOGY, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Pathologist","Microbiologist") minimal_player_age = 7 exp_requirements = 300 @@ -242,16 +242,16 @@ /datum/job/psychiatrist title = "Psychiatrist" - flag = PSYCHIATRIST - department_flag = MEDSCI + flag = JOB_PSYCHIATRIST + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics, access_psychiatrist) - minimal_access = list(access_medical, access_psychiatrist, access_maint_tunnels) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS, ACCESS_PSYCHIATRIST) + minimal_access = list(ACCESS_MEDICAL, ACCESS_PSYCHIATRIST, ACCESS_MAINT_TUNNELS) alt_titles = list("Psychologist","Therapist") outfit = /datum/outfit/job/psychiatrist @@ -280,16 +280,16 @@ /datum/job/paramedic title = "Paramedic" - flag = PARAMEDIC - department_flag = MEDSCI + flag = JOB_PARAMEDIC + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_medical = 1 supervisors = "the chief medical officer" department_head = list("Chief Medical Officer") selection_color = "#ffeef0" - access = list(access_paramedic, access_medical, access_maint_tunnels, access_external_airlocks, access_morgue) - minimal_access=list(access_paramedic, access_medical, access_maint_tunnels, access_external_airlocks, access_morgue) + access = list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MORGUE) + minimal_access=list(ACCESS_PARAMEDIC, ACCESS_MEDICAL, ACCESS_MAINT_TUNNELS, ACCESS_EXTERNAL_AIRLOCKS, ACCESS_MORGUE) minimal_player_age = 3 exp_requirements = 180 exp_type = EXP_TYPE_CREW diff --git a/code/game/jobs/job/science.dm b/code/game/jobs/job/science.dm index 435565434c8..684de933832 100644 --- a/code/game/jobs/job/science.dm +++ b/code/game/jobs/job/science.dm @@ -1,7 +1,7 @@ /datum/job/rd title = "Research Director" - flag = RD - department_flag = MEDSCI + flag = JOB_RD + department_flag = JOBCAT_MEDSCI total_positions = 1 spawn_positions = 1 is_science = 1 @@ -9,14 +9,14 @@ department_head = list("Captain") selection_color = "#ffddff" req_admin_notify = 1 - access = list(access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_tech_storage, access_teleporter, access_sec_doors, - access_research, access_robotics, access_xenobiology, access_ai_upload, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_mineral_storeroom, access_network) - minimal_access = list(access_eva, access_rd, access_heads, access_tox, access_genetics, access_morgue, - access_tox_storage, access_tech_storage, access_teleporter, access_sec_doors, - access_research, access_robotics, access_xenobiology, access_ai_upload, - access_RC_announce, access_keycard_auth, access_tcomsat, access_gateway, access_xenoarch, access_minisat, access_maint_tunnels, access_mineral_storeroom, access_network) + access = list(ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, + ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, + ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MINERAL_STOREROOM, ACCESS_NETWORK) + minimal_access = list(ACCESS_EVA, ACCESS_RD, ACCESS_HEADS, ACCESS_TOX, ACCESS_GENETICS, ACCESS_MORGUE, + ACCESS_TOX_STORAGE, ACCESS_TECH_STORAGE, ACCESS_TELEPORTER, ACCESS_SEC_DOORS, + ACCESS_RESEARCH, ACCESS_ROBOTICS, ACCESS_XENOBIOLOGY, ACCESS_AI_UPLOAD, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_TCOMSAT, ACCESS_GATEWAY, ACCESS_XENOARCH, ACCESS_MINISAT, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM, ACCESS_NETWORK) minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_SCIENCE @@ -49,16 +49,16 @@ /datum/job/scientist title = "Scientist" - flag = SCIENTIST - department_flag = MEDSCI + flag = JOB_SCIENTIST + department_flag = JOBCAT_MEDSCI total_positions = 6 spawn_positions = 6 is_science = 1 supervisors = "the research director" department_head = list("Research Director") selection_color = "#ffeeff" - access = list(access_robotics, access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_mineral_storeroom) - minimal_access = list(access_tox, access_tox_storage, access_research, access_xenobiology, access_xenoarch, access_maint_tunnels, access_mineral_storeroom) + access = list(ACCESS_ROBOTICS, ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_TOX, ACCESS_TOX_STORAGE, ACCESS_RESEARCH, ACCESS_XENOBIOLOGY, ACCESS_XENOARCH, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Xenoarcheologist", "Anomalist", "Plasma Researcher", "Xenobiologist", "Chemical Researcher") minimal_player_age = 3 exp_requirements = 300 @@ -88,16 +88,16 @@ /datum/job/roboticist title = "Roboticist" - flag = ROBOTICIST - department_flag = MEDSCI + flag = JOB_ROBOTICIST + department_flag = JOBCAT_MEDSCI total_positions = 2 spawn_positions = 2 is_science = 1 supervisors = "the research director" department_head = list("Research Director") selection_color = "#ffeeff" - access = list(access_robotics, access_tox, access_tox_storage, access_tech_storage, access_morgue, access_research, access_mineral_storeroom) //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, access_maint_tunnels, access_mineral_storeroom) //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, ACCESS_MINERAL_STOREROOM) //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, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) //As a job that handles so many corpses, it makes sense for them to have morgue access. alt_titles = list("Biomechanical Engineer","Mechatronic Engineer") minimal_player_age = 3 exp_requirements = 180 diff --git a/code/game/jobs/job/security.dm b/code/game/jobs/job/security.dm index 0dfd0876817..d314f016a9a 100644 --- a/code/game/jobs/job/security.dm +++ b/code/game/jobs/job/security.dm @@ -1,7 +1,7 @@ /datum/job/hos title = "Head of Security" - flag = HOS - department_flag = ENGSEC + flag = JOB_HOS + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 is_security = 1 @@ -9,14 +9,14 @@ department_head = list("Captain") selection_color = "#ffdddd" req_admin_notify = 1 - access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, - access_forensics_lockers, access_pilot, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_weapons) - minimal_access = list(access_eva, access_security, access_sec_doors, access_brig, access_armory, access_court, - access_forensics_lockers, access_morgue, access_maint_tunnels, access_all_personal_lockers, - access_research, access_engine, access_mining, access_medical, access_construction, access_mailsorting, - access_heads, access_hos, access_RC_announce, access_keycard_auth, access_gateway, access_pilot, access_weapons) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, + ACCESS_FORENSICS_LOCKERS, ACCESS_PILOT, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS) + minimal_access = list(ACCESS_EVA, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, + ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_ALL_PERSONAL_LOCKERS, + ACCESS_RESEARCH, ACCESS_ENGINE, ACCESS_MINING, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING, + ACCESS_HEADS, ACCESS_HOS, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_PILOT, ACCESS_WEAPONS) minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_SECURITY @@ -52,16 +52,16 @@ /datum/job/warden title = "Warden" - flag = WARDEN - department_flag = ENGSEC + flag = JOB_WARDEN + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") selection_color = "#ffeeee" - access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons) - minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_weapons) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_ARMORY, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) minimal_player_age = 21 exp_requirements = 600 exp_type = EXP_TYPE_CREW @@ -96,8 +96,8 @@ /datum/job/detective title = "Detective" - flag = DETECTIVE - department_flag = ENGSEC + flag = JOB_DETECTIVE + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 is_security = 1 @@ -105,8 +105,8 @@ department_head = list("Head of Security") selection_color = "#ffeeee" alt_titles = list("Forensic Technician") - access = list(access_security, access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) - minimal_access = list(access_sec_doors, access_forensics_lockers, access_morgue, access_maint_tunnels, access_court, access_weapons) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) + minimal_access = list(ACCESS_SEC_DOORS, ACCESS_FORENSICS_LOCKERS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS, ACCESS_COURT, ACCESS_WEAPONS) alt_titles = list("Forensic Technician") minimal_player_age = 14 exp_requirements = 600 @@ -155,16 +155,16 @@ /datum/job/officer title = "Security Officer" - flag = OFFICER - department_flag = ENGSEC + flag = JOB_OFFICER + department_flag = JOBCAT_ENGSEC total_positions = 7 spawn_positions = 7 is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") selection_color = "#ffeeee" - access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_weapons) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS) minimal_player_age = 14 exp_requirements = 600 exp_type = EXP_TYPE_CREW @@ -195,16 +195,16 @@ /datum/job/brigdoc title = "Brig Physician" - flag = BRIGDOC - department_flag = KARMA + flag = JOB_BRIGDOC + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") selection_color = "#ffeeee" - access = list(access_medical, access_morgue, access_surgery, access_chemistry, access_virology, access_genetics) - minimal_access = list(access_medical, access_morgue, access_surgery, access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels) + access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_CHEMISTRY, ACCESS_VIROLOGY, ACCESS_GENETICS) + minimal_access = list(ACCESS_MEDICAL, ACCESS_MORGUE, ACCESS_SURGERY, ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS) outfit = /datum/outfit/job/brigdoc /datum/outfit/job/brigdoc @@ -227,16 +227,16 @@ /datum/job/pilot title = "Security Pod Pilot" - flag = PILOT - department_flag = KARMA + flag = JOB_PILOT + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 is_security = 1 supervisors = "the head of security" department_head = list("Head of Security") selection_color = "#ffeeee" - access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_morgue, access_weapons, access_pilot, access_external_airlocks) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_weapons, access_pilot, access_external_airlocks) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_PILOT, ACCESS_EXTERNAL_AIRLOCKS) minimal_player_age = 7 outfit = /datum/outfit/job/pilot diff --git a/code/game/jobs/job/silicon.dm b/code/game/jobs/job/silicon.dm index c239c1d3b3b..289b441b4d7 100644 --- a/code/game/jobs/job/silicon.dm +++ b/code/game/jobs/job/silicon.dm @@ -1,7 +1,7 @@ /datum/job/ai title = "AI" - flag = AI - department_flag = ENGSEC + flag = JOB_AI + department_flag = JOBCAT_ENGSEC total_positions = 0 // Not used for AI, see is_position_available below and modules/mob/living/silicon/ai/latejoin.dm spawn_positions = 1 selection_color = "#ccffcc" @@ -22,8 +22,8 @@ /datum/job/cyborg title = "Cyborg" - flag = CYBORG - department_flag = ENGSEC + flag = JOB_CYBORG + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 supervisors = "your laws and the AI" //Nodrak diff --git a/code/game/jobs/job/supervisor.dm b/code/game/jobs/job/supervisor.dm index feaf1c7972d..a94dfea7c73 100644 --- a/code/game/jobs/job/supervisor.dm +++ b/code/game/jobs/job/supervisor.dm @@ -1,8 +1,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/captain title = "Captain" - flag = CAPTAIN - department_flag = ENGSEC + flag = JOB_CAPTAIN + department_flag = JOBCAT_ENGSEC total_positions = 1 spawn_positions = 1 supervisors = "Nanotrasen officials" @@ -57,8 +57,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/hop title = "Head of Personnel" - flag = HOP - department_flag = SUPPORT + flag = JOB_HOP + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 supervisors = "the captain" @@ -69,18 +69,18 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) minimal_player_age = 21 exp_requirements = 300 exp_type = EXP_TYPE_COMMAND - access = list(access_security, access_sec_doors, access_brig, access_court, 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_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_mineral_storeroom) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, 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_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_mineral_storeroom) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, 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_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, 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_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/hop /datum/outfit/job/hop @@ -103,8 +103,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/nanotrasenrep title = "Nanotrasen Representative" - flag = NANO - department_flag = KARMA + flag = JOB_NANO + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 supervisors = "the command staff" @@ -113,18 +113,18 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) req_admin_notify = 1 is_command = 1 minimal_player_age = 21 - access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_medical, access_engine, access_change_ids, access_eva, access_heads, - access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, - access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, - access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_medical, access_engine, 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_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_ntrep) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, + ACCESS_MEDICAL, ACCESS_ENGINE, 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_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_NTREP) outfit = /datum/outfit/job/nanotrasenrep /datum/outfit/job/nanotrasenrep @@ -146,8 +146,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/blueshield title = "Blueshield" - flag = BLUESHIELD - department_flag = KARMA + flag = JOB_BLUESHIELD + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 supervisors = "the Nanotrasen representative" @@ -156,14 +156,14 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) req_admin_notify = 1 is_command = 1 minimal_player_age = 21 - access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_medical, access_engine, access_change_ids, access_eva, access_heads, - access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, - access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, - access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_weapons, access_blueshield) - minimal_access = list(access_forensics_lockers, access_sec_doors, access_medical, access_construction, access_engine, access_maint_tunnels, access_research, - access_RC_announce, access_keycard_auth, access_heads, access_blueshield, access_weapons) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_HOP, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_WEAPONS, ACCESS_BLUESHIELD) + minimal_access = list(ACCESS_FORENSICS_LOCKERS, ACCESS_SEC_DOORS, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_ENGINE, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, + ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_HEADS, ACCESS_BLUESHIELD, ACCESS_WEAPONS) outfit = /datum/outfit/job/blueshield /datum/outfit/job/blueshield @@ -189,8 +189,8 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) /datum/job/judge title = "Magistrate" - flag = JUDGE - department_flag = KARMA + flag = JOB_JUDGE + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 supervisors = "the Nanotrasen Supreme Court" @@ -199,13 +199,13 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) req_admin_notify = 1 is_legal = 1 minimal_player_age = 30 - access = list(access_security, access_sec_doors, access_brig, access_court, access_forensics_lockers, - access_medical, access_engine, access_change_ids, access_eva, access_heads, - access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue, - access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer, - access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station, - access_clown, access_mime, access_RC_announce, access_keycard_auth, access_gateway, access_magistrate) - minimal_access = list(access_security, access_sec_doors, access_brig, access_court, access_maint_tunnels, access_lawyer, access_magistrate, access_heads) + access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_FORENSICS_LOCKERS, + ACCESS_MEDICAL, ACCESS_ENGINE, ACCESS_CHANGE_IDS, ACCESS_EVA, ACCESS_HEADS, + ACCESS_ALL_PERSONAL_LOCKERS, ACCESS_MAINT_TUNNELS, ACCESS_BAR, ACCESS_JANITOR, ACCESS_CONSTRUCTION, ACCESS_MORGUE, + ACCESS_CREMATORIUM, ACCESS_KITCHEN, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_QM, ACCESS_HYDROPONICS, ACCESS_LAWYER, + ACCESS_THEATRE, ACCESS_CHAPEL_OFFICE, ACCESS_LIBRARY, ACCESS_RESEARCH, ACCESS_MINING, ACCESS_HEADS_VAULT, ACCESS_MINING_STATION, + ACCESS_CLOWN, ACCESS_MIME, ACCESS_RC_ANNOUNCE, ACCESS_KEYCARD_AUTH, ACCESS_GATEWAY, ACCESS_MAGISTRATE) + minimal_access = list(ACCESS_SECURITY, ACCESS_SEC_DOORS, ACCESS_BRIG, ACCESS_COURT, ACCESS_MAINT_TUNNELS, ACCESS_LAWYER, ACCESS_MAGISTRATE, ACCESS_HEADS) outfit = /datum/outfit/job/judge /datum/outfit/job/judge @@ -233,16 +233,16 @@ var/datum/announcement/minor/captain_announcement = new(do_newscast = 0) //var/global/lawyer = 0//Checks for another lawyer //This changed clothes on 2nd lawyer, both IA get the same dreds. /datum/job/lawyer title = "Internal Affairs Agent" - flag = LAWYER - department_flag = SUPPORT + flag = JOB_LAWYER + department_flag = JOBCAT_SUPPORT total_positions = 2 spawn_positions = 2 is_legal = 1 supervisors = "the magistrate" department_head = list("Captain") selection_color = "#ddddff" - access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) - minimal_access = list(access_lawyer, access_court, access_sec_doors, access_maint_tunnels, access_research, access_medical, access_construction, access_mailsorting) + access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING) + minimal_access = list(ACCESS_LAWYER, ACCESS_COURT, ACCESS_SEC_DOORS, ACCESS_MAINT_TUNNELS, ACCESS_RESEARCH, ACCESS_MEDICAL, ACCESS_CONSTRUCTION, ACCESS_MAILSORTING) alt_titles = list("Human Resources Agent") minimal_player_age = 30 exp_requirements = 600 diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index e4bb22b28af..8371dcfa1c3 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -1,16 +1,16 @@ //Food /datum/job/bartender title = "Bartender" - flag = BARTENDER - department_flag = SUPPORT + flag = JOB_BARTENDER + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue, access_weapons, access_mineral_storeroom) - minimal_access = list(access_bar, access_maint_tunnels, access_weapons, access_mineral_storeroom) + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_BAR, ACCESS_MAINT_TUNNELS, ACCESS_WEAPONS, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/bartender /datum/outfit/job/bartender @@ -42,16 +42,16 @@ /datum/job/chef title = "Chef" - flag = CHEF - department_flag = SUPPORT + flag = JOB_CHEF + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) - minimal_access = list(access_kitchen, access_maint_tunnels) + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) + minimal_access = list(ACCESS_KITCHEN, ACCESS_MAINT_TUNNELS) alt_titles = list("Cook","Culinary Artist","Butcher") outfit = /datum/outfit/job/chef @@ -76,16 +76,16 @@ /datum/job/hydro title = "Botanist" - flag = BOTANIST - department_flag = SUPPORT + flag = JOB_BOTANIST + department_flag = JOBCAT_SUPPORT total_positions = 3 spawn_positions = 2 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_hydroponics, access_bar, access_kitchen, access_morgue) - minimal_access = list(access_hydroponics, access_morgue, access_maint_tunnels) + access = list(ACCESS_HYDROPONICS, ACCESS_BAR, ACCESS_KITCHEN, ACCESS_MORGUE) + minimal_access = list(ACCESS_HYDROPONICS, ACCESS_MORGUE, ACCESS_MAINT_TUNNELS) alt_titles = list("Hydroponicist", "Botanical Researcher") outfit = /datum/outfit/job/hydro @@ -110,16 +110,16 @@ //Cargo /datum/job/qm title = "Quartermaster" - flag = QUARTERMASTER - department_flag = SUPPORT + flag = JOB_QUARTERMASTER + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_supply = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) - minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/qm /datum/outfit/job/qm @@ -138,16 +138,16 @@ /datum/job/cargo_tech title = "Cargo Technician" - flag = CARGOTECH - department_flag = SUPPORT + flag = JOB_CARGOTECH + department_flag = JOBCAT_SUPPORT total_positions = 2 spawn_positions = 2 is_supply = 1 supervisors = "the quartermaster" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) - minimal_access = list(access_maint_tunnels, access_cargo, access_cargo_bot, access_mailsorting, access_mineral_storeroom) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MAINT_TUNNELS, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_MAILSORTING, ACCESS_MINERAL_STOREROOM) outfit = /datum/outfit/job/cargo_tech /datum/outfit/job/cargo_tech @@ -164,16 +164,16 @@ /datum/job/mining title = "Shaft Miner" - flag = MINER - department_flag = SUPPORT + flag = JOB_MINER + department_flag = JOBCAT_SUPPORT total_positions = 6 spawn_positions = 8 is_supply = 1 supervisors = "the quartermaster" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mint, access_mining, access_mining_station, access_mineral_storeroom) - minimal_access = list(access_mining, access_mint, access_mining_station, access_mailsorting, access_maint_tunnels, access_mineral_storeroom) + access = list(ACCESS_MAINT_TUNNELS, ACCESS_MAILSORTING, ACCESS_CARGO, ACCESS_CARGO_BOT, ACCESS_QM, ACCESS_MINT, ACCESS_MINING, ACCESS_MINING_STATION, ACCESS_MINERAL_STOREROOM) + minimal_access = list(ACCESS_MINING, ACCESS_MINT, ACCESS_MINING_STATION, ACCESS_MAILSORTING, ACCESS_MAINT_TUNNELS, ACCESS_MINERAL_STOREROOM) alt_titles = list("Spelunker") outfit = /datum/outfit/job/mining @@ -234,16 +234,16 @@ /datum/job/clown title = "Clown" - flag = CLOWN - department_flag = SUPPORT + flag = JOB_CLOWN + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_clown, access_theatre, access_maint_tunnels) - minimal_access = list(access_clown, access_theatre, access_maint_tunnels) + access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_CLOWN, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS) outfit = /datum/outfit/job/clown /datum/outfit/job/clown @@ -318,16 +318,16 @@ /datum/job/mime title = "Mime" - flag = MIME - department_flag = SUPPORT + flag = JOB_MIME + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_mime, access_theatre, access_maint_tunnels) - minimal_access = list(access_mime, access_theatre, access_maint_tunnels) + access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MIME, ACCESS_THEATRE, ACCESS_MAINT_TUNNELS) outfit = /datum/outfit/job/mime /datum/outfit/job/mime @@ -370,16 +370,16 @@ /datum/job/janitor title = "Janitor" - flag = JANITOR - department_flag = SUPPORT + flag = JOB_JANITOR + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - 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) alt_titles = list("Custodial Technician") outfit = /datum/outfit/job/janitor @@ -396,16 +396,16 @@ //More or less assistants /datum/job/librarian title = "Librarian" - flag = LIBRARIAN - department_flag = SUPPORT + flag = JOB_LIBRARIAN + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_library, access_maint_tunnels) - minimal_access = list(access_library, access_maint_tunnels) + access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_LIBRARY, ACCESS_MAINT_TUNNELS) alt_titles = list("Journalist") outfit = /datum/outfit/job/librarian @@ -423,8 +423,8 @@ /datum/job/barber title = "Barber" - flag = BARBER - department_flag = KARMA + flag = JOB_BARBER + department_flag = JOBCAT_KARMA total_positions = 1 spawn_positions = 1 is_service = 1 @@ -432,8 +432,8 @@ department_head = list("Head of Personnel") selection_color = "#dddddd" alt_titles = list("Hair Stylist","Beautician") - access = list(access_maint_tunnels) - minimal_access = list(access_maint_tunnels) + access = list(ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MAINT_TUNNELS) outfit = /datum/outfit/job/barber /datum/outfit/job/barber diff --git a/code/game/jobs/job/support_chaplain.dm b/code/game/jobs/job/support_chaplain.dm index 02e55a325b2..b39eed344ae 100644 --- a/code/game/jobs/job/support_chaplain.dm +++ b/code/game/jobs/job/support_chaplain.dm @@ -1,16 +1,16 @@ //Due to how large this one is it gets its own file /datum/job/chaplain title = "Chaplain" - flag = CHAPLAIN - department_flag = SUPPORT + flag = JOB_CHAPLAIN + department_flag = JOBCAT_SUPPORT total_positions = 1 spawn_positions = 1 is_service = 1 supervisors = "the head of personnel" department_head = list("Head of Personnel") selection_color = "#dddddd" - access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) - minimal_access = list(access_morgue, access_chapel_office, access_crematorium, access_maint_tunnels) + access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS) + minimal_access = list(ACCESS_MORGUE, ACCESS_CHAPEL_OFFICE, ACCESS_CREMATORIUM, ACCESS_MAINT_TUNNELS) outfit = /datum/outfit/job/chaplain diff --git a/code/game/jobs/job/syndicate.dm b/code/game/jobs/job/syndicate.dm index b5757ffe37c..44a04ef7593 100644 --- a/code/game/jobs/job/syndicate.dm +++ b/code/game/jobs/job/syndicate.dm @@ -1,7 +1,7 @@ /datum/job/syndicateofficer title = "Syndicate Officer" - flag = SYNDICATE - department_flag = SYNDICATE + flag = JOB_SYNDICATE + department_flag = JOB_SYNDICATE // This gets its job as its own flag because admin jobs dont have flags total_positions = 5 spawn_positions = 5 supervisors = "the admins" diff --git a/code/game/jobs/jobs.dm b/code/game/jobs/jobs.dm index f45f8f5a22b..09bbf2cf633 100644 --- a/code/game/jobs/jobs.dm +++ b/code/game/jobs/jobs.dm @@ -1,62 +1,4 @@ -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/CENTCOM =(1<<10) -var/const/SYNDICATE =(1<<11) - -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/PARAMEDIC =(1<<9) -var/const/CORONER =(1<<10) - - -var/const/SUPPORT =(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/CLOWN =(1<<11) -var/const/MIME =(1<<12) -var/const/CIVILIAN =(1<<13) - - -var/const/KARMA =(1<<3) - -var/const/NANO =(1<<0) -var/const/BLUESHIELD =(1<<1) -var/const/BARBER =(1<<3) -var/const/MECHANIC =(1<<4) -var/const/BRIGDOC =(1<<5) -var/const/JUDGE =(1<<6) -var/const/PILOT =(1<<7) - var/list/assistant_occupations = list( ) diff --git a/code/game/machinery/ai_slipper.dm b/code/game/machinery/ai_slipper.dm index 12ad51c8b28..eb06f55cc7b 100644 --- a/code/game/machinery/ai_slipper.dm +++ b/code/game/machinery/ai_slipper.dm @@ -14,7 +14,7 @@ var/cooldown_time = 0 var/cooldown_timeleft = 0 var/cooldown_on = FALSE - req_access = list(access_ai_upload) + req_access = list(ACCESS_AI_UPLOAD) /obj/machinery/ai_slipper/power_change() if(stat & BROKEN) diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index d13406eee99..2f6106a95a0 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -79,7 +79,7 @@ idle_power_usage = 4 active_power_usage = 8 power_channel = ENVIRON - req_one_access = list(access_atmospherics, access_engine_equip) + req_one_access = list(ACCESS_ATMOSPHERICS, ACCESS_ENGINE_EQUIP) max_integrity = 250 integrity_failure = 80 armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30) @@ -128,7 +128,7 @@ /obj/machinery/alarm/syndicate //general syndicate access report_danger_level = FALSE remote_control = FALSE - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) req_one_access = list() /obj/machinery/alarm/monitor/server diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 83a12a6ff81..71ddcde9251 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -16,7 +16,7 @@ density = 1 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/mob/living/carbon/human/occupant var/heal_level //The clone is released once its health reaches this level. var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index e9cf036d3ca..c7482bc140d 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -4,7 +4,7 @@ icon_keyboard = "rd_key" icon_screen = "ai-fixer" circuit = /obj/item/circuitboard/aifixer - req_access = list(access_captain, access_robotics, access_heads) + req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS) var/mob/living/silicon/ai/occupant = null var/active = 0 diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 84ab146589e..7b07cda3bbb 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -7,7 +7,7 @@ density = 1 anchored = 1.0 circuit = /obj/item/circuitboard/atmoscontrol - req_access = list(access_atmospherics) + req_access = list(ACCESS_ATMOSPHERICS) var/list/monitored_alarm_ids = null var/datum/nano_module/atmos_control/atmos_control diff --git a/code/game/machinery/computer/brigcells.dm b/code/game/machinery/computer/brigcells.dm index d322e99ae4b..378c10d9783 100644 --- a/code/game/machinery/computer/brigcells.dm +++ b/code/game/machinery/computer/brigcells.dm @@ -8,7 +8,7 @@ active_power_usage = 500 circuit = /obj/item/circuitboard/brigcells light_color = LIGHT_COLOR_DARKRED - req_access = list(access_brig) + req_access = list(ACCESS_BRIG) /obj/machinery/computer/brigcells/attack_ai(mob/user) attack_hand(user) diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 9e8bc08f9b2..545b0f61139 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -244,7 +244,7 @@ name = "Circuit Board (RD Console)" desc = "Swipe a Scientist level ID or higher to reconfigure." build_path = /obj/machinery/computer/rdconsole/core - req_access = list(access_tox) // This is for adjusting the type of computer we're building - in case something messes up the pre-existing robotics or mechanics consoles + req_access = list(ACCESS_TOX) // This is for adjusting the type of computer we're building - in case something messes up the pre-existing robotics or mechanics consoles var/access_types = list("R&D Core", "Robotics", "E.X.P.E.R.I-MENTOR", "Mechanics", "Public") id = 1 /obj/item/circuitboard/rdconsole/robotics diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index 45f390082a1..805ce19aab5 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -18,27 +18,27 @@ ..() /obj/machinery/computer/security/proc/generate_network_access() - available_networks["SS13"] = list(access_hos,access_captain) - available_networks["Telecomms"] = list(access_hos,access_captain) - available_networks["Research Outpost"] = list(access_rd,access_hos,access_captain) - available_networks["Mining Outpost"] = list(access_qm,access_hop,access_hos,access_captain) - available_networks["Research"] = list(access_rd,access_hos,access_captain) - available_networks["Prison"] = list(access_hos,access_captain) - available_networks["Labor Camp"] = list(access_hos,access_captain) - available_networks["Interrogation"] = list(access_hos,access_captain) - available_networks["Atmosphere Alarms"] = list(access_ce,access_hos,access_captain) - available_networks["Fire Alarms"] = list(access_ce,access_hos,access_captain) - available_networks["Power Alarms"] = list(access_ce,access_hos,access_captain) - available_networks["Supermatter"] = list(access_ce,access_hos,access_captain) - available_networks["MiniSat"] = list(access_rd,access_hos,access_captain) - available_networks["Singularity"] = list(access_ce,access_hos,access_captain) - available_networks["Anomaly Isolation"] = list(access_rd,access_hos,access_captain) - available_networks["Toxins"] = list(access_rd,access_hos,access_captain) - available_networks["Telepad"] = list(access_rd,access_hos,access_captain) - available_networks["TestChamber"] = list(access_rd,access_hos,access_captain) - available_networks["ERT"] = list(access_cent_specops_commander,access_cent_commander) - available_networks["CentComm"] = list(access_cent_security,access_cent_commander) - available_networks["Thunderdome"] = list(access_cent_thunder,access_cent_commander) + available_networks["SS13"] = list(ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Telecomms"] = list(ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Research Outpost"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Mining Outpost"] = list(ACCESS_QM,ACCESS_HOP,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Research"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Prison"] = list(ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Labor Camp"] = list(ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Interrogation"] = list(ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Atmosphere Alarms"] = list(ACCESS_CE,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Fire Alarms"] = list(ACCESS_CE,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Power Alarms"] = list(ACCESS_CE,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Supermatter"] = list(ACCESS_CE,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["MiniSat"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Singularity"] = list(ACCESS_CE,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Anomaly Isolation"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Toxins"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["Telepad"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["TestChamber"] = list(ACCESS_RD,ACCESS_HOS,ACCESS_CAPTAIN) + available_networks["ERT"] = list(ACCESS_CENT_SPECOPS_COMMANDER,ACCESS_CENT_COMMANDER) + available_networks["CentComm"] = list(ACCESS_CENT_SECURITY,ACCESS_CENT_COMMANDER) + available_networks["Thunderdome"] = list(ACCESS_CENT_THUNDER,ACCESS_CENT_COMMANDER) /obj/machinery/computer/security/Destroy() if(watchers.len) diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 86515e5ddea..7ffc141dcb4 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -7,7 +7,7 @@ var/time_last_changed_position = 0 desc = "Terminal for programming Nanotrasen employee ID cards to access parts of the station." icon_keyboard = "id_key" icon_screen = "id" - req_access = list(access_change_ids) + req_access = list(ACCESS_CHANGE_IDS) circuit = /obj/item/circuitboard/card light_color = LIGHT_COLOR_LIGHTBLUE var/obj/item/card/id/scan = null @@ -133,7 +133,7 @@ var/time_last_changed_position = 0 if(!istype(id_card)) return ..() - if(!scan && access_change_ids in id_card.access) + if(!scan && ACCESS_CHANGE_IDS in id_card.access) user.drop_item() id_card.loc = src scan = id_card @@ -200,7 +200,7 @@ var/time_last_changed_position = 0 return 1 if(!scan.assignment) return 0 - if(access_captain in scan.access) + if(ACCESS_CAPTAIN in scan.access) return 1 if(!targetjob || !targetjob.title) return 0 @@ -598,7 +598,7 @@ var/time_last_changed_position = 0 /obj/machinery/computer/card/centcom name = "\improper CentComm identification computer" circuit = /obj/item/circuitboard/card/centcom - req_access = list(access_cent_commander) + req_access = list(ACCESS_CENT_COMMANDER) change_position_cooldown = -1 blacklisted_full = list() blacklisted_partial = list() @@ -615,14 +615,14 @@ var/time_last_changed_position = 0 target_dept = TARGET_DEPT_SEC icon_screen = "idhos" light_color = LIGHT_COLOR_RED - req_access = list(access_hos) + req_access = list(ACCESS_HOS) circuit = /obj/item/circuitboard/card/minor/hos /obj/machinery/computer/card/minor/cmo name = "medical management console" target_dept = TARGET_DEPT_MED icon_screen = "idcmo" - req_access = list(access_cmo) + req_access = list(ACCESS_CMO) circuit = /obj/item/circuitboard/card/minor/cmo /obj/machinery/computer/card/minor/rd @@ -630,7 +630,7 @@ var/time_last_changed_position = 0 target_dept = TARGET_DEPT_SCI icon_screen = "idrd" light_color = LIGHT_COLOR_PINK - req_access = list(access_rd) + req_access = list(ACCESS_RD) circuit = /obj/item/circuitboard/card/minor/rd /obj/machinery/computer/card/minor/ce @@ -638,5 +638,5 @@ var/time_last_changed_position = 0 target_dept = TARGET_DEPT_ENG icon_screen = "idce" light_color = COLOR_YELLOW - req_access = list(access_ce) + req_access = list(ACCESS_CE) circuit = /obj/item/circuitboard/card/minor/ce \ No newline at end of file diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 539d4dfc0ed..c06cbb32a04 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -4,7 +4,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 = list() //Linked cloning pods. var/temp = "" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index be27b0600cf..0a9627fa38b 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -13,7 +13,7 @@ desc = "This can be used for various important functions. Still under developement." icon_keyboard = "tech_key" icon_screen = "comm" - req_access = list(access_heads) + req_access = list(ACCESS_HEADS) circuit = /obj/item/circuitboard/communications var/prints_intercept = 1 var/authenticated = COMM_AUTHENTICATION_NONE @@ -87,7 +87,7 @@ if(allowed(usr)) authenticated = COMM_AUTHENTICATION_MIN - if(access_captain in access) + if(ACCESS_CAPTAIN in access) authenticated = COMM_AUTHENTICATION_MAX var/mob/living/carbon/human/H = usr var/obj/item/card/id = H.get_idcard(TRUE) @@ -132,7 +132,7 @@ var/obj/item/pda/pda = I I = pda.id if(I && istype(I)) - if(access_captain in I.access) + if(ACCESS_CAPTAIN in I.access) change_security_level(text2num(href_list["level"])) else to_chat(usr, "You are not authorized to do this.") diff --git a/code/game/machinery/computer/depot.dm b/code/game/machinery/computer/depot.dm index 02be740b7d3..382e1325f9d 100644 --- a/code/game/machinery/computer/depot.dm +++ b/code/game/machinery/computer/depot.dm @@ -12,7 +12,7 @@ icon_keyboard = "syndie_key" icon_screen = "tcboss" light_color = LIGHT_COLOR_PURE_CYAN - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) var/security_lockout = FALSE var/sound_yes = 'sound/machines/twobeep.ogg' var/sound_no = 'sound/machines/buzz-sigh.ogg' @@ -186,7 +186,7 @@ /obj/machinery/computer/syndicate_depot/shieldcontrol name = "shield control computer" icon_screen = "accelerator" - req_access = list(access_syndicate_leader) + req_access = list(ACCESS_SYNDICATE_LEADER) alerts_when_broken = TRUE var/area/syndicate_depot/perimeter/perimeterarea diff --git a/code/game/machinery/computer/honkputer.dm b/code/game/machinery/computer/honkputer.dm index 842a65b5f50..94787d61020 100644 --- a/code/game/machinery/computer/honkputer.dm +++ b/code/game/machinery/computer/honkputer.dm @@ -6,7 +6,7 @@ icon_keyboard = "key_honk" icon_screen = "honkcomms" light_color = LIGHT_COLOR_PINK - req_access = list(access_clown) + req_access = list(ACCESS_CLOWN) circuit = /obj/item/circuitboard/HONKputer var/authenticated = 0 var/message_cooldown = 0 diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index 3a71ab6c6c8..5defd5e8a69 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -10,7 +10,7 @@ desc = "This can be used to check medical records." icon_keyboard = "med_key" icon_screen = "medcomp" - req_one_access = list(access_medical, access_forensics_lockers) + req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) circuit = /obj/item/circuitboard/med_data var/obj/item/card/id/scan = null var/authenticated = null diff --git a/code/game/machinery/computer/pod.dm b/code/game/machinery/computer/pod.dm index fdb9f934516..6ea095028a2 100644 --- a/code/game/machinery/computer/pod.dm +++ b/code/game/machinery/computer/pod.dm @@ -268,7 +268,7 @@ /obj/machinery/computer/pod/old/syndicate name = "external airlock controls" desc = "The Syndicate operate on a tight budget. Operates external airlocks." - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) circuit = /obj/item/circuitboard/syndicatedoor light_color = "#00FFFF" diff --git a/code/game/machinery/computer/pod_tracking_console.dm b/code/game/machinery/computer/pod_tracking_console.dm index ae6e7a4f36a..cd6450c700c 100644 --- a/code/game/machinery/computer/pod_tracking_console.dm +++ b/code/game/machinery/computer/pod_tracking_console.dm @@ -4,7 +4,7 @@ icon_keyboard = "tech_key" icon_screen = "rdcomp" light_color = LIGHT_COLOR_PURPLE - req_access = list(access_robotics) + req_access = list(ACCESS_ROBOTICS) circuit = /obj/item/circuitboard/pod_locater /obj/machinery/computer/podtracker/attack_ai(var/mob/user as mob) diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index bcabdeb511e..42903d48ecd 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -3,7 +3,7 @@ icon = 'icons/obj/computer.dmi' icon_keyboard = "security_key" icon_screen = "explosive" - req_access = list(access_armory) + req_access = list(ACCESS_ARMORY) circuit = /obj/item/circuitboard/prisoner var/id = 0.0 var/temp = null diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 8def58c370b..fb4683ba3a9 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -4,7 +4,7 @@ icon = 'icons/obj/computer.dmi' icon_keyboard = "tech_key" icon_screen = "robot" - req_access = list(access_robotics) + req_access = list(ACCESS_ROBOTICS) circuit = /obj/item/circuitboard/robotics var/temp = null diff --git a/code/game/machinery/computer/salvage_ship.dm b/code/game/machinery/computer/salvage_ship.dm index ba7e7200c49..df22a3cad14 100644 --- a/code/game/machinery/computer/salvage_ship.dm +++ b/code/game/machinery/computer/salvage_ship.dm @@ -6,7 +6,7 @@ icon = 'icons/obj/computer.dmi' icon_keyboard = "syndie_key" icon_screen = "syndishuttle" - req_access = list(access_salvage_captain) + req_access = list(ACCESS_SALVAGE_CAPTAIN) var/area/curr_location var/moving = 0 var/lastMove = 0 diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index ce872e598f4..90ac427743d 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -7,7 +7,7 @@ desc = "Used to view and edit personnel's security records." icon_keyboard = "security_key" icon_screen = "security" - req_one_access = list(access_security, access_forensics_lockers) + req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) circuit = /obj/item/circuitboard/secure_data var/obj/item/card/id/scan = null var/authenticated = null diff --git a/code/game/machinery/computer/skills.dm b/code/game/machinery/computer/skills.dm index 125b5294860..e3c2918f335 100644 --- a/code/game/machinery/computer/skills.dm +++ b/code/game/machinery/computer/skills.dm @@ -10,7 +10,7 @@ icon_screen = "medlaptop" density = 0 light_color = LIGHT_COLOR_GREEN - req_one_access = list(access_heads) + req_one_access = list(ACCESS_HEADS) circuit = /obj/item/circuitboard/skills var/obj/item/card/id/scan = null var/authenticated = null diff --git a/code/game/machinery/computer/specops_shuttle.dm b/code/game/machinery/computer/specops_shuttle.dm index 0602757944f..711aec59db5 100644 --- a/code/game/machinery/computer/specops_shuttle.dm +++ b/code/game/machinery/computer/specops_shuttle.dm @@ -17,7 +17,7 @@ var/specops_shuttle_timeleft = 0 icon_keyboard = "security_key" icon_screen = "syndishuttle" light_color = LIGHT_COLOR_PURE_CYAN - req_access = list(access_cent_specops) + req_access = list(ACCESS_CENT_SPECOPS) // req_access = list(ACCESS_CENT_SPECOPS) var/temp = null var/hacked = 0 diff --git a/code/game/machinery/computer/syndicate_specops_shuttle.dm b/code/game/machinery/computer/syndicate_specops_shuttle.dm index 92ed453e71e..71bfe9f43ab 100644 --- a/code/game/machinery/computer/syndicate_specops_shuttle.dm +++ b/code/game/machinery/computer/syndicate_specops_shuttle.dm @@ -16,7 +16,7 @@ var/syndicate_elite_shuttle_timeleft = 0 icon_keyboard = "syndie_key" icon_screen = "syndishuttle" light_color = LIGHT_COLOR_PURE_CYAN - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) var/temp = null var/hacked = 0 var/allowedtocall = 0 diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 3df7cc8c6ec..bec6e329ad8 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -403,7 +403,7 @@ var/proportion = 10 * min(1/beaker.volume, 1) // Yes, this means you can get more bang for your buck with a beaker of SF vs a patch // But it also means a giant beaker of SF won't heal people ridiculously fast 4 cheap - beaker.reagents.reaction(occupant, TOUCH, proportion) + beaker.reagents.reaction(occupant, REAGENT_TOUCH, proportion) beaker.reagents.trans_to(occupant, 1, 10) next_trans++ if(next_trans == 17) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index abf6dc725b3..6c7b3b9c5a6 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -17,7 +17,7 @@ circuit = /obj/item/circuitboard/cryopodcontrol density = 0 interact_offline = 1 - req_one_access = list(access_heads, access_armory) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. + req_one_access = list(ACCESS_HEADS, ACCESS_ARMORY) //Heads of staff or the warden can go here to claim recover items from their department that people went were cryodormed with. resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF flags = NODECONSTRUCT var/mode = null diff --git a/code/game/machinery/defib_mount.dm b/code/game/machinery/defib_mount.dm index 267ea5da392..5e173952a8e 100644 --- a/code/game/machinery/defib_mount.dm +++ b/code/game/machinery/defib_mount.dm @@ -11,7 +11,7 @@ anchored = TRUE idle_power_usage = 1 power_channel = EQUIP - req_one_access = list(access_medical, access_heads) //used to control clamps + req_one_access = list(ACCESS_MEDICAL, ACCESS_HEADS) //used to control clamps var/obj/item/defibrillator/defib //this mount's defibrillator var/clamps_locked = FALSE //if true, and a defib is loaded, it can't be removed without unlocking the clamps diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 01d90795a87..4b36c13b034 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -5,7 +5,7 @@ w_class = WEIGHT_CLASS_SMALL materials = list(MAT_METAL=50, MAT_GLASS=50) origin_tech = "engineering=2;programming=1" - req_access = list(access_engine) + req_access = list(ACCESS_ENGINE) toolspeed = 1 usesound = 'sound/items/deconstruct.ogg' var/list/conf_access = null diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index b53a0139fb2..59d99f501c0 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -180,7 +180,7 @@ PlasmaBurn(exposed_temperature) /obj/machinery/door/airlock/plasma/proc/PlasmaBurn(temperature) - atmos_spawn_air(SPAWN_HEAT | SPAWN_TOXINS, 500) + atmos_spawn_air(LINDA_SPAWN_HEAT | LINDA_SPAWN_TOXINS, 500) var/obj/structure/door_assembly/DA DA = new /obj/structure/door_assembly(loc) if(glass) diff --git a/code/game/machinery/doors/brigdoors.dm b/code/game/machinery/doors/brigdoors.dm index 8bd7af5dad4..9b1481fe739 100644 --- a/code/game/machinery/doors/brigdoors.dm +++ b/code/game/machinery/doors/brigdoors.dm @@ -16,7 +16,7 @@ icon = 'icons/obj/status_display.dmi' icon_state = "frame" desc = "A remote control for a door." - req_access = list(access_brig) + req_access = list(ACCESS_BRIG) anchored = 1 // can't pick it up density = 0 // can walk through it. var/id = null // id of door it controls. diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index d562c6b78ea..51bc7fdc457 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -4,9 +4,6 @@ #define CONSTRUCTION_GUTTED 3 //Wires are removed, circuit ready to remove #define CONSTRUCTION_NOCIRCUIT 4 //Circuit board removed, can safely weld apart -/var/const/FD_OPEN = 1 -/var/const/FD_CLOSED = 2 - /obj/machinery/door/firedoor name = "firelock" desc = "Apply crowbar." diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index fe104ff794c..1bf5a31d336 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -324,7 +324,7 @@ /obj/machinery/door/window/brigdoor/security/cell name = "cell door" desc = "For keeping in criminal scum." - req_access = list(access_brig) + req_access = list(ACCESS_BRIG) /obj/machinery/door/window/clockwork name = "brass windoor" diff --git a/code/game/machinery/guestpass.dm b/code/game/machinery/guestpass.dm index 35d5a6546d4..2c37a3274c7 100644 --- a/code/game/machinery/guestpass.dm +++ b/code/game/machinery/guestpass.dm @@ -193,5 +193,5 @@ /obj/machinery/computer/guestpass/hop/get_changeable_accesses() . = ..() - if(. && access_change_ids in .) + if(. && ACCESS_CHANGE_IDS in .) return get_all_accesses() diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 10708ff9c0e..d1df960716c 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -31,7 +31,7 @@ Possible to do for anyone motivated enough: #define RANGE_BASED 0 #define AREA_BASED 1 -var/const/HOLOPAD_MODE = RANGE_BASED +#define HOLOPAD_MODE RANGE_BASED var/list/holopads = list() diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index c93c4e099b2..d5fa5277592 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -18,7 +18,7 @@ var/list/codes // assoc. list of transponder codes var/codes_txt = "" // codes as set on map: "tag1;tag2" or "tag1=value;tag2=value" - req_access = list(access_engine, access_robotics) + req_access = list(ACCESS_ENGINE, ACCESS_ROBOTICS) /obj/machinery/navbeacon/New() ..() diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index b4241b5f19d..7443c1d53c7 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -118,7 +118,7 @@ src.flipped = 1 var/obj/machinery/atmospherics/binary/circulator/circP = make_from - if(istype(circP) && circP.side == circP.CIRC_RIGHT) + if(istype(circP) && circP.side == CIRC_RIGHT) src.flipped = 1 else @@ -157,7 +157,7 @@ if(istype(triP) && triP.flipped) icon_state = "m_[icon_state]" var/obj/machinery/atmospherics/binary/circulator/circP = make_from - if(istype(circP) && circP.side == circP.CIRC_RIGHT) + if(istype(circP) && circP.side == CIRC_RIGHT) icon_state = "m_[icon_state]" if(istype(make_from, /obj/machinery/atmospherics/pipe/simple/heat_exchanging)) resistance_flags |= FIRE_PROOF | LAVA_PROOF @@ -435,7 +435,7 @@ if(PIPE_CIRCULATOR) //circulator var/obj/machinery/atmospherics/binary/circulator/C = new(src.loc) if(flipped) - C.side = C.CIRC_RIGHT + C.side = CIRC_RIGHT if(pipename) C.name = pipename C.on_construction(C.dir, C.initialize_directions, color) diff --git a/code/game/machinery/portable_tag_turret.dm b/code/game/machinery/portable_tag_turret.dm index a077def9136..0bd368bd75b 100644 --- a/code/game/machinery/portable_tag_turret.dm +++ b/code/game/machinery/portable_tag_turret.dm @@ -22,7 +22,7 @@ if(/obj/item/gun/energy/laser/tag/blue) eprojectile = /obj/item/gun/energy/laser/tag/blue lasercolor = "b" - req_access = list(access_maint_tunnels, access_theatre) + req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) check_arrest = 0 check_records = 0 check_weapons = 1 @@ -33,7 +33,7 @@ if(/obj/item/gun/energy/laser/tag/red) eprojectile = /obj/item/gun/energy/laser/tag/red lasercolor = "r" - req_access = list(access_maint_tunnels, access_theatre) + req_access = list(ACCESS_MAINT_TUNNELS, ACCESS_THEATRE) check_arrest = 0 check_records = 0 check_weapons = 1 diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 68c029f2111..d08afb91a3d 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -79,7 +79,7 @@ health = 200 enabled = 1 lethal = 1 - req_access = list(access_cent_commander) + req_access = list(ACCESS_CENT_COMMANDER) installation = /obj/item/gun/energy/pulse/turret /obj/machinery/porta_turret/stationary @@ -91,7 +91,7 @@ ..() if(req_access && req_access.len) req_access.Cut() - req_one_access = list(access_security, access_heads) + req_one_access = list(ACCESS_SECURITY, ACCESS_HEADS) one_access = 1 //Sets up a spark system @@ -109,7 +109,7 @@ ..() if(req_one_access && req_one_access.len) req_one_access.Cut() - req_access = list(access_cent_specops) + req_access = list(ACCESS_CENT_SPECOPS) one_access = 0 /obj/machinery/porta_turret/proc/setup() @@ -1034,7 +1034,7 @@ var/list/turret_icons ..() if(req_one_access && req_one_access.len) req_one_access.Cut() - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) one_access = 0 /obj/machinery/porta_turret/syndicate/update_icon() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index eecdc0e4f4a..02479fbb7aa 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -1,4 +1,4 @@ -var/const/SAFETY_COOLDOWN = 100 +#define SAFETY_COOLDOWN 100 /obj/machinery/recycler name = "recycler" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 2cc86ee1b3a..d1a41335d62 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -302,7 +302,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() updateUsrDialog() if(screen == RCS_ANNOUNCE) var/obj/item/card/id/ID = I - if(access_RC_announce in ID.GetAccess()) + if(ACCESS_RC_ANNOUNCE in ID.GetAccess()) announceAuth = 1 announcement.announcer = ID.assignment ? "[ID.assignment] [ID.registered_name]" : ID.registered_name else diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 3cb06daab94..60946c3a2fe 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -133,7 +133,7 @@ opacity = FALSE anchored = 0 pressure_resistance = 2*ONE_ATMOSPHERE - req_access = list(access_engine) + req_access = list(ACCESS_ENGINE) var/const/max_health = 100 var/health = max_health var/active = 0 @@ -309,7 +309,7 @@ icon_state = "Shield_Gen" anchored = 0 density = 1 - req_access = list(access_teleporter) + req_access = list(ACCESS_TELEPORTER) var/active = 0 var/power = 0 var/state = 0 diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 3437bafeb3b..2a99037a51e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -25,7 +25,7 @@ var/broken = FALSE var/secure = FALSE //set to true to enable ID locking var/shocked = FALSE//is it shocking anyone that touches it? - req_access = list(access_eva) //the ID needed if ID lock is enabled + req_access = list(ACCESS_EVA) //the ID needed if ID lock is enabled var/datum/wires/suitstorage/wires var/uv = FALSE @@ -55,7 +55,7 @@ helmet_type = /obj/item/clothing/head/helmet/space/capspace mask_type = /obj/item/clothing/mask/gas storage_type = /obj/item/tank/jetpack/oxygen/captain - req_access = list(access_captain) + req_access = list(ACCESS_CAPTAIN) /obj/machinery/suit_storage_unit/captain/secure secure = TRUE @@ -65,7 +65,7 @@ suit_type = /obj/item/clothing/suit/space/hardsuit/engine mask_type = /obj/item/clothing/mask/breath magboots_type = /obj/item/clothing/shoes/magboots - req_access = list(access_engine_equip) + req_access = list(ACCESS_ENGINE_EQUIP) /obj/machinery/suit_storage_unit/engine/secure secure = TRUE @@ -75,7 +75,7 @@ suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite mask_type = /obj/item/clothing/mask/gas magboots_type = /obj/item/clothing/shoes/magboots/advance - req_access = list(access_ce) + req_access = list(ACCESS_CE) /obj/machinery/suit_storage_unit/ce/secure secure = TRUE @@ -84,20 +84,20 @@ name = "security suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/security mask_type = /obj/item/clothing/mask/gas/sechailer - req_access = list(access_security) + req_access = list(ACCESS_SECURITY) /obj/machinery/suit_storage_unit/security/secure secure = TRUE /obj/machinery/suit_storage_unit/security/pod_pilot - req_access = list(access_pilot) + req_access = list(ACCESS_PILOT) /obj/machinery/suit_storage_unit/atmos name = "atmospherics suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos mask_type = /obj/item/clothing/mask/gas magboots_type = /obj/item/clothing/shoes/magboots - req_access = list(access_atmospherics) + req_access = list(ACCESS_ATMOSPHERICS) /obj/machinery/suit_storage_unit/atmos/secure secure = TRUE @@ -106,7 +106,7 @@ name = "mining suit storage unit" suit_type = /obj/item/clothing/suit/space/hardsuit/mining mask_type = /obj/item/clothing/mask/breath - req_access = list(access_mining_station) + req_access = list(ACCESS_MINING_STATION) /obj/machinery/suit_storage_unit/mining/secure secure = TRUE @@ -115,12 +115,12 @@ name = "mining suit storage unit" suit_type = /obj/item/clothing/suit/hooded/explorer mask_type = /obj/item/clothing/mask/gas/explorer - req_access = list(access_mining_station) + req_access = list(ACCESS_MINING_STATION) /obj/machinery/suit_storage_unit/cmo suit_type = /obj/item/clothing/suit/space/hardsuit/medical mask_type = /obj/item/clothing/mask/breath - req_access = list(access_cmo) + req_access = list(ACCESS_CMO) /obj/machinery/suit_storage_unit/cmo/secure secure = TRUE @@ -134,7 +134,7 @@ name = "clown suit storage unit" suit_type = /obj/item/clothing/suit/space/eva/clown helmet_type = /obj/item/clothing/head/helmet/space/eva/clown - req_access = list(access_clown) + req_access = list(ACCESS_CLOWN) /obj/machinery/suit_storage_unit/clown/secure secure = TRUE @@ -143,7 +143,7 @@ name = "mime suit storage unit" suit_type = /obj/item/clothing/suit/space/eva/mime helmet_type = /obj/item/clothing/head/helmet/space/eva/mime - req_access = list(access_mime) + req_access = list(ACCESS_MIME) /obj/machinery/suit_storage_unit/mime/secure secure = TRUE @@ -153,14 +153,14 @@ suit_type = /obj/item/clothing/suit/space/hardsuit/syndi mask_type = /obj/item/clothing/mask/gas/syndicate storage_type = /obj/item/tank/jetpack/oxygen/harness - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) safeties = FALSE //in a syndicate base, everything can be used as a murder weapon at a moment's notice. /obj/machinery/suit_storage_unit/syndicate/secure secure = TRUE /obj/machinery/suit_storage_unit/ert - req_access = list(access_cent_general) + req_access = list(ACCESS_CENT_GENERAL) /obj/machinery/suit_storage_unit/ert/command suit_type = /obj/item/clothing/suit/space/hardsuit/ert/commander @@ -198,7 +198,7 @@ /obj/machinery/suit_storage_unit/telecoms mask_type = /obj/item/clothing/mask/breath storage_type = /obj/item/tank/jetpack/void - req_access = list(access_tcomsat) + req_access = list(ACCESS_TCOMSAT) /obj/machinery/suit_storage_unit/telecoms/secure secure = TRUE diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 28a35680cdb..6d599ae9113 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -284,7 +284,7 @@ /obj/machinery/syndicatebomb/self_destruct name = "self destruct device" desc = "Do not taunt. Warranty invalid if exposed to high temperature. Not suitable for agents under 3 years of age." - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) payload = /obj/item/bombcore/large can_unanchor = FALSE var/explosive_wall_group = EXPLOSIVE_WALL_GROUP_SYNDICATE_BASE // If set, this bomb will also cause explosive walls in the same group to explode diff --git a/code/game/machinery/telecomms/logbrowser.dm b/code/game/machinery/telecomms/logbrowser.dm index ec5d63804f6..f0b5a945f92 100644 --- a/code/game/machinery/telecomms/logbrowser.dm +++ b/code/game/machinery/telecomms/logbrowser.dm @@ -16,7 +16,7 @@ var/universal_translate = 0 // set to 1 if it can translate nonhuman speech - req_access = list(access_tcomsat) + req_access = list(ACCESS_TCOMSAT) circuit = /obj/item/circuitboard/comm_server attack_hand(mob/user as mob) diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm index 1fe1490442a..6f12158452b 100644 --- a/code/game/machinery/telecomms/traffic_control.dm +++ b/code/game/machinery/telecomms/traffic_control.dm @@ -3,7 +3,7 @@ light_color = LIGHT_COLOR_DARKGREEN - req_access = list(access_tcomsat) + req_access = list(ACCESS_TCOMSAT) circuit = /obj/item/circuitboard/comm_traffic // NTTC diff --git a/code/game/machinery/turret_control.dm b/code/game/machinery/turret_control.dm index 7336704555c..2876188baa2 100644 --- a/code/game/machinery/turret_control.dm +++ b/code/game/machinery/turret_control.dm @@ -30,7 +30,7 @@ var/syndicate = 0 var/faction = "" // Turret controls can only access turrets that are in the same faction - req_access = list(access_ai_upload) + req_access = list(ACCESS_AI_UPLOAD) /obj/machinery/turretid/stun enabled = 1 @@ -57,7 +57,7 @@ syndicate = 1 faction = "syndicate" - req_access = list(access_syndicate_leader) + req_access = list(ACCESS_SYNDICATE_LEADER) /obj/machinery/turretid/Destroy() if(control_area) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 03b325dd649..2e3d0667765 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -860,7 +860,7 @@ refill_canister = /obj/item/vending_refill/boozeomat /obj/machinery/vending/boozeomat/syndicate_access - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) /obj/machinery/vending/boozeomat/Initialize(mapload) component_parts = list() @@ -1168,7 +1168,7 @@ /obj/machinery/vending/medical/syndicate_access name = "\improper SyndiMed Plus" - req_access = list(access_syndicate) + req_access = list(ACCESS_SYNDICATE) /obj/machinery/vending/medical/Initialize(mapload) component_parts = list() diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index a82cc58e028..82013e65d03 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -43,7 +43,7 @@ armor = list(melee = 40, bullet = 40, laser = 50, energy = 35, bomb = 20, bio = 0, rad =20, fire = 100, acid = 100) max_temperature = 35000 leg_overload_coeff = 100 - operation_req_access = list(access_syndicate) + operation_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/gygax/dark max_equip = 4 maxsize = 2 diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 35df97e3bea..b546efc9168 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -10,7 +10,7 @@ armor = list("melee" = -20, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) max_temperature = 25000 infra_luminosity = 5 - operation_req_access = list(access_clown) + operation_req_access = list(ACCESS_CLOWN) wreckage = /obj/structure/mecha_wreckage/honker add_req_access = 0 max_equip = 3 @@ -64,8 +64,8 @@ .hidden {display: none;} @@ -462,7 +462,7 @@ "Pod_Parts", "Pod_Frame", "Misc") - req_access = list(access_mechanic) + req_access = list(ACCESS_MECHANIC) /obj/machinery/mecha_part_fabricator/spacepod/New() ..() diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 85f511395f1..f0ea426fc1c 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -51,7 +51,7 @@ var/internal_damage = 0 //contains bitflags var/list/operation_req_access = list()//required access level for mecha operation - var/list/internals_req_access = list(access_engine,access_robotics)//required access level to open cell compartment + var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)//required access level to open cell compartment var/wreckage diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 99e6ca72367..35440de6cf9 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -4,7 +4,7 @@ icon_keyboard = "rd_key" icon_screen = "mecha" light_color = LIGHT_COLOR_FADEDPURPLE - req_access = list(access_robotics) + req_access = list(ACCESS_ROBOTICS) circuit = /obj/item/circuitboard/mecha_control var/list/located = list() var/screen = 0 diff --git a/code/game/mecha/mecha_topic.dm b/code/game/mecha/mecha_topic.dm index 9598d328d7a..fc8f38a971c 100644 --- a/code/game/mecha/mecha_topic.dm +++ b/code/game/mecha/mecha_topic.dm @@ -18,8 +18,8 @@ .hidden {display: none;}