cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 02:09:41 +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

2
code/game/objects/items/devices/communicator/phone.dm
View File

@@ -105,7 +105,7 @@
to_chat(new_voice, "<b>If you want to end the call, use the 'Hang Up' verb. The other person can also hang up at any time.</b>")
to_chat(new_voice, "<b>Remember, your character does not know anything you've learned from observing!</b>")
if(new_voice.mind)
new_voice.mind.assigned_role = "Disembodied Voice"
new_voice.mind.assigned_role = JOB_DISEMBODIED_VOICE
if(user)
to_chat(user, "<span class='notice'>[icon2html(src,new_voice.client)] Your communicator is now connected to [candidate]'s communicator.</span>")

2
code/game/objects/items/devices/denecrotizer_vr.dm
View File

@@ -43,7 +43,7 @@
/mob/living/simple_mob/attack_ghost(mob/observer/dead/user as mob)
if(!ghostjoin)
return ..()
if(jobban_isbanned(user, "GhostRoles"))
if(jobban_isbanned(user, JOB_GHOSTROLES))
to_chat(user, "<span class='warning'>You cannot inhabit this creature because you are banned from playing ghost roles.</span>")
return
if(!evaluate_ghost_join(user))

2
code/game/objects/items/devices/holowarrant.dm
View File

@@ -39,7 +39,7 @@
/obj/item/device/holowarrant/attackby(obj/item/weapon/W, mob/user)
if(active)
var/obj/item/weapon/card/id/I = W.GetIdCard()
if(access_hos in I.access) // VOREStation edit
if(access_hos in I.GetAccess()) // VOREStation edit
var/choice = tgui_alert(user, "Would you like to authorize this warrant?","Warrant authorization",list("Yes","No"))
if(choice == "Yes")
active.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"

33
code/game/objects/items/devices/paicard.dm
View File

@@ -1,20 +1,19 @@
var/global/list/radio_channels_by_freq = list(
num2text(PUB_FREQ) = "Common",
num2text(AI_FREQ) = "AI Private",
num2text(ENT_FREQ) = "Entertainment",
num2text(ERT_FREQ) = "Response Team",
num2text(COMM_FREQ)= "Command",
num2text(ENG_FREQ) = "Engineering",
num2text(MED_FREQ) = "Medical",
num2text(MED_I_FREQ)="Medical(I)",
num2text(BDCM_FREQ) ="Bodycam", // CHOMPEdit
num2text(SEC_FREQ) = "Security",
num2text(SEC_I_FREQ)="Security(I)",
num2text(SCI_FREQ) = "Science",
num2text(SUP_FREQ) = "Supply",
num2text(SRV_FREQ) = "Service",
num2text(EXP_FREQ) = "Explorer" //CHOMP explo keep
num2text(PUB_FREQ) = CHANNEL_COMMON,
num2text(AI_FREQ) = CHANNEL_AI_PRIVATE,
num2text(ENT_FREQ) = CHANNEL_ENTERTAINMENT,
num2text(ERT_FREQ) = CHANNEL_RESPONSE_TEAM,
num2text(COMM_FREQ)= CHANNEL_COMMAND,
num2text(ENG_FREQ) = CHANNEL_ENGINEERING,
num2text(MED_FREQ) = CHANNEL_MEDICAL,
num2text(MED_I_FREQ)=CHANNEL_MEDICAL_1,
num2text(BDCM_FREQ) =CHANNEL_BODYCAM, // CHOMPEdit
num2text(SEC_FREQ) = CHANNEL_SECURITY,
num2text(SEC_I_FREQ)=CHANNEL_SECURITY_1,
num2text(SCI_FREQ) = CHANNEL_SCIENCE,
num2text(SUP_FREQ) = CHANNEL_SUPPLY,
num2text(SRV_FREQ) = CHANNEL_SERVICE,
num2text(EXP_FREQ) = CHANNEL_EXPLORATION
)
GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
@@ -69,7 +68,7 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
else if(time_till_respawn) // Nonzero time to respawn
to_chat(usr, "<span class='warning'>You can't do that yet! You died too recently. You need to wait another [round(time_till_respawn/10/60, 0.1)] minutes.</span>")
return
if(jobban_isbanned(usr, "pAI"))
if(jobban_isbanned(usr, JOB_PAI))
to_chat(usr,"<span class='warning'>You cannot join a pAI card when you are banned from playing as a pAI.</span>")
return

42
code/game/objects/items/devices/radio/encryptionkey.dm
View File

