From cffb1ba66d5d8a30d312b55e51dbf80d5795e87e Mon Sep 17 00:00:00 2001 From: Atermonera Date: Wed, 17 Mar 2021 23:55:43 -0900 Subject: [PATCH] Merge pull request #7983 from Meghan-Rossi/pilot_tweaks Fixes pilots not getting a harness if they use a loadout uniform --- code/datums/outfits/outfit.dm | 10 +++++++++- maps/southern_cross/items/clothing/sc_under.dm | 8 +++++++- maps/southern_cross/job/outfits.dm | 3 ++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/code/datums/outfits/outfit.dm b/code/datums/outfits/outfit.dm index a2d3e9b728c..7791f95b0e6 100644 --- a/code/datums/outfits/outfit.dm +++ b/code/datums/outfits/outfit.dm @@ -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