mirror of
https://github.com/PolarisSS13/Polaris.git
synced 2025-12-15 12:42:50 +00:00
Makes manifest preserve original position of Custom jobs
This commit is contained in:
@@ -288,7 +288,7 @@ var/global/list/PDA_Manifest = list()
|
|||||||
manifest_inject(H)
|
manifest_inject(H)
|
||||||
return
|
return
|
||||||
|
|
||||||
/datum/datacore/proc/manifest_modify(var/name, var/assignment)
|
/datum/datacore/proc/manifest_modify(var/name, var/assignment, var/rank)
|
||||||
ResetPDAManifest()
|
ResetPDAManifest()
|
||||||
var/datum/data/record/foundrecord
|
var/datum/data/record/foundrecord
|
||||||
var/real_title = assignment
|
var/real_title = assignment
|
||||||
@@ -302,11 +302,18 @@ var/global/list/PDA_Manifest = list()
|
|||||||
var/list/all_jobs = get_job_datums()
|
var/list/all_jobs = get_job_datums()
|
||||||
|
|
||||||
for(var/datum/job/J in all_jobs)
|
for(var/datum/job/J in all_jobs)
|
||||||
var/list/alttitles = get_alternate_titles(J.title)
|
if(J.title == rank) //If we have a rank, just default to using that.
|
||||||
if(!J) continue
|
real_title = rank
|
||||||
if(assignment in alttitles)
|
|
||||||
real_title = J.title
|
|
||||||
break
|
break
|
||||||
|
else if(J.title == assignment)
|
||||||
|
real_title = rank
|
||||||
|
break
|
||||||
|
else
|
||||||
|
var/list/alttitles = get_alternate_titles(J.title)
|
||||||
|
if(!J) continue
|
||||||
|
if(assignment in alttitles)
|
||||||
|
real_title = J.title
|
||||||
|
break
|
||||||
|
|
||||||
if(foundrecord)
|
if(foundrecord)
|
||||||
foundrecord.fields["rank"] = assignment
|
foundrecord.fields["rank"] = assignment
|
||||||
|
|||||||
@@ -153,7 +153,7 @@
|
|||||||
switch(href_list["choice"])
|
switch(href_list["choice"])
|
||||||
if ("modify")
|
if ("modify")
|
||||||
if (modify)
|
if (modify)
|
||||||
data_core.manifest_modify(modify.registered_name, modify.assignment)
|
data_core.manifest_modify(modify.registered_name, modify.assignment, modify.rank)
|
||||||
modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
|
modify.name = text("[modify.registered_name]'s ID Card ([modify.assignment])")
|
||||||
if(ishuman(usr))
|
if(ishuman(usr))
|
||||||
modify.forceMove(get_turf(src))
|
modify.forceMove(get_turf(src))
|
||||||
|
|||||||
@@ -167,7 +167,7 @@
|
|||||||
if("modify")
|
if("modify")
|
||||||
if(computer && computer.card_slot)
|
if(computer && computer.card_slot)
|
||||||
if(id_card)
|
if(id_card)
|
||||||
data_core.manifest_modify(id_card.registered_name, id_card.assignment)
|
data_core.manifest_modify(id_card.registered_name, id_card.assignment, id_card.rank)
|
||||||
computer.proc_eject_id(usr)
|
computer.proc_eject_id(usr)
|
||||||
. = TRUE
|
. = TRUE
|
||||||
if("terminate")
|
if("terminate")
|
||||||
|
|||||||
Reference in New Issue
Block a user