Merge pull request #9530 from Ghommie/Ghommie-cit245

Touching up job outfits equip procs, little PDA fix.
This commit is contained in:
Lin
2019-11-22 02:37:49 +00:00
committed by GitHub
27 changed files with 105 additions and 99 deletions
@@ -34,8 +34,6 @@
var/shirt_color = "FFFFFF"
var/socks = "Nude" //Which socks the player wants
var/socks_color = "FFFFFF"
var/backbag = DBACKPACK //Which backpack type the player has chosen.
var/jumpsuit_style = PREF_SUIT //suit/skirt
//Equipment slots
var/obj/item/wear_suit = null
@@ -251,7 +251,7 @@
sec_hud_set_security_status()
..()
/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE)
/mob/living/carbon/human/proc/equipOutfit(outfit, visualsOnly = FALSE, client/preference_source)
var/datum/outfit/O = null
if(ispath(outfit))
@@ -263,7 +263,7 @@
if(!O)
return 0
return O.equip(src, visualsOnly)
return O.equip(src, visualsOnly, preference_source)
//delete all equipment without dropping anything