Merge pull request #9965 from VOREStation/upstream-merge-7983

[MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
This commit is contained in:
Novacat
2021-03-18 14:40:40 +00:00
committed by Chompstation Bot
parent 5c285eda7d
commit d2b2342d74
3 changed files with 18 additions and 3 deletions
+9 -1
View File
@@ -39,7 +39,9 @@ var/list/outfits_decls_by_type_
var/suit_store = null
var/r_hand = null
var/l_hand = null
var/list/backpack_contents = list() // In the list(path=count,otherpath=count) format
// In the list(path=count,otherpath=count) format
var/list/uniform_accessories = list() // webbing, armbands etc - fits in slot_tie
var/list/backpack_contents = list()
var/id_type
var/id_desc
@@ -145,6 +147,12 @@ var/list/outfits_decls_by_type_
H.put_in_l_hand(new l_hand(H))
if(r_hand)
H.put_in_r_hand(new r_hand(H))
for(var/path in uniform_accessories)
var/number = uniform_accessories[path]
for(var/i=0,i<number,i++)
H.equip_to_slot_or_del(new path(H), slot_tie)
if(H.species)
H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL)