cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Job rank and radio channel rework (#8965)

Browse Source 
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
CHOMPStation2
2024-09-17 12:24:13 -07:00
committed by GitHub
parent 6159cecfc8
commit 4153768ba1
444 changed files with 3341 additions and 2440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/controllers/communications.dm
View File

@@ -131,27 +131,27 @@ var/const/CSN_FREQ = 1365 //VOREStation Add
var/const/OUT_FREQ = 1367 //CHOMPstation Add
var/list/radiochannels = list(
"Common" = PUB_FREQ,
"Science" = SCI_FREQ,
"Command" = COMM_FREQ,
"Medical" = MED_FREQ,
"Engineering" = ENG_FREQ,
"Security" = SEC_FREQ,
"Bodycam" = BDCM_FREQ, // CHOMPEdit
"Response Team" = ERT_FREQ,
"Special Ops" = DTH_FREQ,
"Mercenary" = SYND_FREQ,
"Raider" = RAID_FREQ,
"Supply" = SUP_FREQ,
"Service" = SRV_FREQ,
"Explorer" = EXP_FREQ, //CHOMP explo keep
"AI Private" = AI_FREQ,
"Entertainment" = ENT_FREQ,
"Medical(I)" = MED_I_FREQ,
"Security(I)" = SEC_I_FREQ,
"Talon" = TALON_FREQ, //VOREStation Add
"Casino" = CSN_FREQ,
"Outsider" = OUT_FREQ //CHOMPstation Add
CHANNEL_COMMON = PUB_FREQ,
CHANNEL_SCIENCE = SCI_FREQ,
CHANNEL_COMMAND = COMM_FREQ,
CHANNEL_MEDICAL = MED_FREQ,
CHANNEL_ENGINEERING = ENG_FREQ,
CHANNEL_SECURITY = SEC_FREQ,
CHANNEL_BODYCAM = BDCM_FREQ, // CHOMPEdit
CHANNEL_RESPONSE_TEAM = ERT_FREQ,
CHANNEL_SPECIAL_OPS = DTH_FREQ,
CHANNEL_MERCENARY = SYND_FREQ,
CHANNEL_RAIDER = RAID_FREQ,
CHANNEL_SUPPLY = SUP_FREQ,
CHANNEL_SERVICE = SRV_FREQ,
CHANNEL_EXPLORATION = EXP_FREQ,
CHANNEL_AI_PRIVATE = AI_FREQ,
CHANNEL_ENTERTAINMENT = ENT_FREQ,
CHANNEL_MEDICAL_1 = MED_I_FREQ,
CHANNEL_SECURITY_1 = SEC_I_FREQ,
CHANNEL_TALON = TALON_FREQ, //VOREStation Add
CHANNEL_CASINO = CSN_FREQ,
CHANNEL_OUTSIDER = OUT_FREQ //CHOMPstation Add
)
// Hey, if anyone ever needs to update tgui/packages/tgui/constants.js with new radio channels

2
code/controllers/subsystems/job.dm
View File

@@ -26,7 +26,7 @@ SUBSYSTEM_DEF(job)
//CHOMPadd end
return SS_INIT_SUCCESS // CHOMPEdit
/datum/controller/subsystem/job/proc/setup_occupations(faction = "Station")
/datum/controller/subsystem/job/proc/setup_occupations(faction = FACTION_STATION)
occupations = list()
var/list/all_jobs = subtypesof(/datum/job)
if(!all_jobs.len)

2
code/controllers/subsystems/ticker.dm
View File

@@ -437,7 +437,7 @@ var/global/datum/controller/subsystem/ticker/ticker
var/captainless=1
for(var/mob/living/carbon/human/player in player_list)
if(player && player.mind && player.mind.assigned_role)
if(player.mind.assigned_role == "Site Manager")
if(player.mind.assigned_role == JOB_SITE_MANAGER)
captainless=0
if(!player_is_antag(player.mind, only_offstation_roles = 1))
job_master.EquipRank(player, player.mind.assigned_role, 0)