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

dont need this anymore

Browse Source
This commit is contained in:
Timothy Teakettle
2020-08-23 21:55:21 +01:00
parent a7a6489f58
commit e2aeaf8a5b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/subsystem/job.dm
+2 -2
View File
@@ -665,7 +665,7 @@ SUBSYSTEM_DEF(job)
message_admins(msg) message_admins(msg)
CRASH(msg) CRASH(msg)
/datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff, bypass_prereqs = FALSE, force_equip = FALSE) /datum/controller/subsystem/job/proc/equip_loadout(mob/dead/new_player/N, mob/living/M, equipbackpackstuff, bypass_prereqs = FALSE)
var/mob/the_mob = N var/mob/the_mob = N
if(!the_mob) if(!the_mob)
the_mob = M // cause this doesn't get assigned if player is a latejoiner the_mob = M // cause this doesn't get assigned if player is a latejoiner
@@ -689,7 +689,7 @@ SUBSYSTEM_DEF(job)
if(!permitted) if(!permitted)
continue continue
var/obj/item/I = new G.path var/obj/item/I = new G.path
if(!M.equip_to_slot_if_possible(I, G.slot, disable_warning = TRUE, bypass_equip_delay_self = TRUE, clothing_check = !force_equip)) // If the job's dresscode compliant, try to put it in its slot, first if(!M.equip_to_slot_if_possible(I, G.slot, disable_warning = TRUE, bypass_equip_delay_self = TRUE)) // If the job's dresscode compliant, try to put it in its slot, first
if(iscarbon(M)) if(iscarbon(M))
var/mob/living/carbon/C = M var/mob/living/carbon/C = M
var/obj/item/storage/backpack/B = C.back var/obj/item/storage/backpack/B = C.back
code/modules/mob/dead/new_player/preferences_setup.dm
+1 -1
View File
@@ -46,7 +46,7 @@
if(current_tab == 3) if(current_tab == 3)
//give it its loadout if not on the appearance tab //give it its loadout if not on the appearance tab
SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE, force_equip = TRUE) SSjob.equip_loadout(parent.mob, mannequin, FALSE, bypass_prereqs = TRUE)
else else
if(previewJob && equip_job) if(previewJob && equip_job)
mannequin.job = previewJob.title mannequin.job = previewJob.title