shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from AlManiak/feature/jobtitles_fix

Browse Source 
Feature/jobtitles fix
This commit is contained in:
evilew
2024-11-28 22:20:58 +01:00
committed by GitHub
parent bdf3c8d783 9001c33918
commit 1133f46556
5 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__HELPERS/game.dm
+1 -1
View File
@@ -585,7 +585,7 @@
if(character.client && character.client.prefs && character.client?.prefs?.alt_titles_preferences[rank])
displayed_rank = character.client?.prefs?.alt_titles_preferences[rank]
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
announcer.announce("ARRIVAL", character.real_name, displayed_rank, list()) //make the list empty to make it announce it in common
announcer.announce("ARRIVAL", character.real_name, rank, displayed_rank, list()) //make the list empty to make it announce it in common
/proc/lavaland_equipment_pressure_check(turf/T)
. = FALSE
code/datums/datacore.dm
+2 -1
View File
@@ -172,7 +172,8 @@
var/datum/data/record/G = new()
G.fields["id"] = id
G.fields["name"] = H.real_name
G.fields["rank"] = displayed_rank
G.fields["rank"] = assignment
G.fields["job_title"] = displayed_rank
G.fields["age"] = H.age
G.fields["species"] = H.dna.species.name
G.fields["fingerprint"] = md5(H.dna.uni_identity)
code/game/machinery/cryopod.dm
+4 -2
View File
@@ -301,6 +301,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
// Delete them from datacore.
var/announce_rank = null
var/rank = null
for(var/datum/data/record/medical_record as anything in GLOB.data_core.medical)
if(medical_record.fields["name"] == mob_occupant.real_name)
qdel(medical_record)
@@ -309,7 +310,8 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
qdel(security_record)
for(var/datum/data/record/general_record as anything in GLOB.data_core.general)
if(general_record.fields["name"] == mob_occupant.real_name)
announce_rank = general_record.fields["rank"]
announce_rank = general_record.fields["job_title"]
rank = general_record.fields["rank"]
qdel(general_record)
var/obj/machinery/computer/cryopod/control_computer = control_computer_weakref?.resolve()
@@ -321,7 +323,7 @@ GLOBAL_LIST_EMPTY(cryopod_computers)
// Make an announcement and log the person entering storage.
if(GLOB.announcement_systems.len && alert_comms) //GS13 EDIT
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
announcer.announce("CRYOSTORAGE", mob_occupant.real_name, announce_rank, list())
announcer.announce("CRYOSTORAGE", mob_occupant.real_name, rank, announce_rank, list())
visible_message(span_notice("[src] hums and hisses as it moves [mob_occupant.real_name] into storage."))
code/modules/jobs/job_types/_job.dm
-1
View File
@@ -337,7 +337,6 @@
PDA.ownjob = preference_source.prefs.alt_titles_preferences[J.title]
else
PDA.ownjob = J.title
PDA.ownjob = J.title
PDA.update_label()
if(preference_source && !PDA.equipped) //PDA's screen color, font style and look depend on client preferences.
PDA.update_style(preference_source)
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -1031,7 +1031,7 @@
if(GLOB.announcement_systems.len)
// Sends an announcement the AI has cryoed.
var/obj/machinery/announcement_system/announcer = pick(GLOB.announcement_systems)
announcer.announce("CRYOSTORAGE", src.real_name, announce_rank, list())
announcer.announce("CRYOSTORAGE", src.real_name, announce_rank, channels = list())
new /obj/structure/ai_core/latejoin_inactive(loc)
if(src.mind)
//Handle job slot/tater cleanup.