@@ -15,13 +15,13 @@
/obj/item/device/encryptionkey/syndicate
icon_state = "syn_cypherkey"
channels = list("Mercenary" = 1)
channels = list(CHANNEL_MERCENARY = 1)
origin_tech = list(TECH_ILLEGAL = 3)
syndie = 1//Signifies that it de-crypts Syndicate transmissions
/obj/item/device/encryptionkey/raider
icon_state = "cypherkey"
channels = list("Raider" = 1)
channels = list(CHANNEL_RAIDER = 1)
origin_tech = list(TECH_ILLEGAL = 2)
syndie = 1
@@ -33,73 +33,73 @@
/obj/item/device/encryptionkey/headset_sec
name = "security radio encryption key"
icon_state = "sec_cypherkey"
channels = list("Security" = 1)
channels = list(CHANNEL_SECURITY = 1)
/obj/item/device/encryptionkey/headset_eng
name = "engineering radio encryption key"
icon_state = "eng_cypherkey"
channels = list("Engineering" = 1)
channels = list(CHANNEL_ENGINEERING = 1)
/obj/item/device/encryptionkey/headset_rob
name = "robotics radio encryption key"
icon_state = "rob_cypherkey"
channels = list("Engineering" = 1, "Science" = 1)
channels = list(CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1)
/obj/item/device/encryptionkey/headset_med
name = "medical radio encryption key"
icon_state = "med_cypherkey"
channels = list("Medical" = 1)
channels = list(CHANNEL_MEDICAL = 1)
/obj/item/device/encryptionkey/headset_sci
name = "science radio encryption key"
icon_state = "sci_cypherkey"
channels = list("Science" = 1)
channels = list(CHANNEL_SCIENCE = 1)
/obj/item/device/encryptionkey/headset_medsci
name = "medical research radio encryption key"
icon_state = "medsci_cypherkey"
channels = list("Medical" = 1, "Science" = 1)
channels = list(CHANNEL_MEDICAL = 1, CHANNEL_SCIENCE = 1)
/obj/item/device/encryptionkey/headset_com
name = "command radio encryption key"
icon_state = "com_cypherkey"
channels = list("Command" = 1)
channels = list(CHANNEL_COMMAND = 1)
/obj/item/device/encryptionkey/heads/captain
name = "site manager's encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1)
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1)
/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1)
/obj/item/device/encryptionkey/heads/rd
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list("Science" = 1, "Command" = 1)
channels = list(CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1)
/obj/item/device/encryptionkey/heads/hos
name = "head of security's encryption key"
icon_state = "hos_cypherkey"
channels = list("Security" = 1, "Command" = 1)
channels = list(CHANNEL_SECURITY = 1, CHANNEL_COMMAND = 1)
/obj/item/device/encryptionkey/heads/ce
name = "chief engineer's encryption key"
icon_state = "ce_cypherkey"
channels = list("Engineering" = 1, "Command" = 1)
channels = list(CHANNEL_ENGINEERING = 1, CHANNEL_COMMAND = 1)
/obj/item/device/encryptionkey/heads/cmo
name = "chief medical officer's encryption key"
icon_state = "cmo_cypherkey"
channels = list("Medical" = 1, "Command" = 1)
channels = list(CHANNEL_MEDICAL = 1, CHANNEL_COMMAND = 1)
/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1)
channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1)
/*
/obj/item/device/encryptionkey/headset_mine
name = "mining radio encryption key"
@@ -114,22 +114,22 @@
/obj/item/device/encryptionkey/headset_cargo
name = "supply radio encryption key"
icon_state = "cargo_cypherkey"
channels = list("Supply" = 1)
channels = list(CHANNEL_SUPPLY = 1)
/obj/item/device/encryptionkey/headset_service
name = "service radio encryption key"
icon_state = "srv_cypherkey"
channels = list("Service" = 1)
channels = list(CHANNEL_SERVICE = 1)
/obj/item/device/encryptionkey/ert
name = "\improper ERT radio encryption key"
icon_state = "cent_cypherkey"
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1)
channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1)
/obj/item/device/encryptionkey/omni //Literally only for the admin intercoms
channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Outsider" = 1) //CHOMPedit: Added Outsider
channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_OUTSIDER = 1) //CHOMPedit: Added Outsider
syndie = 1//Signifies that it de-crypts Syndicate transmissions
/obj/item/device/encryptionkey/ent
name = "entertainment encryption key"
channels = list("Entertainment" = 1)
channels = list(CHANNEL_ENTERTAINMENT = 1)

24
code/game/objects/items/devices/radio/encryptionkey_vr.dm
View File

@@ -1,54 +1,54 @@
/obj/item/device/encryptionkey/heads/hop
name = "head of personnel's encryption key"
icon_state = "hop_cypherkey"
channels = list("Supply" = 1, "Service" = 1, "Command" = 1, "Security" = 1) //YW Edit: removes Explorer channel access, not in line with our chain of command. CHOMP: We accept this
channels = list(CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1) //YW Edit: removes Explorer channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/heads/ai_integrated
name = "ai integrated encryption key"
desc = "Integrated encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1, "Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_AI_PRIVATE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/heads/captain
name = "site manager's encryption key"
icon_state = "cap_cypherkey"
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SECURITY = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SCIENCE = 1, CHANNEL_MEDICAL = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/heads/rd
name = "research director's encryption key"
icon_state = "rd_cypherkey"
channels = list("Command" = 1, "Science" = 1, "Explorer" = 1) //YW Edit: adds Explorer channel access, to come in line with our chain of command. CHOMP: We accept this
channels = list(CHANNEL_COMMAND = 1, CHANNEL_SCIENCE = 1, CHANNEL_EXPLORATION = 1) //YW Edit: adds Explorer channel access, to come in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/ert
channels = list("Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/omni //Literally only for the admin intercoms
channels = list("Mercenary" = 1, "Raider" = 1, "Response Team" = 1, "Science" = 1, "Command" = 1, "Medical" = 1, "Engineering" = 1, "Security" = 1, "Supply" = 1, "Service" = 1, "Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_MERCENARY = 1, CHANNEL_RAIDER = 1, CHANNEL_RESPONSE_TEAM = 1, CHANNEL_SCIENCE = 1, CHANNEL_COMMAND = 1, CHANNEL_MEDICAL = 1, CHANNEL_ENGINEERING = 1, CHANNEL_SECURITY = 1, CHANNEL_SUPPLY = 1, CHANNEL_SERVICE = 1, CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/pathfinder
name = "pathfinder's encryption key"
icon_state = "com_cypherkey"
channels = list("Explorer" = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
channels = list(CHANNEL_EXPLORATION = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/qm
name = "quartermaster's encryption key"
icon_state = "qm_cypherkey"
channels = list("Supply" = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
channels = list(CHANNEL_SUPPLY = 1) //YW Edit: removes command channel access, not in line with our chain of command. CHOMP: We accept this
/obj/item/device/encryptionkey/pilot
name = "pilot's encryption key"
icon_state = "cypherkey"
channels = list("Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/explorer
name = "explorer's encryption key" //CHOMP explo keep
icon_state = "rob_cypherkey"
channels = list("Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/sar
name = "fm's encryption key"
icon_state = "med_cypherkey"
channels = list("Medical" = 1, "Explorer" = 1) //CHOMP explo keep
channels = list(CHANNEL_MEDICAL = 1, CHANNEL_EXPLORATION = 1)
/obj/item/device/encryptionkey/talon
channels = list("Talon" = 1)
channels = list(CHANNEL_TALON = 1)

4
code/game/objects/items/devices/radio/headset.dm
View File

@@ -262,13 +262,13 @@
/obj/item/device/radio/headset/heads/hop
name = "head of personnel's headset"
desc = "The headset of the poor fool who will one day be Site Manager."
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset"
ks2type = /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/heads/hop/alt
name = "head of personnel's bowman headset"
desc = "The headset of the poor fool who will one day be Site Manager."
desc = "The headset of the poor fool who will one day be " + JOB_SITE_MANAGER + "."
icon_state = "com_headset_alt"
ks2type = /obj/item/device/encryptionkey/heads/hop

4
code/game/objects/items/devices/radio/radio.dm
View File

@@ -411,11 +411,11 @@ GLOBAL_DATUM(autospeaker, /mob/living/silicon/ai/announcer)
// --- AI ---
else if (isAI(M))
jobname = "AI"
jobname = JOB_AI
// --- Cyborg ---
else if (isrobot(M))
jobname = "Cyborg"
jobname = JOB_CYBORG
// --- Personal AI (pAI) ---
else if (istype(M, /mob/living/silicon/pai))

4
code/game/objects/items/devices/scanners/guide.dm
View File

@@ -19,10 +19,10 @@
var/obj/item/weapon/card/id/ourid = user?.GetIdCard()
if(!ourid)
return
if(access_change_ids in ourid.access)
if(access_change_ids in ourid.GetAccess())
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)
return
if(access_medical in ourid.access)
if(access_medical in ourid.GetAccess())
playsound(src, 'sound/effects/pop.ogg', 50, FALSE)
else
playsound(src, 'sound/machines/defib_failed.ogg', 50, 0)