From 2429ceadb54d57f503bd919102a05173b41bf85f Mon Sep 17 00:00:00 2001
From: forwardslashN <150570209+FslashN@users.noreply.github.com>
Date: Fri, 29 Mar 2024 02:31:38 -0500
Subject: [PATCH] Polish, Additional Fixes, Faction Refactor
Lots of changes to access, factions, and so forth. Makes it possible to use the ID changer machine regardless of mode, and it is no longer hard coded to marine access. Factions are far more robust and can be used for determine subfactions. That functionality is only surface level at the moment but can be developed more.
Additional fixes for RoleAuthority and squads, as well as map fixes and code fixes for the map. CM Specialist vendor works as desired now. Also makes sure that synths and yautja can be customized by players.
Outside of vehicle changes, the map and associated code is almost entirely feature complete and polished.
---
code/__DEFINES/__game.dm | 8 +-
code/__DEFINES/access.dm | 20 +
code/__DEFINES/job.dm | 52 +-
code/__DEFINES/layers.dm | 5 +-
code/__DEFINES/mode.dm | 9 +-
code/__DEFINES/vendors.dm | 2 +
code/controllers/subsystem/minimap.dm | 21 +-
code/datums/factions/clf.dm | 5 +
code/datums/factions/contractor.dm | 2 +
code/datums/factions/faction.dm | 40 +-
code/datums/factions/pmc.dm | 23 +-
code/datums/factions/royalmarinescommando.dm | 7 +-
code/datums/factions/upp.dm | 6 +
code/datums/factions/uscm.dm | 16 +
code/datums/skills/uscm.dm | 2 +-
code/game/area/WhiskeyOutpost.dm | 4 +
code/game/jobs/access.dm | 290 +++-
code/game/jobs/job/job.dm | 2 +-
code/game/jobs/job/marine/squad/leader.dm | 2 +-
code/game/jobs/job/marine/squads.dm | 24 +-
code/game/jobs/role_authority.dm | 8 +-
code/game/machinery/camera/presets.dm | 3 +
.../game/machinery/computer/camera_console.dm | 15 +
code/game/machinery/vending/cm_vending.dm | 30 +-
.../squad_prep/squad_specialist.dm | 31 +-
.../objects/items/devices/radio/headset.dm | 4 +-
code/game/objects/structures/blocker.dm | 9 +-
.../crates_lockers/closets/job_closets.dm | 5 +-
.../closets/secure/marine_personal.dm | 2 +-
.../extra_buttons/map_manipulation_menu.dm | 194 ++-
.../tacmap_panel/tacmap_admin_panel_tgui.dm | 21 +-
code/modules/client/preferences.dm | 90 +-
code/modules/cm_marines/equipment/maps.dm | 72 +-
code/modules/cm_marines/marines_consoles.dm | 224 ++-
code/modules/cm_marines/overwatch.dm | 4 +-
code/modules/gear_presets/synths.dm | 4 +-
code/modules/gear_presets/uscm.dm | 6 +-
code/modules/projectiles/projectile.dm | 3 +
icons/turf/area_whiskey.dmi | Bin 10801 -> 10933 bytes
maps/blackstone_bridge.json | 3 +-
.../Blackstone_Bridge/Blackstone_Bridge.dmm | 1239 +++++++++++------
.../main_story/hidden_bunker/upp_gulag.dmm | 27 +-
.../main_story/hidden_bunker/wy_lab.dmm | 5 +-
.../tgui/interfaces/common/AccessList.js | 4 +-
tgui/packages/tgui/styles/colors.scss | 4 +-
tgui/public/tgui-panel.bundle.css | 4 +-
46 files changed, 1630 insertions(+), 921 deletions(-)
diff --git a/code/__DEFINES/__game.dm b/code/__DEFINES/__game.dm
index 9db3753ba4..87b56eecea 100644
--- a/code/__DEFINES/__game.dm
+++ b/code/__DEFINES/__game.dm
@@ -32,6 +32,12 @@ block( \
#define MAP_FAKE_Z_BLACKSTONE_BASEMENT 8
#define MAP_FAKE_Z_BLACKSTONE_BUNKER 9
+/*
+It took me a minute to realize that all sanity needed is for the map object reference to return something.
+If it does not, that means there is no reference map to begin with and we don't need to continue checking.
+*/
+#define PATH_TO_GROUND_MAP_OBJ GLOB.map_type_list[SSmapping.configs[GROUND_MAP].map_name]
+
#define MAP_ICE_COLONY "Ice Colony" // Highpop only
#define MAP_LV_624 "LV-624"
#define MAP_LV_624_REPAIRED "LV-624 Repaired"
@@ -39,7 +45,7 @@ block( \
#define MAP_PRISON_STATION "Fiorina Cellblocks"
#define MAP_PRISON_STATION_V3 "Fiorina Science Annex"
#define MAP_WHISKEY_OUTPOST "Whiskey Outpost" // Unused
-#define MAP_BLACKSTONE_BRIDGE "Blackstone Bridge"
+#define MAP_BLACKSTONE_BRIDGE "Blackstone Bridge" //Whiskey Outpost re-imagined.
#define MAP_DESERT_DAM "Trijent Dam" // Highpop only
#define MAP_SOROKYNE_STRATA "Sorokyne Strata"
#define MAP_CORSAT "CORSAT" // Highpop only
diff --git a/code/__DEFINES/access.dm b/code/__DEFINES/access.dm
index 1cb840161b..6e42b8df67 100644
--- a/code/__DEFINES/access.dm
+++ b/code/__DEFINES/access.dm
@@ -206,6 +206,16 @@ Blackstone Bridge.
#define ACCESS_LIST_MARINE_MAIN "Almayer (Main)"
///All USCM Access levels used on the USS Almayer
#define ACCESS_LIST_MARINE_ALL "Almayer (ALL)"
+///Pulls up a list of mapped Almayer access regions for the ID changer. A few similar defines in here as well. Works with the faction datums.
+#define ACCESS_LIST_MARINE_REGIONS "Almayer Access Regions"
+
+///Most access outside of certain officer access.
+#define ACCESS_LIST_USCM_GROUND_MAIN "USCM Ground (Main)"
+///All of the ground access for USCM.
+#define ACCESS_LIST_USCM_GROUND_ALL "USCM Ground (ALL)"
+///Regions for the outpost.
+#define ACCESS_LIST_USCM_GROUND_REGIONS "USCM Ground Access Regions"
+
///Used by the Wey-Yu - USCM Liaison
#define ACCESS_LIST_MARINE_LIAISON "Wey-Yu (Liaison)"
@@ -224,9 +234,13 @@ Blackstone Bridge.
#define ACCESS_LIST_WY_SENIOR "Wey-Yu (Senior Lead)"
///All access levels associated with Weyland Yutani
#define ACCESS_LIST_WY_ALL "Wey-Yu (ALL)"
+#define ACCESS_LIST_PMC_REGIONS "PMC Access Regions"
+#define ACCESS_LIST_WY_REGIONS "Weyland-Yutani Access Regions"
///All the access levels in the civillian category, excluding Press.
#define ACCESS_LIST_COLONIAL_ALL "Colonial (ALL)"
+///Colony access.
+#define ACCESS_LIST_COLONIAL_REGIONS "Colonial Access Regions"
///Used by the Wey-Yu - Civil Authority Liaison
#define ACCESS_LIST_CIVIL_LIAISON "Colonial (Liaison)"
///The access used by delivery ERT (Pizza/Souto)
@@ -235,8 +249,14 @@ Blackstone Bridge.
///All access levels associated with UPP
#define ACCESS_LIST_UPP_ALL "UPP (ALL)"
#define ACCESS_LIST_UPP_PLATOON "UPP (Platoon)"
+#define ACCESS_LIST_UPP_REGIONS "UPP Access Regions"
///Generic/basic access to CLF stuff
#define ACCESS_LIST_CLF_BASE "CLF (Basic)"
///All access levels associated with CLF
#define ACCESS_LIST_CLF_ALL "CLF (ALL)"
+#define ACCESS_LIST_CLF_REGIONS "CLF Access Regions"
+
+//For the Brits.
+#define ACCESS_LIST_TWE_ALL "TWE (ALL)"
+#define ACCESS_LIST_TWE_REGIONS "TWE Access Regions"
\ No newline at end of file
diff --git a/code/__DEFINES/job.dm b/code/__DEFINES/job.dm
index 9e2222e5a9..91c86732d6 100644
--- a/code/__DEFINES/job.dm
+++ b/code/__DEFINES/job.dm
@@ -29,13 +29,6 @@
#define JOB_SQUAD_ROLES /datum/timelock/squad
#define JOB_SQUAD_ROLES_LIST list(JOB_SQUAD_MARINE, JOB_SQUAD_LEADER, JOB_SQUAD_ENGI, JOB_SQUAD_MEDIC, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_TEAM_LEADER)
-#define JOB_SQUAD_MARINE_UPP "UPP Rifleman"
-#define JOB_SQUAD_LEADER_UPP "UPP Platoon Sergeant"
-#define JOB_SQUAD_MEDIC_UPP "UPP Sanitar"
-#define JOB_SQUAD_TEAM_LEADER_UPP "UPP Squad Sergeant"
-#define JOB_SQUAD_SMARTGUN_UPP "UPP Machinegunner"
-#define JOB_SO_UPP "UPP Platoon Commander"
-
#define JOB_SQUAD_TEAM_LEADER_FORECON "FORECON Assistant Squad Leader"
#define JOB_SQUAD_LEADER_FORECON "FORECON Squad Leader"
#define JOB_SQUAD_MEDIC_FORECON "FORECON Squad Corpsman"
@@ -161,14 +154,19 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_USCM_GROUND_AO "Outpost Adjunct Officer"
#define JOB_USCM_GROUND_SYNTH "Outpost Maint. Synthetic"
-#define JOB_USCM_GROUND_SQUAD_LEADER "Outpost Plt. Lead"
-#define JOB_USCM_GROUND_SQUAD_TEAM_LEADER "Outpost Sq. Lead"
+#define JOB_USCM_GROUND_SQUAD_LEADER "Outpost Plt. Sergeant"
+#define JOB_USCM_GROUND_SQUAD_TEAM_LEADER "Outpost Sqd. Sergeant"
#define JOB_USCM_GROUND_SQUAD_MEDIC "Outpost Corpsman"
#define JOB_USCM_GROUND_SQUAD_SPECIALIST "Outpost Specialist"
#define JOB_USCM_GROUND_SQUAD_SMARTGUNNER "Outpost Smartgunner"
#define JOB_USCM_GROUND_SQUAD_MARINE "Outpost Rifleman"
#define JOB_USCM_GROUND_CIVILIAN "Civilian Researcher"
+
+#define DEPARTMENT_USCM_GROUND_COMMAND "Outpost Command" = list(JOB_USCM_GROUND_CO, JOB_USCM_GROUND_AO)
+#define DEPARTMENT_USCM_GROUND_SUPPORT "Outpost Support" = list(JOB_USCM_GROUND_SYNTH)
+#define DEPARTMENT_USCM_GROUND_MARINE "Outpost Marine" = list(JOB_USCM_GROUND_SQUAD_LEADER, JOB_USCM_GROUND_SQUAD_TEAM_LEADER, JOB_USCM_GROUND_SQUAD_MEDIC, JOB_USCM_GROUND_SQUAD_SPECIALIST, JOB_USCM_GROUND_SQUAD_SMARTGUNNER, JOB_USCM_GROUND_SQUAD_MARINE)
+#define DEPARTMENT_USCM_GROUND_ALL list(DEPARTMENT_USCM_GROUND_COMMAND, DEPARTMENT_USCM_GROUND_SUPPORT, DEPARTMENT_USCM_GROUND_MARINE)
//------------------------------------
//-------------WO roles---------------
@@ -211,7 +209,7 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_PMC_INVESTIGATOR "PMC Medical Investigator"
#define JOB_PMC_DETAINER "Weyland-Yutani PMC (Detainer)"
#define JOB_PMC_ELITE "PMC Elite"
-#define JOB_PMC_GUNNER "PMC Support Weapons Specialist" //Renamed from Specialist to Support Specialist as it only has SG skills.
+#define JOB_PMC_GUNNER "PMC Smartgunner" //Renamed to Smartgunner.
#define JOB_PMC_SNIPER "PMC Weapons Specialist" //Renamed from Sharpshooter to specialist as it uses specialist skills.
#define JOB_PMC_CREWMAN "Weyland-Yutani PMC (Crewman)"
#define JOB_PMC_NINJA "PMC Ninja"
@@ -224,6 +222,12 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_PMC_GRUNT_LIST list(JOB_PMC_STANDARD, JOB_PMC_ENGINEER, JOB_PMC_MEDIC, JOB_PMC_INVESTIGATOR, JOB_PMC_DETAINER, JOB_PMC_ELITE, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_CREWMAN, JOB_PMC_NINJA, JOB_PMC_XENO_HANDLER, JOB_PMC_COMMANDO, JOB_PMC_LEADER, JOB_PMC_LEAD_INVEST)
+#define DEPARTMENT_PMC_COMMAND "PMC Command" = list(JOB_PMC_DIRECTOR, JOB_PMC_LEAD_INVEST, JOB_PMC_LEADER)
+#define DEPARTMENT_PMC_ELITE "PMC Elite" = list(JOB_PMC_COMMANDO, JOB_PMC_ELITE)
+#define DEPARTMENT_PMC_SUPPORT "PMC Support" = list(JOB_PMC_DOCTOR, JOB_PMC_MEDIC, JOB_PMC_ENGINEER, JOB_PMC_INVESTIGATOR, JOB_PMC_CREWMAN, JOB_PMC_XENO_HANDLER, JOB_PMC_SYNTH)
+#define DEPARTMENT_PMC_COMBAT "PMC Combat" = list(JOB_PMC_STANDARD, JOB_PMC_GUNNER, JOB_PMC_SNIPER, JOB_PMC_NINJA)
+#define DEPARTMENT_PMC_ALL list(DEPARTMENT_PMC_COMMAND, DEPARTMENT_PMC_ELITE, DEPARTMENT_PMC_SUPPORT, DEPARTMENT_PMC_COMBAT)
+
//-------- WY --------//
#define JOB_TRAINEE "Corporate Trainee"
@@ -237,12 +241,20 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_CHIEF_EXECUTIVE "Corporate Chief Executive"
#define JOB_DIRECTOR "W-Y Director"
+#define DEPARTMENT_WY_SENIOR "WY Senior Management" = list(JOB_DIRECTOR, JOB_CHIEF_EXECUTIVE, JOB_DIVISION_MANAGER)
+#define DEPARTMENT_WY_MIDDLE "WY Middle Management" = list(JOB_ASSISTANT_MANAGER, JOB_EXECUTIVE_SUPERVISOR, JOB_EXECUTIVE_SPECIALIST, JOB_SENIOR_EXECUTIVE)
+#define DEPARTMENT_WY_JUNIOR "WY Junior Management" = list(JOB_EXECUTIVE, JOB_JUNIOR_EXECUTIVE, JOB_TRAINEE)
+
+
//-------- WY Goons --------//
#define JOB_WY_GOON "WY Corporate Security"
#define JOB_WY_GOON_LEAD "WY Corporate Security Lead"
#define JOB_WY_GOON_RESEARCHER "WY Research Consultant"
#define JOB_WY_GOON_LIST list(JOB_WY_GOON, JOB_WY_GOON_LEAD)
+#define DEPARTMENT_WY_SECURITY "WY Security Team" = JOB_WY_GOON_LIST
+#define DEPARTMENT_WY_ALL list(DEPARTMENT_WY_SENIOR, DEPARTMENT_WY_MIDDLE, DEPARTMENT_WY_JUNIOR, DEPARTMENT_WY_SECURITY)
+#define DEPARTMENT_WY_PMC_ALL DEPARTMENT_WY_ALL + DEPARTMENT_PMC_ALL
//---- Contractors ----//
#define JOB_CONTRACTOR "VAIPO Mercenary"
@@ -283,6 +295,16 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_FORECON_SMARTGUNNER "Reconnaissance Smartgunner"
//-------- UPP --------//
+
+//Platoon version
+#define JOB_SQUAD_MARINE_UPP "UPP Rifleman"
+#define JOB_SQUAD_LEADER_UPP "UPP Platoon Sergeant"
+#define JOB_SQUAD_MEDIC_UPP "UPP Sanitar"
+#define JOB_SQUAD_TEAM_LEADER_UPP "UPP Squad Sergeant"
+#define JOB_SQUAD_SMARTGUN_UPP "UPP Machinegunner"
+#define JOB_SO_UPP "UPP Platoon Commander"
+
+//Regular faction version
#define JOB_UPP "UPP Private"
#define JOB_UPP_CONSCRIPT "UPP Conscript"
#define JOB_UPP_ENGI "UPP Korporal Sapper"
@@ -317,6 +339,16 @@ var/global/list/job_command_roles = JOB_COMMAND_ROLES_LIST
#define JOB_UPP_CREWMAN "UPP Tank Crewman"
+#define DEPARTMENT_UPP_SENR_COMMAND "UPP Senior Kommand" = list(JOB_UPP_GENERAL, JOB_UPP_LT_GENERAL, JOB_UPP_MAY_GENERAL, JOB_UPP_KOL_OFFICER, JOB_UPP_LTKOL_OFFICER, JOB_UPP_MAY_OFFICER)
+#define DEPARTMENT_UPP_COMMAND "UPP Kommand" = list(JOB_UPP_KPT_OFFICER, JOB_UPP_SRLT_OFFICER, JOB_UPP_LT_OFFICER)
+#define DEPARTMENT_UPP_ELITE "UPP Elite" = UPP_COMMANDO_JOB_LIST + JOB_UPP_COMBAT_SYNTH
+#define DEPARTMENT_UPP_SUPPORT "UPP Support" = list(JOB_UPP_CREWMAN, JOB_UPP_SUPPORT_SYNTH, JOB_UPP_POLICE, JOB_UPP_LT_DOKTOR)
+#define DEPARTMENT_UPP_COMBAT "UPP Kombat" = list(JOB_UPP_LEADER, JOB_UPP_SPECIALIST, JOB_UPP_MEDIC, JOB_UPP_ENGI, JOB_UPP)
+#define DEPARTMENT_UPP_PLATOON "UPP Platoon" = list(JOB_SQUAD_MARINE_UPP, JOB_SQUAD_LEADER_UPP, JOB_SQUAD_MEDIC_UPP, JOB_SQUAD_TEAM_LEADER_UPP, JOB_SQUAD_SMARTGUN_UPP, JOB_SO_UPP)
+#define DEPARTMENT_UPP_NONCOMBAT "UPP Diplomatic" = list(JOB_UPP_REPRESENTATIVE)
+
+#define DEPARTMENT_UPP_ALL list(DEPARTMENT_UPP_COMMAND, DEPARTMENT_UPP_ELITE, DEPARTMENT_UPP_SUPPORT, DEPARTMENT_UPP_COMBAT, DEPARTMENT_UPP_PLATOON, DEPARTMENT_UPP_NONCOMBAT)
+
//-------- CLF --------//
#define JOB_CLF "CLF Guerilla"
#define JOB_CLF_ENGI "CLF Field Technician"
diff --git a/code/__DEFINES/layers.dm b/code/__DEFINES/layers.dm
index c0ccd5164b..c06c35f4f5 100644
--- a/code/__DEFINES/layers.dm
+++ b/code/__DEFINES/layers.dm
@@ -127,8 +127,11 @@
#define ABOVE_XENO_LAYER 4.12
/// For facehuggers
#define FACEHUGGER_LAYER 4.13
+///Above other stuff, below weather effects.
+#define BELOW_WEATHER_LAYER 4.14
/// For WEATHER
-#define WEATHER_LAYER 4.14
+#define WEATHER_LAYER 4.15
+
//#define FLY_LAYER 5
diff --git a/code/__DEFINES/mode.dm b/code/__DEFINES/mode.dm
index a85b485497..3b5ac5c7ca 100644
--- a/code/__DEFINES/mode.dm
+++ b/code/__DEFINES/mode.dm
@@ -116,14 +116,14 @@ var/global/list/ROLES_COMMAND = list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFIC
//Marine roles
#define ROLES_OFFICERS list(JOB_CO, JOB_XO, JOB_SO, JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_SYNTH, JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
-var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO, JOB_USCM_GROUND_CO)
-var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT, JOB_USCM_GROUND_AO)
-var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH, JOB_USCM_GROUND_SYNTH, JOB_USCM_GROUND_CIVILIAN)
+var/global/list/ROLES_CIC = list(JOB_CO, JOB_XO, JOB_SO, JOB_WO_CO, JOB_WO_XO)
+var/global/list/ROLES_AUXIL_SUPPORT = list(JOB_AUXILIARY_OFFICER, JOB_INTEL, JOB_PILOT, JOB_DROPSHIP_CREW_CHIEF, JOB_WO_CHIEF_POLICE, JOB_WO_SO, JOB_WO_CREWMAN, JOB_WO_POLICE, JOB_WO_PILOT)
+var/global/list/ROLES_MISC = list(JOB_SYNTH, JOB_WORKING_JOE, JOB_SEA, JOB_CORPORATE_LIAISON, JOB_COMBAT_REPORTER, JOB_MESS_SERGEANT, JOB_WO_CORPORATE_LIAISON, JOB_WO_SYNTH)
var/global/list/ROLES_POLICE = list(JOB_CHIEF_POLICE, JOB_WARDEN, JOB_POLICE)
var/global/list/ROLES_ENGINEERING = list(JOB_CHIEF_ENGINEER, JOB_ORDNANCE_TECH, JOB_MAINT_TECH, JOB_WO_CHIEF_ENGINEER, JOB_WO_ORDNANCE_TECH)
var/global/list/ROLES_REQUISITION = list(JOB_CHIEF_REQUISITION, JOB_CARGO_TECH, JOB_WO_CHIEF_REQUISITION, JOB_WO_REQUISITION)
var/global/list/ROLES_MEDICAL = list(JOB_CMO, JOB_RESEARCHER, JOB_DOCTOR, JOB_NURSE, JOB_WO_CMO, JOB_WO_RESEARCHER, JOB_WO_DOCTOR)
-var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO, JOB_USCM_GROUND_SQUAD_LEADER, JOB_USCM_GROUND_SQUAD_TEAM_LEADER, JOB_USCM_GROUND_SQUAD_TEAM_LEADER, JOB_USCM_GROUND_SQUAD_MEDIC, JOB_USCM_GROUND_SQUAD_SPECIALIST, JOB_USCM_GROUND_SQUAD_SMARTGUNNER, JOB_USCM_GROUND_SQUAD_MARINE)
+var/global/list/ROLES_MARINES = list(JOB_SQUAD_LEADER, JOB_SQUAD_TEAM_LEADER, JOB_SQUAD_SPECIALIST, JOB_SQUAD_SMARTGUN, JOB_SQUAD_MEDIC, JOB_SQUAD_ENGI, JOB_SQUAD_MARINE, JOB_SQUAD_RTO)
var/global/list/ROLES_SQUAD_ALL = list(SQUAD_MARINE_1, SQUAD_MARINE_2, SQUAD_MARINE_3, SQUAD_MARINE_4, SQUAD_MARINE_5, SQUAD_MARINE_CRYO, SQUAD_MARINE_INTEL, SQUAD_UPP, SQUAD_LRRP)
//Groundside roles
@@ -254,7 +254,6 @@ var/global/list/whitelist_hierarchy = list(WHITELIST_NORMAL, WHITELIST_COUNCIL,
#define FACTION_LIST_MARINE list(FACTION_MARINE, FACTION_USCM_GROUND)
#define FACTION_LIST_MARSHAL list(FACTION_MARSHAL, FACTION_MARINE, FACTION_USCM_GROUND)
#define FACTION_LIST_TWE list(FACTION_TWE, FACTION_MARINE, FACTION_USCM_GROUND)
-
#define FACTION_LIST_HUMANOID list(FACTION_MARINE, FACTION_USCM_GROUND, FACTION_PMC, FACTION_WY, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_MARSHAL, FACTION_UPP, FACTION_FREELANCER, FACTION_SURVIVOR, FACTION_NEUTRAL, FACTION_COLONIST, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_YAUTJA, FACTION_ZOMBIE, FACTION_TWE)
#define FACTION_LIST_ERT list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_CLF, FACTION_CONTRACTOR, FACTION_UPP, FACTION_FREELANCER, FACTION_MERCENARY, FACTION_DUTCH, FACTION_HEFA, FACTION_GLADIATOR, FACTION_PIRATE, FACTION_PIZZA, FACTION_SOUTO, FACTION_MARSHAL, FACTION_TWE)
#define FACTION_LIST_WY list(FACTION_PMC, FACTION_WY_DEATHSQUAD, FACTION_WY)
diff --git a/code/__DEFINES/vendors.dm b/code/__DEFINES/vendors.dm
index 04ee5ffef2..23ce505c97 100644
--- a/code/__DEFINES/vendors.dm
+++ b/code/__DEFINES/vendors.dm
@@ -67,3 +67,5 @@
//Whether or not to load ammo boxes depending on ammo loaded into the vendor
//Only relevant in big vendors, like Requisitions or Squad Prep
#define VEND_LOAD_AMMO_BOXES (1<<9)
+//If the vendor has some specialized behavior that needs to override other behavior. Crutch, best to refactor appropriate code.
+#define VEND_SPECIALIZED_STOCK (1<<10)
\ No newline at end of file
diff --git a/code/controllers/subsystem/minimap.dm b/code/controllers/subsystem/minimap.dm
index 1c2a6d3e24..0ed410c18b 100644
--- a/code/controllers/subsystem/minimap.dm
+++ b/code/controllers/subsystem/minimap.dm
@@ -740,13 +740,20 @@ SUBSYSTEM_DEF(minimaps)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
if(!wiki_map_fallback)
- var/wiki_url = CONFIG_GET(string/wikiurl)
- var/obj/item/map/current_map/new_map = new
- if(wiki_url && new_map.html_link)
- wiki_map_fallback ="[wiki_url]/[new_map.html_link]"
- else
- debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'")
- qdel(new_map)
+ //I had to refactor some other code to make this less atrocious. Spawning in a map item to reference one compile-time variable is very silly. Behold!
+ var/obj/item/map/ground_map = PATH_TO_GROUND_MAP_OBJ
+ if(ground_map)
+ var/html_override = initial(ground_map.html_override) //This is a hack, should not be relied on in the future.
+ var/html_link = initial(ground_map.html_link)
+
+ if(html_override) //Hack, but a necessary one since there is no reliable wiki.
+ wiki_map_fallback = html_link //This should always work, as the address should point to functional image.
+ else
+ var/wiki_url = CONFIG_GET(string/wikiurl)
+ if(wiki_url && html_link)
+ wiki_map_fallback ="[wiki_url]/[html_link]"
+ else
+ debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[html_link]'")
// Ensure we actually have the map image sent
resend_current_map_png(user)
diff --git a/code/datums/factions/clf.dm b/code/datums/factions/clf.dm
index ce53b505b3..c8a345d944 100644
--- a/code/datums/factions/clf.dm
+++ b/code/datums/factions/clf.dm
@@ -1,6 +1,11 @@
/datum/faction/clf
name = "Colonial Liberation Front"
faction_tag = FACTION_CLF
+ access_all = ACCESS_LIST_CLF_ALL
+ access_main = ACCESS_LIST_CLF_BASE
+ access_regions = ACCESS_LIST_CLF_REGIONS
+
+//CLF does not currently have a unique department map.
/datum/faction/clf/modify_hud_holder(image/holder, mob/living/carbon/human/human)
var/hud_icon_state
diff --git a/code/datums/factions/contractor.dm b/code/datums/factions/contractor.dm
index 5e0f125b06..6c90593cb5 100644
--- a/code/datums/factions/contractor.dm
+++ b/code/datums/factions/contractor.dm
@@ -1,3 +1,5 @@
/datum/faction/contractor
name = "Vanguard's Arrow Incorporated"
faction_tag = FACTION_CONTRACTOR
+
+ //Stub faction. Nothing interesting here.
diff --git a/code/datums/factions/faction.dm b/code/datums/factions/faction.dm
index d128a9c2a7..dc67e9cb9a 100644
--- a/code/datums/factions/faction.dm
+++ b/code/datums/factions/faction.dm
@@ -1,9 +1,12 @@
/datum/faction
var/name = "Neutral Faction"
var/faction_tag = FACTION_NEUTRAL
- var/list/faction_tag_group //Should be generated on New(), if it needs one. Set faction_tag to null in that case. Factions that use the same hud/procs.
+ var/list/faction_tag_group //Should be generated on New(), if it needs one. Set faction_tag to null in that case. Factions that use the same hud/procs, or sub-factions of one main faction.
var/hud_type = FACTION_HUD
var/skip_init = FALSE //In case we don't want initialize the subtype.
+ var/access_all = ACCESS_LIST_COLONIAL_ALL //All of the access for that faction. These should be properly configured for new factions.
+ var/access_main = ACCESS_LIST_COLONIAL_ALL //Main access, but not all access. Not strictly necessary, can be the same as access_all.
+ var/access_regions = ACCESS_LIST_COLONIAL_REGIONS //Region map for the ID changer.
/datum/faction/proc/modify_hud_holder(image/holder, mob/living/carbon/human/H)
return
@@ -13,3 +16,38 @@
/datum/faction/proc/get_antag_guns_sorted_equipment()
return list()
+
+//Overwrite this if the check needs to account for something special, like sub-factions. uscm.dm for an example.
+/datum/faction/proc/get_faction_access(faction_to_check, all_access = TRUE)
+ return get_access(all_access ? access_all : access_main)
+
+//Pretty straightforward. Override if you need it to return a variant list.
+/datum/faction/proc/get_faction_regions(faction_to_check)
+ return get_access(access_regions)
+/*
+Ovewrite this for individual factions if they get their own ID changing consoles. Might be useful elsewhere. Grabs a list of roles mapped to various departments. Check job.dm defines.
+Since there are no proper colonist jobs, instead having survivors, this is defaulted to the marine role list. Update as needed.
+*/
+/datum/faction/proc/get_faction_departments(faction_to_check)
+ if(Check_WO())
+ return list(
+ "Command" = ROLES_CIC & ROLES_WO,
+ "Auxiliary Command" = ROLES_AUXIL_SUPPORT & ROLES_WO,
+ "Miscellaneous" = ROLES_MISC & ROLES_WO,
+ "Security" = ROLES_POLICE & ROLES_WO,
+ "Engineering" = ROLES_ENGINEERING & ROLES_WO,
+ "Supply" = ROLES_REQUISITION & ROLES_WO,
+ "Medical and Science" = ROLES_MEDICAL & ROLES_WO,
+ "Marines" = ROLES_MARINES
+ )
+ else
+ return list(
+ "Command" = ROLES_CIC - ROLES_WO,
+ "Auxiliary Command" = ROLES_AUXIL_SUPPORT - ROLES_WO,
+ "Miscellaneous" = ROLES_MISC - ROLES_WO,
+ "Security" = ROLES_POLICE - ROLES_WO,
+ "Engineering" = ROLES_ENGINEERING - ROLES_WO,
+ "Supply" = ROLES_REQUISITION - ROLES_WO,
+ "Medical and Science" = ROLES_MEDICAL - ROLES_WO,
+ "Marines" = ROLES_MARINES
+ )
diff --git a/code/datums/factions/pmc.dm b/code/datums/factions/pmc.dm
index c5b319a13c..f9a9d613ae 100644
--- a/code/datums/factions/pmc.dm
+++ b/code/datums/factions/pmc.dm
@@ -1,6 +1,25 @@
/datum/faction/pmc
- name = "Private Military Company"
- faction_tag = FACTION_PMC
+ name = "Weyland-Yutani Corporation"
+ faction_tag = FACTION_WY
+ access_all = ACCESS_LIST_WY_ALL
+ access_main = ACCESS_LIST_WY_PMC
+
+//So all of the WY people share the same base faction in the code.
+/datum/faction/pmc/New()
+ . = ..()
+ faction_tag_group = FACTION_LIST_WY
+
+/datum/faction/pmc/get_faction_regions(faction_to_check)
+ switch(faction_to_check)
+ if(FACTION_PMC, FACTION_WY_DEATHSQUAD) return get_access(ACCESS_LIST_PMC_REGIONS)
+ if(FACTION_WY) return get_access(ACCESS_LIST_WY_REGIONS)
+ return ..()
+
+/datum/faction/pmc/get_faction_departments(faction_to_check)
+ switch(faction_to_check)
+ if(FACTION_PMC, FACTION_WY_DEATHSQUAD) return DEPARTMENT_PMC_ALL
+ if(FACTION_WY) return DEPARTMENT_WY_PMC_ALL
+ return ..()
/datum/faction/pmc/modify_hud_holder(image/holder, mob/living/carbon/human/H)
var/hud_icon_state
diff --git a/code/datums/factions/royalmarinescommando.dm b/code/datums/factions/royalmarinescommando.dm
index 2fab0348bc..6d651fb0e4 100644
--- a/code/datums/factions/royalmarinescommando.dm
+++ b/code/datums/factions/royalmarinescommando.dm
@@ -1,6 +1,11 @@
/datum/faction/royal_marines_commando
- name = "Royal Marines Commando"
+ name = "Three World Empire"
faction_tag = FACTION_TWE
+ access_all = ACCESS_LIST_TWE_ALL
+ access_main = ACCESS_LIST_TWE_ALL
+ access_regions = ACCESS_LIST_TWE_REGIONS
+
+//TWE does not currently have a unique department map.
/datum/faction/royal_marines_commando/modify_hud_holder(image/holder, mob/living/carbon/human/H)
var/hud_icon_state
diff --git a/code/datums/factions/upp.dm b/code/datums/factions/upp.dm
index fefd6b01d6..ba5f062fb4 100644
--- a/code/datums/factions/upp.dm
+++ b/code/datums/factions/upp.dm
@@ -1,6 +1,12 @@
/datum/faction/upp
name = "Union of Progressive Peoples"
faction_tag = FACTION_UPP
+ access_all = ACCESS_LIST_UPP_ALL
+ access_main = ACCESS_LIST_UPP_PLATOON
+ access_regions = ACCESS_LIST_UPP_REGIONS
+
+/datum/faction/upp/get_faction_departments(faction_to_check)
+ return DEPARTMENT_UPP_ALL
/datum/faction/upp/modify_hud_holder(image/holder, mob/living/carbon/human/H)
var/hud_icon_state
diff --git a/code/datums/factions/uscm.dm b/code/datums/factions/uscm.dm
index 58b12f0a27..4478db8d5b 100644
--- a/code/datums/factions/uscm.dm
+++ b/code/datums/factions/uscm.dm
@@ -7,6 +7,22 @@
//Associates extra factions with the marine hud procs.
faction_tag_group = FACTION_LIST_MARINE_HUD
+/datum/faction/uscm/get_faction_regions(faction_to_check)
+ switch(faction_to_check)
+ if(FACTION_USCM_GROUND) return get_access(ACCESS_LIST_USCM_GROUND_REGIONS)
+ if(FACTION_MARINE) return get_access(ACCESS_LIST_MARINE_REGIONS)
+ return ..()
+
+/datum/faction/uscm/get_faction_access(faction_to_check, all_access = TRUE)
+ switch(faction_to_check)
+ if(FACTION_USCM_GROUND) return get_access(all_access ? ACCESS_LIST_USCM_GROUND_ALL : ACCESS_LIST_USCM_GROUND_MAIN)
+ return get_access(all_access ? ACCESS_LIST_MARINE_ALL : ACCESS_LIST_MARINE_MAIN) //Fallback to marine access in every other case.
+
+/datum/faction/uscm/get_faction_departments(faction_to_check)
+ switch(faction_to_check)
+ if(FACTION_USCM_GROUND) return DEPARTMENT_USCM_GROUND_ALL
+ return ..()
+
/datum/faction/uscm/modify_hud_holder(image/holder, mob/living/carbon/human/current_human)
var/datum/squad/squad = current_human.assigned_squad
if(istype(squad))
diff --git a/code/datums/skills/uscm.dm b/code/datums/skills/uscm.dm
index 73ac1e6805..6a3bb2de8f 100644
--- a/code/datums/skills/uscm.dm
+++ b/code/datums/skills/uscm.dm
@@ -100,7 +100,7 @@ United States Colonial Marines
name = "Squad Weapons Specialist (Outpost)"
skills = list(
SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, //Only the spec is a firearms expert.
- SKILL_SPEC_WEAPONS = SKILL_SPEC_ALL, //In case GMs spawn equipment.
+ SKILL_SPEC_WEAPONS = SKILL_SPEC_TRAINED, //They will get all spec skills when they purchase a kit.
SKILL_MELEE_WEAPONS = SKILL_MELEE_SUPER, //For funny melee spec builds.
SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
SKILL_CQC = SKILL_CQC_TRAINED,
diff --git a/code/game/area/WhiskeyOutpost.dm b/code/game/area/WhiskeyOutpost.dm
index a9e8f0f17f..b2f0509cad 100644
--- a/code/game/area/WhiskeyOutpost.dm
+++ b/code/game/area/WhiskeyOutpost.dm
@@ -272,6 +272,10 @@ powernet.
minimap_color = MINIMAP_AREA_SEC_CAVE
sound_environment = SOUND_ENVIRONMENT_HANGAR
+/area/whiskey_outpost/blackstone/inside/armory/weapons
+ name = "\improper Platoon Weapon Storage"
+ icon_state = "weapons"
+
/area/whiskey_outpost/blackstone/inside/senior_enlisted_west
name = "\improper Senior Enlisted West Office"
icon_state = "senior_enlisted"
diff --git a/code/game/jobs/access.dm b/code/game/jobs/access.dm
index eb4ffb2f55..2648c129f7 100644
--- a/code/game/jobs/access.dm
+++ b/code/game/jobs/access.dm
@@ -145,6 +145,57 @@
ACCESS_MARINE_AI_TEMP,
) + get_access(ACCESS_LIST_MARINE_MAIN)
+ if(ACCESS_LIST_MARINE_REGIONS)
+ return list(
+ "[MAIN_SHIP_NAME] Security" = list(ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY),
+ "[MAIN_SHIP_NAME] Medbay" = list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_CHEMISTRY),
+ "[MAIN_SHIP_NAME] Research" = list(ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE),
+ "[MAIN_SHIP_NAME] Engineering" = list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_OT, ACCESS_MARINE_MAINT),
+ "[MAIN_SHIP_NAME] Command" = list(ACCESS_MARINE_SENIOR, ACCESS_MARINE_DATABASE, ACCESS_MARINE_COMMAND, ACCESS_MARINE_RO, ACCESS_MARINE_CARGO, ACCESS_MARINE_SEA, ACCESS_MARINE_SYNTH,),
+ "Marines" = list(ACCESS_MARINE_PREP, ACCESS_MARINE_MEDPREP, ACCESS_MARINE_ENGPREP, ACCESS_MARINE_SMARTPREP, ACCESS_MARINE_LEADER, ACCESS_MARINE_SPECPREP, ACCESS_MARINE_TL_PREP, ACCESS_MARINE_KITCHEN),
+ "Squads" = list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA),
+ "Civilian" = list(ACCESS_CIVILIAN_PUBLIC, ACCESS_CIVILIAN_RESEARCH, ACCESS_CIVILIAN_ENGINEERING, ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_MEDBAY, ACCESS_CIVILIAN_COMMAND),
+ )
+
+ if(ACCESS_LIST_USCM_GROUND_MAIN)
+ return list(
+ ACCESS_USCM_GROUND_GENERAL,
+ ACCESS_USCM_GROUND_MAINT,
+ ACCESS_USCM_GROUND_SYNTH,
+ ACCESS_USCM_GROUND_MEDICAL,
+ ACCESS_USCM_GROUND_ARMORY,
+ ACCESS_USCM_GROUND_GUEST,
+ ACCESS_USCM_GROUND_LOCKDOWN,
+ ACCESS_USCM_GROUND_SMARTPREP,
+ ACCESS_USCM_GROUND_MEDPREP,
+ ACCESS_USCM_GROUND_SPECPREP,
+ ACCESS_USCM_GROUND_TLPREP,
+ ACCESS_USCM_GROUND_PLATOONL,
+ ACCESS_USCM_GROUND_PLATOON_ONE,
+ ACCESS_USCM_GROUND_PLATOON_TWO,
+ ACCESS_USCM_GROUND_COMMAND,
+ ACCESS_USCM_GROUND_WAREHOUSE,
+ ACCESS_USCM_GROUND_CHECKPOINT,
+ )
+
+
+ if(ACCESS_LIST_USCM_GROUND_ALL)
+ return list(
+ ACCESS_USCM_GROUND_CO_OFFICE,
+ ACCESS_USCM_GROUND_CO_QUARTERS,
+ ACCESS_USCM_GROUND_LT,
+ ) + get_access(ACCESS_LIST_USCM_GROUND_MAIN)
+
+ if(ACCESS_LIST_USCM_GROUND_REGIONS)
+ return list(
+ "Outpost Command" = list(ACCESS_USCM_GROUND_LOCKDOWN, ACCESS_USCM_GROUND_COMMAND, ACCESS_USCM_GROUND_CO_OFFICE, ACCESS_USCM_GROUND_CO_QUARTERS, ACCESS_USCM_GROUND_LT,),
+ "Outpost Security" = list(ACCESS_USCM_GROUND_ARMORY, ACCESS_USCM_GROUND_CHECKPOINT,),
+ "Outpost Support" = list(ACCESS_USCM_GROUND_MAINT, ACCESS_USCM_GROUND_SYNTH, ACCESS_USCM_GROUND_MEDICAL, ACCESS_USCM_GROUND_WAREHOUSE,),
+ "Outpost Marines" = list(ACCESS_USCM_GROUND_GENERAL, ACCESS_USCM_GROUND_SMARTPREP, ACCESS_USCM_GROUND_MEDPREP, ACCESS_USCM_GROUND_SPECPREP, ACCESS_USCM_GROUND_TLPREP, ACCESS_USCM_GROUND_PLATOONL,),
+ "Outpost Squads" = list(ACCESS_USCM_GROUND_PLATOON_ONE, ACCESS_USCM_GROUND_PLATOON_TWO,),
+ "Outpost Guest" = list(ACCESS_USCM_GROUND_GUEST,),
+ )
+
if(ACCESS_LIST_EMERGENCY_RESPONSE)
return list(
ACCESS_MARINE_MAINT,
@@ -154,7 +205,7 @@
)
if(ACCESS_LIST_UA)
- return get_access(ACCESS_LIST_MARINE_MAIN) + get_access(ACCESS_LIST_COLONIAL_ALL)
+ return get_access(ACCESS_LIST_MARINE_MAIN) + get_access(ACCESS_LIST_USCM_GROUND_ALL) + get_access(ACCESS_LIST_COLONIAL_ALL)
if(ACCESS_LIST_MARINE_LIAISON)
return list(
@@ -179,6 +230,15 @@
ACCESS_CIVILIAN_COMMAND,
)
+ if(ACCESS_LIST_COLONIAL_REGIONS)
+ return list(
+ "Civilian Security" = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_PUBLIC),
+ "Civilian Medbay" = list(ACCESS_CIVILIAN_MEDBAY),
+ "Civilian Research" = list(ACCESS_CIVILIAN_RESEARCH),
+ "Civilian Engineering" = list(ACCESS_CIVILIAN_ENGINEERING),
+ "Civilian Command" = list(ACCESS_CIVILIAN_LOGISTICS, ACCESS_CIVILIAN_COMMAND),
+ )
+
if(ACCESS_LIST_CIVIL_LIAISON)
return list(
ACCESS_WY_GENERAL,
@@ -257,6 +317,24 @@
ACCESS_WY_FLIGHT,
) + get_access(ACCESS_LIST_WY_GOON)
+ if(ACCESS_LIST_WY_REGIONS)
+ return list(
+ "WY Security" = list(ACCESS_WY_GENERAL, ACCESS_WY_COLONIAL, ACCESS_WY_SECURITY, ACCESS_WY_ARMORY,),
+ "WY Medical" = list(ACCESS_WY_MEDICAL,),
+ "WY Research" = list(ACCESS_WY_RESEARCH,),
+ "WY Engineering" = list(ACCESS_WY_ENGINEERING,),
+ "WY Management" = list(ACCESS_WY_EXEC, ACCESS_WY_SECRETS, ACCESS_WY_LEADERSHIP, ACCESS_WY_SENIOR_LEAD,),
+ )
+
+ if(ACCESS_LIST_PMC_REGIONS)
+ return list(
+ "WY Security" = list(ACCESS_CIVILIAN_BRIG, ACCESS_CIVILIAN_PUBLIC),
+ "WY Medbay" = list(ACCESS_CIVILIAN_MEDBAY),
+ "WY Research" = list(ACCESS_CIVILIAN_RESEARCH),
+ "WY Engineering" = list(ACCESS_CIVILIAN_ENGINEERING),
+ "WY PMC" = list(ACCESS_WY_PMC, ACCESS_WY_ENGINEERING, ACCESS_WY_FLIGHT,),
+ )
+
if(ACCESS_LIST_CLF_ALL)
return list(
ACCESS_CLF_SECURITY,
@@ -272,6 +350,12 @@
ACCESS_CLF_ENGINEERING,
) + get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_EMERGENCY_RESPONSE)
+ if(ACCESS_LIST_CLF_REGIONS)
+ return list(
+ "CLF Base" = list(ACCESS_CLF_GENERAL, ACCESS_CLF_MEDICAL, ACCESS_CLF_ENGINEERING,),
+ "CLF Leadership" = list(ACCESS_CLF_SECURITY, ACCESS_CLF_ARMORY, ACCESS_CLF_LEADERSHIP, ACCESS_CLF_SENIOR_LEAD,),
+ )
+
if(ACCESS_LIST_UPP_ALL)
return list(
ACCESS_UPP_GENERAL,
@@ -298,73 +382,37 @@
ACCESS_UPP_MACHINEGUN
)
-
-/proc/get_region_accesses(code)
- switch(code)
- if(0)//Everything
- return get_access(ACCESS_LIST_COLONIAL_ALL) + get_access(ACCESS_LIST_MARINE_MAIN)
- if(1)//Security
- return list(ACCESS_MARINE_CMP, ACCESS_MARINE_BRIG, ACCESS_MARINE_ARMORY)
- if(2)//Medbay
- return list(ACCESS_MARINE_CMO, ACCESS_MARINE_MEDBAY, ACCESS_MARINE_MORGUE, ACCESS_MARINE_CHEMISTRY)
- if(3)//Research
- return list(ACCESS_MARINE_RESEARCH, ACCESS_MARINE_CHEMISTRY, ACCESS_MARINE_MORGUE)
- if(4)//Engineering
- return list(ACCESS_MARINE_CE, ACCESS_MARINE_ENGINEERING, ACCESS_MARINE_OT, ACCESS_MARINE_MAINT)
- if(5)//Command
+ if(ACCESS_LIST_UPP_REGIONS)
return list(
- ACCESS_MARINE_SENIOR,
- ACCESS_MARINE_DATABASE,
- ACCESS_MARINE_COMMAND,
- ACCESS_MARINE_RO,
- ACCESS_MARINE_CARGO,
- ACCESS_MARINE_SEA,
- ACCESS_MARINE_SYNTH,
+ "UPP General" = list(ACCESS_UPP_GENERAL, ACCESS_UPP_MEDICAL, ACCESS_UPP_ENGINEERING, ACCESS_UPP_RESEARCH,),
+ "UPP Kommand" = list(ACCESS_UPP_SECURITY, ACCESS_UPP_ARMORY, ACCESS_UPP_FLIGHT, ACCESS_UPP_LEADERSHIP,),
+ "UPP Senior Kommand" = list(ACCESS_UPP_SENIOR_LEAD,),
+ "UPP Elite" = list(ACCESS_UPP_COMMANDO,),
)
- if(6)//Marines
+
+
+ if(ACCESS_LIST_TWE_ALL)
return list(
- ACCESS_MARINE_PREP,
- ACCESS_MARINE_MEDPREP,
- ACCESS_MARINE_ENGPREP,
- ACCESS_MARINE_SMARTPREP,
- ACCESS_MARINE_LEADER,
- ACCESS_MARINE_SPECPREP,
- ACCESS_MARINE_TL_PREP,
- ACCESS_MARINE_KITCHEN,
+ ACCESS_TWE_GENERAL,
+ ACCESS_TWE_MEDICAL,
+ ACCESS_TWE_ENGINEERING,
+ ACCESS_TWE_SECURITY,
+ ACCESS_TWE_ARMORY,
+ ACCESS_TWE_FLIGHT,
+ ACCESS_TWE_RESEARCH,
+ ACCESS_TWE_COMMANDO,
+ ACCESS_TWE_LEADERSHIP,
+ ACCESS_TWE_SENIOR_LEAD,
)
- if(7)//Squads
- return list(ACCESS_MARINE_ALPHA, ACCESS_MARINE_BRAVO, ACCESS_MARINE_CHARLIE, ACCESS_MARINE_DELTA)
- if(8)//Civilian
+
+ if(ACCESS_LIST_UPP_REGIONS)
return list(
- ACCESS_CIVILIAN_PUBLIC,
- ACCESS_CIVILIAN_RESEARCH,
- ACCESS_CIVILIAN_ENGINEERING,
- ACCESS_CIVILIAN_LOGISTICS,
- ACCESS_CIVILIAN_BRIG,
- ACCESS_CIVILIAN_MEDBAY,
- ACCESS_CIVILIAN_COMMAND,
+ "TWE Base" = get_access(ACCESS_TWE_GENERAL, ACCESS_TWE_MEDICAL, ACCESS_TWE_ENGINEERING, ACCESS_TWE_RESEARCH,),
+ "TWE Command" = get_access(ACCESS_TWE_SECURITY, ACCESS_TWE_ARMORY, ACCESS_TWE_FLIGHT, ACCESS_TWE_LEADERSHIP,),
+ "TWE Senior Command" = list(ACCESS_TWE_SENIOR_LEAD,),
+ "TWE Elite" = list(ACCESS_TWE_COMMANDO,),
)
-/proc/get_region_accesses_name(code)
- switch(code)
- if(0)
- return "All"
- if(1)
- return "[MAIN_SHIP_NAME] Security" // Security
- if(2)
- return "[MAIN_SHIP_NAME] Medbay" // Medbay
- if(3)
- return "[MAIN_SHIP_NAME] Research" // Research
- if(4)
- return "[MAIN_SHIP_NAME] Engineering" // Engineering
- if(5)
- return "[MAIN_SHIP_NAME] Command" // Command
- if(6)
- return "Marines" // Marine prep
- if(7)
- return "Squads" // Squads
- if(8)
- return "Civilian" // Civilian
/proc/get_access_desc(A)
switch(A)
@@ -459,8 +507,49 @@
if(ACCESS_ARES_DEBUG)
return "AI Debug"
-/proc/get_weyland_access_desc(A)
- switch(A)
+ //USCM Ground
+ if(ACCESS_USCM_GROUND_GENERAL)
+ return "Outpost General"
+ if(ACCESS_USCM_GROUND_MAINT)
+ return "Outpost Maintenance"
+ if(ACCESS_USCM_GROUND_SYNTH)
+ return "Outpost Synthetic"
+ if(ACCESS_USCM_GROUND_MEDICAL)
+ return "Outpost Sickbay"
+ if(ACCESS_USCM_GROUND_ARMORY)
+ return "Outpost Armory"
+ if(ACCESS_USCM_GROUND_GUEST)
+ return "Outpost Guesthouse"
+ if(ACCESS_USCM_GROUND_LOCKDOWN)
+ return "Outpost Lockdown"
+ if(ACCESS_USCM_GROUND_SMARTPREP)
+ return "Outpost Specialist"
+ if(ACCESS_USCM_GROUND_MEDPREP)
+ return "Outpost Corpsman"
+ if(ACCESS_USCM_GROUND_SPECPREP)
+ return "Outpost Specialist"
+ if(ACCESS_USCM_GROUND_TLPREP)
+ return "Outpost Squad Sergeant"
+ if(ACCESS_USCM_GROUND_PLATOONL)
+ return "Outpost Platoon Sergeant"
+ if(ACCESS_USCM_GROUND_COMMAND)
+ return "Outpost Command"
+ if(ACCESS_USCM_GROUND_CO_OFFICE)
+ return "Outpost Captain's Office"
+ if(ACCESS_USCM_GROUND_CO_QUARTERS)
+ return "Outpost Captain's Quarters"
+ if(ACCESS_USCM_GROUND_LT)
+ return "Outpost Lieutenant's Office"
+ if(ACCESS_USCM_GROUND_WAREHOUSE)
+ return "Outpost Supply Warehouse"
+ if(ACCESS_USCM_GROUND_CHECKPOINT)
+ return "Outpost Security Checkpoint"
+ if(ACCESS_USCM_GROUND_PLATOON_ONE)
+ return "Platoon [SQUAD_USCM_GROUND_1]"
+ if(ACCESS_USCM_GROUND_PLATOON_TWO)
+ return "Platoon [SQUAD_USCM_GROUND_2]"
+
+ //WY
if(ACCESS_WY_GENERAL)
return "Wey-Yu General"
if(ACCESS_WY_COLONIAL)
@@ -489,3 +578,78 @@
return "Wey-Yu Leadership"
if(ACCESS_WY_SENIOR_LEAD)
return "Wey-Yu Senior Leadership"
+
+ //UPP
+ if(ACCESS_UPP_GENERAL)
+ return "UPP Genral"
+ if(ACCESS_UPP_MEDICAL)
+ return "UPP Medical"
+ if(ACCESS_UPP_ENGINEERING)
+ return "UPP Engineering"
+ if(ACCESS_UPP_SECURITY)
+ return "UPP Security"
+ if(ACCESS_UPP_ARMORY)
+ return "UPP Armory"
+ if(ACCESS_UPP_FLIGHT)
+ return "UPP Flight Control"
+ if(ACCESS_UPP_RESEARCH)
+ return "UPP Research"
+ if(ACCESS_UPP_SQUAD_ONE)
+ return "UPP Squad One"
+ if(ACCESS_UPP_SQUAD_TWO)
+ return "UPP Squad Two"
+ if(ACCESS_UPP_COMMANDO)
+ return "UPP Kommando"
+ if(ACCESS_UPP_LEADERSHIP)
+ return "UPP Leadership"
+ if(ACCESS_UPP_SENIOR_LEAD)
+ return "UPP Senior Leadership"
+ if(ACCESS_UPP_MEDPREP)
+ return "UPP Medical Prep"
+ if(ACCESS_UPP_MACHINEGUN)
+ return "UPP Machinegunner Prep"
+ if(ACCESS_UPP_TLPREP)
+ return "UPP Squad Leader Prep"
+
+ //CLF
+ if(ACCESS_CLF_GENERAL)
+ return "CLF General"
+ if(ACCESS_CLF_MEDICAL)
+ return "CLF Medical"
+ if(ACCESS_CLF_ENGINEERING)
+ return "CLF Engineering"
+ if(ACCESS_CLF_SECURITY)
+ return "CLF Security"
+ if(ACCESS_CLF_ARMORY)
+ return "CLF Armory"
+ if(ACCESS_CLF_FLIGHT)
+ return "CLF Flight Control"
+ if(ACCESS_CLF_LEADERSHIP)
+ return "CLF Leadership"
+ if(ACCESS_CLF_SENIOR_LEAD)
+ return "CLF Senior Leadership"
+
+ //TWE
+ if(ACCESS_TWE_GENERAL)
+ return "TWE General"
+ if(ACCESS_TWE_MEDICAL)
+ return "TWE Medical"
+ if(ACCESS_TWE_ENGINEERING)
+ return "TWE Engineering"
+ if(ACCESS_TWE_SECURITY)
+ return "TWE Security"
+ if(ACCESS_TWE_ARMORY)
+ return "TWE Armory"
+ if(ACCESS_TWE_FLIGHT)
+ return "TWE Flight Control"
+ if(ACCESS_TWE_RESEARCH)
+ return "TWE Research"
+ if(ACCESS_TWE_COMMANDO)
+ return "TWE Commando"
+ if(ACCESS_TWE_LEADERSHIP)
+ return "TWE Leadership"
+ if(ACCESS_TWE_SENIOR_LEAD)
+ return "TWE Senior Leadership"
+
+
+
diff --git a/code/game/jobs/job/job.dm b/code/game/jobs/job/job.dm
index 7f9fd8d326..8caf477d42 100644
--- a/code/game/jobs/job/job.dm
+++ b/code/game/jobs/job/job.dm
@@ -297,7 +297,7 @@
if(flags_startup_parameters & ROLE_ADD_TO_SQUAD) //Are we a muhreen? Randomize our squad. This should go AFTER IDs. //TODO Robust this later.
RoleAuthority.randomize_squad(human)
- if(Check_WO() && job_squad_roles.Find(GET_DEFAULT_ROLE(human.job))) //activates self setting proc for marine headsets for WO
+ if(Check_WO() && job_squad_roles.Find(GET_SQUAD_ROLE_MAP(human.job))) //activates self setting proc for marine headsets for WO
var/datum/game_mode/whiskey_outpost/WO = SSticker.mode
WO.self_set_headset(human)
diff --git a/code/game/jobs/job/marine/squad/leader.dm b/code/game/jobs/job/marine/squad/leader.dm
index 92807653e0..83312fa87b 100644
--- a/code/game/jobs/job/marine/squad/leader.dm
+++ b/code/game/jobs/job/marine/squad/leader.dm
@@ -28,7 +28,7 @@
gear_preset_secondary = /datum/equipment_preset/uscm/leader/uscm_ground/lesser_rank
total_positions = 2
spawn_positions = 2
- entry_message_body = "You were deemed competent enough to lead a platoon, act accordingly. Make sure your platoon is at task, correct them if they are not. Delegate to your squad leaders, let them breathe. Communicate with officers in charge of the outpost and follow their instructions."
+ entry_message_body = "You were deemed competent enough to lead a platoon, act accordingly. Make sure your platoon is at task, and correct them if they are not. Delegate to your squad leaders, but let them breathe. Communicate with officers in charge of the outpost and follow their instructions."
/datum/job/marine/leader/whiskey
title = JOB_WO_SQUAD_LEADER
diff --git a/code/game/jobs/job/marine/squads.dm b/code/game/jobs/job/marine/squads.dm
index 171b47584f..b009a68ca4 100644
--- a/code/game/jobs/job/marine/squads.dm
+++ b/code/game/jobs/job/marine/squads.dm
@@ -756,12 +756,12 @@
SStracking.set_leader(tracking_id, selected_sl)
SStracking.start_tracking("marine_sl", selected_sl)
- selected_sl.comm_title = GET_SQUAD_ROLE_MAP(selected_sl.job) == JOB_SQUAD_LEADER ? "PL" : "aPL"
-
+ //Resetting regular platoon lead's comm title shouldn't be necessary, but is done for completeness.
+ selected_sl.comm_title = ( GET_SQUAD_ROLE_MAP(selected_sl.job) == JOB_SQUAD_LEADER ) ? set_new_radio_title(selected_sl, "PltSgt") : "aPltSgt"
ADD_TRAIT(selected_sl, TRAIT_LEADERSHIP, TRAIT_SOURCE_SQUAD_LEADER)
if(encryption_key_path)
- var/obj/item/device/radio/headset/sl_headset = selected_sl.get_type_in_ears(headset_path) //Simple istype() check. Should be a define.
+ var/obj/item/device/radio/headset/sl_headset = selected_sl.get_type_in_ears(headset_path) //get_type_in_ears() is a simple istype() check. Should be a define.
if(sl_headset)
var/obj/item/device/encryptionkey/K = new encryption_key_path(sl_headset)
sl_headset.keys += K
@@ -783,11 +783,8 @@
SStracking.stop_tracking("marine_sl", old_lead)
squad_leader = null
- var/datum/job/job_datum = RoleAuthority?.roles_by_name[old_lead.job] //Look up RoleAuthority for the appropriate role name --> datum.
- if(job_datum)
- var/datum/equipment_preset/gear_datum = job_datum.gear_preset //Pull up the gear preset.
- if(gear_datum)
- old_lead.comm_title = initial(gear_datum.role_comm_title) //Set the comm title to what it normally initializes to.
+
+ old_lead.comm_title = set_new_radio_title(old_lead)
if(GET_SQUAD_ROLE_MAP(old_lead.job) != JOB_SQUAD_LEADER || !leader_killed)
var/obj/item/device/radio/headset/sl_headset = old_lead.get_type_in_ears(headset_path)
@@ -798,7 +795,7 @@
qdel(i)
sl_headset.recalculateChannels()
- if(platoon_leader_access) //May not have one. Not strictly needed for removing null from list, but might as well.
+ if(platoon_leader_access) //May not have one. Not strictly needed for removing null from the list, but might as well.
var/obj/item/card/id/ID = old_lead.wear_id
if(istype(ID)) ID.access -= platoon_leader_access
@@ -808,6 +805,15 @@
old_lead.update_inv_wear_suit()
to_chat(old_lead, FONT_SIZE_BIG(SPAN_BLUE("You're no longer the [squad_type] Leader for [src]!")))
+/datum/squad/proc/set_new_radio_title(mob/living/carbon/human/H, fallback_title = "RFN")
+ var/new_comm_title
+ var/datum/job/job_datum = RoleAuthority?.roles_by_name[H.job] //Look up RoleAuthority for the appropriate role name --> datum.
+ if(job_datum)
+ var/datum/equipment_preset/gear_datum = job_datum.gear_preset //Pull up the gear preset.
+ if(gear_datum)
+ new_comm_title = initial(gear_datum.role_comm_title) //Set the comm title to what it normally initializes to.
+ return new_comm_title || fallback_title //In case we get something completely unexpected.
+
//Not a safe proc. Returns null if squads or jobs aren't set up.
//Mostly used in the marine squad console in marine_consoles.dm.
/proc/get_squad_by_name(text)
diff --git a/code/game/jobs/role_authority.dm b/code/game/jobs/role_authority.dm
index 806348d0ed..22372d2c9f 100644
--- a/code/game/jobs/role_authority.dm
+++ b/code/game/jobs/role_authority.dm
@@ -379,7 +379,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
//here is the main reason this proc exists - to remove freed squad jobs from squad,
//so latejoining person ends in the squad which's job was freed and not random one
var/datum/squad/sq = null
- if(job_squad_roles.Find(J.title))
+ if(job_squad_roles.Find(roles_for_squad[J.title]))
var/list/squad_list = list()
for(sq in RoleAuthority.squads)
if(sq.usable)
@@ -480,7 +480,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
if(new_job.flags_startup_parameters & ROLE_ADD_TO_SQUAD) //Are we a muhreen? Randomize our squad. This should go AFTER IDs. //TODO Robust this later.
randomize_squad(new_human)
- if(Check_WO() && job_squad_roles.Find(GET_DEFAULT_ROLE(new_human.job))) //activates self setting proc for marine headsets for WO
+ if(Check_WO() && job_squad_roles.Find(roles_for_squad[new_human.job])) //activates self setting proc for marine headsets for WO
var/datum/game_mode/whiskey_outpost/WO = SSticker.mode
WO.self_set_headset(new_human)
@@ -714,7 +714,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
else to_chat(H, "Something went badly with randomize_squad()! Tell a coder!")
else
- //Deal with marines. They get distributed to the lowest populated squad.
+ //Deal with standards. They get distributed to the lowest populated squad.
var/datum/squad/given_squad = get_lowest_squad(H)
if(!given_squad || !istype(given_squad)) //Something went horribly wrong!
to_chat(H, "Something went wrong with randomize_squad()! Tell a coder!")
@@ -810,7 +810,7 @@ I hope it's easier to tell what the heck this proc is even doing, unlike previou
// returns TRUE if transfer_marine's role is at max capacity in the new squad
/datum/authority/branch/role/proc/check_squad_capacity(mob/living/carbon/human/transfer_marine, datum/squad/new_squad)
- switch(transfer_marine.job)
+ switch(roles_for_squad[transfer_marine.job])
if(JOB_SQUAD_LEADER)
if(new_squad.num_leaders >= new_squad.max_leaders)
return TRUE
diff --git a/code/game/machinery/camera/presets.dm b/code/game/machinery/camera/presets.dm
index 51318fd7cb..4aedf9a0df 100644
--- a/code/game/machinery/camera/presets.dm
+++ b/code/game/machinery/camera/presets.dm
@@ -116,6 +116,7 @@
/obj/structure/machinery/camera/autoname/uscm_ground
name = "military-grade camera"
network = list(CAMERA_NET_USCM_GROUND)
+ colony_camera_mapload = FALSE
/obj/structure/machinery/camera/autoname/uscm_ground/checkpoint
network = list(CAMERA_NET_USCM_GROUND_WEST)
@@ -132,6 +133,7 @@
/obj/structure/machinery/camera/autoname/wy_bunker
network = list(CAMERA_NET_WY_BUNKER)
+ colony_camera_mapload = FALSE
/obj/structure/machinery/camera/autoname/wy_bunker/containment
name = "containment camera"
@@ -141,6 +143,7 @@
/obj/structure/machinery/camera/autoname/upp_bunker
network = list(CAMERA_NET_UPP_BUNKER)
+ colony_camera_mapload = FALSE
//used by the landing camera dropship equipment. Do not place them right under where the dropship lands.
//Should place them near each corner of your LZs.
diff --git a/code/game/machinery/computer/camera_console.dm b/code/game/machinery/computer/camera_console.dm
index 0a5ca84d40..db34c64133 100644
--- a/code/game/machinery/computer/camera_console.dm
+++ b/code/game/machinery/computer/camera_console.dm
@@ -341,10 +341,25 @@
/obj/structure/machinery/computer/cameras/almayer_network/vehicle
network = list(CAMERA_NET_ALMAYER, CAMERA_NET_VEHICLE)
+
+/obj/structure/machinery/computer/cameras/bunker
+ desc = "Used to access the various cameras in this facility."
+ colony_camera_mapload = FALSE
+
+/obj/structure/machinery/computer/cameras/bunker/wy
+ name = "\improper Containment Monitor"
+ desc = "Can view the containment camera but also has access to nearby feeds."
+ network = list(CAMERA_NET_WY_BUNKER_CONTAINMENT, CAMERA_NET_WY_BUNKER)
+
+/obj/structure/machinery/computer/cameras/bunker/upp
+ name = "\improper Gulag Security Monitor"
+ network = list(CAMERA_NET_UPP_BUNKER)
+
/obj/structure/machinery/computer/cameras/uscm_ground
desc = "A computer console linked to all outpost camera feeds."
network = list(CAMERA_NET_USCM_GROUND, CAMERA_NET_USCM_GROUND_WEST, CAMERA_NET_USCM_GROUND_EAST)
req_access = list(ACCESS_USCM_GROUND_COMMAND)
+ colony_camera_mapload = FALSE
/obj/structure/machinery/computer/cameras/uscm_ground/checkpoint
name = "checkpoint camera console"
diff --git a/code/game/machinery/vending/cm_vending.dm b/code/game/machinery/vending/cm_vending.dm
index 3a59c88151..928dde1812 100644
--- a/code/game/machinery/vending/cm_vending.dm
+++ b/code/game/machinery/vending/cm_vending.dm
@@ -513,14 +513,14 @@ GLOBAL_LIST_EMPTY(vending_products)
vend_fail()
return FALSE
- if(vend_flags & VEND_CATEGORY_CHECK)
+ if(vend_flags & (VEND_CATEGORY_CHECK|VEND_SPECIALIZED_STOCK))
// if the vendor uses flags to control availability
var/can_buy_flags = itemspec[4]
if(can_buy_flags)
- if(can_buy_flags == MARINE_CAN_BUY_ESSENTIALS)
+ if(can_buy_flags == MARINE_CAN_BUY_ESSENTIALS || vend_flags & VEND_SPECIALIZED_STOCK)
if(vendor_role.Find(JOB_SQUAD_SPECIALIST))
// handle specalist essential gear assignment
- if(user.job != JOB_SQUAD_SPECIALIST)
+ if(GET_SQUAD_ROLE_MAP(user.job) != JOB_SQUAD_SPECIALIST)
to_chat(user, SPAN_WARNING("Only specialists can take specialist sets."))
vend_fail()
return FALSE
@@ -529,7 +529,7 @@ GLOBAL_LIST_EMPTY(vending_products)
vend_fail()
return FALSE
var/p_name = itemspec[1]
- if(!available_specialist_sets.Find(p_name))
+ if(!(vend_flags & VEND_SPECIALIZED_STOCK) && !available_specialist_sets.Find(p_name))
to_chat(user, SPAN_WARNING("That set is already taken."))
vend_fail()
return FALSE
@@ -537,7 +537,15 @@ GLOBAL_LIST_EMPTY(vending_products)
if(!istype(ID) || ID.registered_ref != WEAKREF(usr))
to_chat(user, SPAN_WARNING("You must be wearing your [SPAN_INFO("dog tags")] to select a specialization!"))
return FALSE
+
+ //Costs all snowflake points to grab a set; single vendor based, so it doesn't pull them from a global list.
+ if(vend_flags & VEND_SPECIALIZED_STOCK && !handle_points(user)) //handle_points() is specified for the sorted spec vendor.
+ to_chat(user, SPAN_WARNING("Not enough points."))
+ vend_fail()
+ return FALSE
+
var/specialist_assignment
+
switch(p_name)
if("Scout Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_SCOUT)
@@ -554,13 +562,21 @@ GLOBAL_LIST_EMPTY(vending_products)
if("Pyro Set")
user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_PYRO)
specialist_assignment = "Pyro"
+ if("B18 Personal Defense Set")
+ user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL)
+ specialist_assignment = "Heavy"
+ if("Sapper Custom Turret Set")
+ user.skills.set_skill(SKILL_SPEC_WEAPONS, SKILL_SPEC_ALL)
+ specialist_assignment = "Sapper"
else
to_chat(user, SPAN_WARNING("Something bad occured with [src], tell a Dev."))
vend_fail()
return FALSE
- ID.set_assignment((user.assigned_squad ? (user.assigned_squad.name + " ") : "") + JOB_SQUAD_SPECIALIST + " ([specialist_assignment])")
+
+ ID.set_assignment( "[user.assigned_squad? "[user.assigned_squad.name] " : null][user.job]: [specialist_assignment]" )
+
GLOB.data_core.manifest_modify(user.real_name, WEAKREF(user), ID.assignment)
- available_specialist_sets -= p_name
+ available_specialist_sets -= p_name //Doesn't matter for the last two.
else if(vendor_role.Find(JOB_SYNTH))
if(user.job != JOB_SYNTH)
to_chat(user, SPAN_WARNING("Only USCM Synthetics may vend experimental tool tokens."))
@@ -765,7 +781,7 @@ GLOBAL_LIST_EMPTY(vending_products)
vend_fail()
return FALSE
- if(LAZYLEN(vendor_role) && !vendor_role.Find(user.job))
+ if(LAZYLEN(vendor_role) && !vendor_role.Find(GET_SQUAD_ROLE_MAP(user.job))) //In case this is something like a spec vend; will work fine for non-squad jobs.
if(display)
to_chat(user, SPAN_WARNING("This machine isn't for you."))
vend_fail()
diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
index 9673590a3a..34f4939be1 100644
--- a/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
+++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_specialist.dm
@@ -51,22 +51,27 @@ GLOBAL_LIST_INIT(cm_vending_gear_spec, list(
/obj/structure/machinery/cm_vending/gear/spec/get_listed_products(mob/user)
return GLOB.cm_vending_gear_spec
-/obj/structure/machinery/cm_vending/gear/spec/uscm_ground
- //We're old school here.
- show_points = TRUE
- vendor_role = null
+//A special...specialist vendor with actual inventory instead of points. We're old school here. Could maybe even rig it for tokens in the future.
+/obj/structure/machinery/cm_vending/sorted/spec
+ name = "\improper ColMarTech Specialist Field Testing Gear Rack"
+ desc = "An automated gear rack for Squad Weapons Specialists. Has a small selection of equipment meant for field testing or limited use."
+ icon_state = "spec_gear"
+ vend_flags = VEND_TO_HAND|VEND_LIMITED_INVENTORY|VEND_SPECIALIZED_STOCK|VEND_USE_VENDOR_FLAGS
+ vendor_role = list(JOB_SQUAD_SPECIALIST)
+ req_one_access = null
+
+/obj/structure/machinery/cm_vending/sorted/spec/handle_points(mob/living/carbon/human/user)
+ return (user.marine_snowflake_points >= MARINE_TOTAL_SNOWFLAKE_POINTS) && !(user.marine_snowflake_points -= MARINE_TOTAL_SNOWFLAKE_POINTS) //Have to return inverse of the last statement as it will be returning 0 or FALSE.
+
+/obj/structure/machinery/cm_vending/sorted/spec/uscm_ground
req_access = list(ACCESS_USCM_GROUND_SPECPREP)
- req_access = null
-// use_snowflake_points = FALSE
- vend_flags = VEND_TO_HAND|VEND_LIMITED_INVENTORY|VEND_CLUTTER_PROTECTION
-/obj/structure/machinery/cm_vending/gear/spec/uscm_ground/get_listed_products(mob/user)
+/obj/structure/machinery/cm_vending/sorted/spec/populate_product_list()
listed_products = list(
- list("WEAPONS SPECIALIST SETS", -1, null, null, null),
- list("B18 Personal Defense Set", MARINE_TOTAL_SNOWFLAKE_POINTS, /obj/item/storage/box/spec/B18, null, VENDOR_ITEM_REGULAR),
- list("Sapper and Custom Turret Set", MARINE_TOTAL_SNOWFLAKE_POINTS, /obj/item/storage/box/spec/sapper, null, VENDOR_ITEM_REGULAR),
- )
- return listed_products
+ list("WEAPONS SPECIALIST SETS", -1, null, null),
+ list("B18 Personal Defense Set", 1, /obj/item/storage/box/spec/B18, VENDOR_ITEM_RECOMMENDED),
+ list("Sapper Custom Turret Set", 1, /obj/item/storage/box/spec/sapper, VENDOR_ITEM_REGULAR),
+ )
//------------CLOTHING VENDOR---------------
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 50afe1fffc..0197940aff 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -795,10 +795,11 @@
"Landing Zone" = TRACKER_LZ
)
+//Marine headsets have the hud installed. Also, I got tired of configuring frequencies. So it does that automatically, but only for squad headsets.
/obj/item/device/radio/headset/uscm_ground/equipped(mob/living/carbon/human/user, slot)
. = ..()
- if(user.assigned_squad)
+ if(squad_headset && user.assigned_squad)
frequency = user.assigned_squad.radio_freq
set_frequency(frequency) //Voila based and awesome.
name = "[initial(name)] - [uppertext(user.assigned_squad.name)]"
@@ -808,7 +809,6 @@
else if(((user in user.assigned_squad.fireteams["SQ1"]) || (user in user.assigned_squad.fireteams["SQ2"])) && (JOB_USCM_GROUND_SQUAD_TEAM_LEADER in tracking_options))
locate_setting = tracking_options[JOB_USCM_GROUND_SQUAD_TEAM_LEADER]
-//Marine headsets have the hud installed. Also, I got tired of configuring frequencies. So it does that automatically, but only for the squad headsets.
/obj/item/device/radio/headset/uscm_ground/marine
name = "outpost marine radio headset"
desc = "A standard marine radio headset. When worn, grants access to Squad Leader tracker. Click tracker with empty hand to open Squad Info window."
diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm
index 136796497e..a15f475b71 100644
--- a/code/game/objects/structures/blocker.dm
+++ b/code/game/objects/structures/blocker.dm
@@ -138,16 +138,19 @@ GLOBAL_VAR_INIT(vehicle_blockers, TRUE)
icon_state = "cavein"
color = "#826161"
opacity = TRUE
+ layer = BELOW_WEATHER_LAYER //We want it to overlay mobs if it crushes them.
var/id //Used to pick out the proper rocks to toggle.
var/animating = FALSE
//Makes it block movement or hides it instead.
-/obj/structure/blocker/rock_debris/proc/toggle_blocker(trigger_signal, play_sound = FALSE)
+/obj/structure/blocker/rock_debris/proc/toggle_blocker(trigger_signal, play_sound = TRUE)
if(trigger_signal == id && !animating)
animating = TRUE //We are animating, so this doesn't get activated again until the animation is done and variables are set.
if(invisibility) //It is invisible.
- if(play_sound) playsound(src, 'sound/effects/rocks_falling.ogg', 50, FALSE)
invisibility = 0 //Immediately make it visible.
+ if(play_sound)
+ playsound(src, 'sound/effects/rocks_falling.ogg', 75, FALSE)
+ visible_message(SPAN_LARGE(SPAN_WARNING("Rocks fall, stones tremble, as a dense pile of debris forms nearby!")), SPAN_WARNING("You hear something collapse and crumble nearby!"))
animate(src, alpha = 255, 1.5 SECONDS) //15 deciseconds, make it opaque.
else
animate(src, alpha = 0, 1.5 SECONDS) //15 deciseconds.
@@ -155,7 +158,7 @@ GLOBAL_VAR_INIT(vehicle_blockers, TRUE)
density = !density
opacity = !opacity
- //I could add effects of actually being caught in the rocks, but that seems pointless.
+ //I could add effects of actually being caught in the rocks, but that doesn't seem very useful. Maybe later.
addtimer(VARSET_CALLBACK(src, animating, FALSE), 1.5 SECONDS) //Resets our status.
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 54acd79bb9..c0db7f17b4 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -117,7 +117,8 @@
name = "squad lead locker"
desc = "A secure storage unit for an outpost squad leader."
req_one_access = null
- density = FALSE
+ density = TRUE
+ can_be_stacked = TRUE
/obj/structure/closet/secure_closet/squad_sergeant/uscm_ground/one/Initialize()
. = ..()
@@ -156,7 +157,7 @@
/obj/structure/closet/secure_closet/smartgunner/uscm_ground
req_one_access = null
desc = "A secure storage unit for an outpost smartgunner."
- density = FALSE
+ can_be_stacked = TRUE
/obj/structure/closet/secure_closet/smartgunner/uscm_ground/one/Initialize()
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm
index cbaa30579f..e3cdbd1071 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/marine_personal.dm
@@ -39,9 +39,9 @@
/obj/structure/closet/secure_closet/marine_personal/uscm_ground/marine
has_cryo_gear = TRUE
+ headset_path = /obj/item/device/radio/headset/uscm_ground/marine
/obj/structure/closet/secure_closet/marine_personal/uscm_ground/marine/standard
- headset_path = /obj/item/device/radio/headset/uscm_ground/marine
job = JOB_USCM_GROUND_SQUAD_MARINE
/obj/structure/closet/secure_closet/marine_personal/uscm_ground/marine/gunner
diff --git a/code/modules/admin/game_master/extra_buttons/map_manipulation_menu.dm b/code/modules/admin/game_master/extra_buttons/map_manipulation_menu.dm
index 08f62ed33c..11371c51cf 100644
--- a/code/modules/admin/game_master/extra_buttons/map_manipulation_menu.dm
+++ b/code/modules/admin/game_master/extra_buttons/map_manipulation_menu.dm
@@ -91,120 +91,120 @@
//PRESETS
if("preset_light_damage") //Parameters for presets are set through params with the tgui menu.
- dest_actions = list(\
- "break_all_machines", 10, \
- "break_gear_vendors", 20, \
- "break_normal_vendors", 15, \
- "break_computers", 20, \
- "break_apcs", 5, \
- "break_cameras", 10, \
- "break_gun_racks", 15, \
- "break_grilles", 15, \
- "break_windows", 10, \
- "break_large_crates", 20, \
- "break_racks", 10, \
- "break_reagent_tanks", 15,\
- "damage_walls", 5, \
- "damage_floors", 5, \
- "destroy_guns", 20, \
- "destroy_devices", 20, \
- "destroy_item_storage", 15, \
- "destroy_clothing", 20, \
- "destroy_food", 20)
+ dest_actions = list(
+ "break_all_machines", 10,
+ "break_gear_vendors", 20,
+ "break_normal_vendors", 15,
+ "break_computers", 20,
+ "break_apcs", 5,
+ "break_cameras", 10,
+ "break_gun_racks", 15,
+ "break_grilles", 15,
+ "break_windows", 10,
+ "break_large_crates", 20,
+ "break_racks", 10,
+ "break_reagent_tanks", 15,
+ "damage_walls", 5,
+ "damage_floors", 5,
+ "destroy_guns", 20,
+ "destroy_devices", 20,
+ "destroy_item_storage", 15,
+ "destroy_clothing", 20,
+ "destroy_food", 20,)
if("preset_moderate_damage")
- dest_actions = list(\
- "break_all_machines", 35,\
- "break_gear_vendors", 45,\
- "break_normal_vendors", 30,\
- "break_computers", 50,\
- "break_apcs", 35,\
- "break_lights", 40,\
- "break_cameras", 30,\
- "break_comm_towers", 50,\
- "break_airlocks", 35,\
- "break_gun_racks", 35, \
- "break_mirrors", 30,\
- "break_grilles", 45,\
- "break_fences", 30,\
- "damage_barricades", 45,\
- "break_windows", 30,\
- "break_window_frames", 15,\
- "break_chairs_and_beds", 35,\
- "break_tables", 30,\
- "break_lockers", 20,\
- "break_large_crates", 50,\
- "break_racks", 30,\
- "break_reagent_tanks", 35,\
- "break_powerloaders", 40,\
- "damage_walls", 20,\
- "damage_floors", 20,\
- "destroy_all_items", 30,\
- "destroy_guns", 50,\
- "destroy_ammo", 60,\
- "destroy_weapons", 35,\
- "destroy_devices", 40,\
- "destroy_item_storage", 30,\
- "destroy_clothing", 30,\
- "destroy_reagent_containers", 40,\
- "destroy_food", 60)
+ dest_actions = list(
+ "break_all_machines", 35,
+ "break_gear_vendors", 45,
+ "break_normal_vendors", 30,
+ "break_computers", 50,
+ "break_apcs", 35,
+ "break_lights", 40,
+ "break_cameras", 30,
+ "break_comm_towers", 50,
+ "break_airlocks", 35,
+ "break_gun_racks", 35,
+ "break_mirrors", 30,
+ "break_grilles", 45,
+ "break_fences", 30,
+ "damage_barricades", 45,
+ "break_windows", 30,
+ "break_window_frames", 15,
+ "break_chairs_and_beds", 35,
+ "break_tables", 30,
+ "break_lockers", 20,
+ "break_large_crates", 50,
+ "break_racks", 30,
+ "break_reagent_tanks", 35,
+ "break_powerloaders", 40,
+ "damage_walls", 20,
+ "damage_floors", 20,
+ "destroy_all_items", 30,
+ "destroy_guns", 50,
+ "destroy_ammo", 60,
+ "destroy_weapons", 35,
+ "destroy_devices", 40,
+ "destroy_item_storage", 30,
+ "destroy_clothing", 30,
+ "destroy_reagent_containers", 40,
+ "destroy_food", 60,)
if("preset_heavy_damage")
- dest_actions = list(\
- "break_all_machines", 60,\
- "break_gear_vendors", 80,\
- "break_normal_vendors", 70,\
- "break_computers", 80,\
- "break_apcs", 55,\
- "break_lights", 70,\
- "break_cameras", 60,\
- "break_comm_towers", 100,\
- "break_airlocks", 65,\
- "break_gun_racks", 80, \
- "break_mirrors", 95,\
- "break_grilles", 75,\
- "break_fences", 75,\
- "damage_barricades", 85,\
- "break_windows", 55,\
- "break_window_frames", 30,\
- "break_chairs_and_beds", 65,\
- "break_tables", 60,\
- "break_lockers", 40,\
- "break_large_crates", 70,\
- "break_racks", 55,\
- "break_reagent_tanks", 70,\
- "break_powerloaders", 90,\
- "damage_walls", 45,\
- "damage_floors", 50,\
- "destroy_all_items", 55,\
- "destroy_guns", 80,\
- "destroy_ammo", 90,\
- "destroy_weapons", 60,\
- "destroy_devices", 80,\
- "destroy_item_storage", 90,\
- "destroy_clothing", 90,\
- "destroy_reagent_containers", 80,\
- "destroy_food", 90)
+ dest_actions = list(
+ "break_all_machines", 60,
+ "break_gear_vendors", 80,
+ "break_normal_vendors", 70,
+ "break_computers", 80,
+ "break_apcs", 55,
+ "break_lights", 70,
+ "break_cameras", 60,
+ "break_comm_towers", 100,
+ "break_airlocks", 65,
+ "break_gun_racks", 80,
+ "break_mirrors", 95,
+ "break_grilles", 75,
+ "break_fences", 75,
+ "damage_barricades", 85,
+ "break_windows", 55,
+ "break_window_frames", 30,
+ "break_chairs_and_beds", 65,
+ "break_tables", 60,
+ "break_lockers", 40,
+ "break_large_crates", 70,
+ "break_racks", 55,
+ "break_reagent_tanks", 70,
+ "break_powerloaders", 90,
+ "damage_walls", 45,
+ "damage_floors", 50,
+ "destroy_all_items", 55,
+ "destroy_guns", 80,
+ "destroy_ammo", 90,
+ "destroy_weapons", 60,
+ "destroy_devices", 80,
+ "destroy_item_storage", 90,
+ "destroy_clothing", 90,
+ "destroy_reagent_containers", 80,
+ "destroy_food", 90,)
//NIGHTMARE
if("nightmare_update_scenario", "nightmare_prepare_game")
if(SSticker.current_state != GAME_STATE_PREGAME || SSnightmare.stat != NIGHTMARE_STATUS_STANDBY) //Extra safety in case they click on something while the game is setting up or something.
- to_chat(ui.user, SPAN_WARNING("Nightmare configuration is only available in the pre-game lobby."))
+ to_chat(ui.user, SPAN_WARNING("Nightmare configuration is only available in the pre-game lobby and when Nightmare is available to run."))
return FALSE
if(action == "nightmare_update_scenario")
SSnightmare.set_scenario_value(params["nightmare_name"], params["nightmare_value"], params["nightmare_context"])
else
if(tgui_alert(ui.user, "Are you sure you want to start the Nightmare system before round start? This cannot be undone.", "Confirmation", list("Yes", "No")) != "Yes") return FALSE
- SSnightmare.prepare_game() //Fire it early. Everything else is handled by the system. If it ran once successfully, it won't run again.
+ SSnightmare.prepare_game() //Fire it early. Everything else is handled by the system. If it ran once successfully, it won't run again. Could potentially remove this limitation to maybe restore default map states.
//SPECIFIC MAP MANIPULATION
/*
If the map has unique things it can do, it still needs individual cases here.
The functions themselves are applicable to other maps, so long as the frontend tgui is configured in MapManipulation.js.
To keep in mind: If area pathing changes, things are going to break with no compiler error. This will only come up when
- using the applicable menu. Absolute pathing is kind an issue because of that, but hopefully this will be reworked by, or if,
+ using the appropriate menu. Absolute pathing is kind an issue because of that, but hopefully this will be reworked by, or if,
that ever comes up. "toggle_blocker" and "flicker_light" both use absolute pathing right now and should probably switch over
to some kind of list in the future. I originally had a unique list for map manipulations, but several atoms
were in other lists as well, so I cut it. /N
@@ -214,13 +214,9 @@
var/obj/structure/blocker/rock_debris/I
var/signal_id = params["signal_id"]
var/signal_area = locate(text2path(params["signal_area"])) //Faster than searching through world. Full pathing.
- var/sound_source = TRUE
for(I in signal_area)
if(I.z in possible_maps) //Don't care about the .z level. Leaving it in for future reference if this is refactored, and these fold into a global list.
- I.toggle_blocker(signal_id, sound_source)
- //Resets it after playing a sound for one of the affected objects, so they are not all producing the same sound.
- //Probably could be trimmed.
- sound_source = FALSE
+ I.toggle_blocker(signal_id)
if("toggle_hatch")
var/obj/structure/ladder/hatch/I
@@ -525,7 +521,7 @@
for(D in I)
D.deconstruct(prob(40) ? TRUE : FALSE)
- //ITEMS //These are just qdeleted. They don't have any damage states.
+ //ITEMS //These are qdeleted. They don't have damage states.
if("destroy_all_items")
var/obj/item/I
for(I in world)
diff --git a/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm
index e4b6f68460..31e0b27e8e 100644
--- a/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm
+++ b/code/modules/admin/tacmap_panel/tacmap_admin_panel_tgui.dm
@@ -17,13 +17,20 @@ GLOBAL_DATUM_INIT(tacmap_admin_panel, /datum/tacmap_admin_panel, new)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
if(!wiki_map_fallback)
- var/wiki_url = CONFIG_GET(string/wikiurl)
- var/obj/item/map/current_map/new_map = new
- if(wiki_url && new_map.html_link)
- wiki_map_fallback ="[wiki_url]/[new_map.html_link]"
- else
- debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[new_map.html_link]'")
- qdel(new_map)
+ //I had to refactor some other code to make this less atrocious. Spawning in a map item to reference one compile-time variable is very silly. Behold!
+ var/obj/item/map/ground_map = PATH_TO_GROUND_MAP_OBJ
+ if(ground_map)
+ var/html_override = initial(ground_map.html_override) //This is a hack, should not be relied on in the future.
+ var/html_link = initial(ground_map.html_link)
+
+ if(html_override) //Hack, but a necessary one since there is no reliable wiki.
+ wiki_map_fallback = html_link //This should always work, as the address should point to functional image.
+ else
+ var/wiki_url = CONFIG_GET(string/wikiurl)
+ if(wiki_url && html_link)
+ wiki_map_fallback ="[wiki_url]/[html_link]"
+ else
+ debug_log("Failed to determine fallback wiki map! Attempted '[wiki_url]/[html_link]'")
// Ensure we actually have the latest map images sent (recache can handle older/different faction maps)
resend_current_map_png(user)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index cfbfc3afbf..6de987fb94 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -491,54 +491,54 @@ var/const/MAX_SAVE_SLOTS = 10
else
dat += "You do not have the whitelist for this role."
if(MENU_SYNTHETIC)
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
- dat += ""
- else
- dat += "You do not have the whitelist for this role."
+ //if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_SYNTHETIC)
+ dat += ""
+ //else
+ // dat += "You do not have the whitelist for this role."
if(MENU_YAUTJA)
- if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
- dat += ""
+ //if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_PREDATOR)
+ dat += ""
- dat += ""
+ dat += ""
- dat += ""
- else
- dat += "You do not have the whitelist for this role."
+ dat += ""
+ //else
+ // dat += "You do not have the whitelist for this role."
if(MENU_MENTOR)
if(RoleAuthority.roles_whitelist[user.ckey] & WHITELIST_MENTOR)
dat += "Nothing here. For now."
diff --git a/code/modules/cm_marines/equipment/maps.dm b/code/modules/cm_marines/equipment/maps.dm
index b7eb24dcdf..c049f07afd 100644
--- a/code/modules/cm_marines/equipment/maps.dm
+++ b/code/modules/cm_marines/equipment/maps.dm
@@ -9,6 +9,11 @@
// color = ... (Colors can be names - "red, green, grey, cyan" or a HEX color code "#FF0000")
var/dat // Page content
var/html_link = ""
+ /*
+ Since we are not on the wiki, need this to properly display added maps. In the future we'd need to host the maps somewhere centralized.
+ This is a hack and shouldn't be used unless there is no proper solution in place.
+ */
+ var/html_override = FALSE
var/window_size = "1280x720"
/obj/item/map/attack_self(mob/user) //Open the map
@@ -21,7 +26,7 @@
/obj/item/map/proc/initialize_map()
var/wikiurl = CONFIG_GET(string/wikiurl)
- if(wikiurl)
+ if(wikiurl || html_override)
dat = {"
@@ -49,7 +54,7 @@
}
You start unfolding the map...
- 
+ 