Merge pull request #4938 from CHOMPStation2/upstream-merge-13738

[MIRROR] Fixes some adminverb runtimes
This commit is contained in:
Nadyr
2022-09-18 21:14:10 -04:00
committed by GitHub
3 changed files with 5 additions and 4 deletions
+1 -1
View File
@@ -393,7 +393,7 @@ var/global/datum/controller/occupations/job_master
//Equip custom gear loadout.
var/list/custom_equip_slots = list()
var/list/custom_equip_leftovers = list()
if(H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
if(H.client && H.client.prefs && H.client.prefs.gear && H.client.prefs.gear.len && !(job.mob_type & JOB_SILICON))
for(var/thing in H.client.prefs.gear)
var/datum/gear/G = gear_datums[thing]
if(!G) //Not a real gear datum (maybe removed, as this is loaded from their savefile)
+1 -1
View File
@@ -364,7 +364,7 @@
if(ispath(holder.buildmode.objholder,/turf))
var/turf/T = get_turf(object)
T.ChangeTurf(holder.buildmode.objholder)
else
else if(ispath(holder.buildmode.objholder))
var/obj/A = new holder.buildmode.objholder (get_turf(object))
A.set_dir(holder.builddir.dir)
else if(pa.Find("right"))
+3 -2
View File
@@ -530,8 +530,9 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(equipment)
if(charjob)
job_master.EquipRank(new_character, charjob, 1, announce)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
if(new_character.mind)
new_character.mind.assigned_role = charjob
new_character.mind.role_alt_title = job_master.GetPlayerAltTitle(new_character, charjob)
equip_custom_items(new_character) //CHOMPEdit readded to enable custom_item.txt
//If desired, add records.