cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[MIRROR] Fixes pilots not getting a harness if they use a loadout uniform
This commit is contained in:
Novacat
2021-03-18 10:38:42 -04:00
committed by Chompstation Bot
parent 5c285eda7d
commit d2b2342d74
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/datums/outfits/outfit.dm
View File

@@ -39,7 +39,9 @@ var/list/outfits_decls_by_type_
var/suit_store = null var/suit_store = null
var/r_hand = null var/r_hand = null
var/l_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_type
var/id_desc var/id_desc
@@ -145,6 +147,12 @@ var/list/outfits_decls_by_type_
H.put_in_l_hand(new l_hand(H)) H.put_in_l_hand(new l_hand(H))
if(r_hand) if(r_hand)
H.put_in_r_hand(new r_hand(H)) 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) if(H.species)
H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL) H.species.equip_survival_gear(H, flags&OUTFIT_EXTENDED_SURVIVAL, flags&OUTFIT_COMPREHENSIVE_SURVIVAL)

8
maps/southern_cross/items/clothing/sc_under.dm
View File

@@ -12,6 +12,9 @@
) )
starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1)
/obj/item/clothing/under/rank/pilot1/no_webbing
starting_accessories = null
/obj/item/clothing/under/rank/pilot2 /obj/item/clothing/under/rank/pilot2
name = "\improper NanoTrasen flight suit" name = "\improper NanoTrasen flight suit"
desc = "A dark blue NanoTrasen flight suit. Warm and practical, seveal patches are scattered across it." desc = "A dark blue NanoTrasen flight suit. Warm and practical, seveal patches are scattered across it."
@@ -24,4 +27,7 @@
sprite_sheets = list( sprite_sheets = list(
"Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi' "Teshari" = 'maps/southern_cross/icons/mob/species/teshari/sc_uniform.dmi'
) )
starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2) starting_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot2)
/obj/item/clothing/under/rank/pilot2/no_webbing
starting_accessories = null

3
maps/southern_cross/job/outfits.dm
View File

@@ -39,11 +39,12 @@ Keep outfits simple. Spawn with basic uniforms and minimal gear. Gear instead go
/decl/hierarchy/outfit/job/pilot /decl/hierarchy/outfit/job/pilot
name = OUTFIT_JOB_NAME("Pilot") name = OUTFIT_JOB_NAME("Pilot")
shoes = /obj/item/clothing/shoes/black shoes = /obj/item/clothing/shoes/black
uniform = /obj/item/clothing/under/rank/pilot1 uniform = /obj/item/clothing/under/rank/pilot1/no_webbing
suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot suit = /obj/item/clothing/suit/storage/toggle/bomber/pilot
gloves = /obj/item/clothing/gloves/fingerless gloves = /obj/item/clothing/gloves/fingerless
glasses = /obj/item/clothing/glasses/fakesunglasses/aviator glasses = /obj/item/clothing/glasses/fakesunglasses/aviator
l_ear = /obj/item/device/radio/headset/pilot/alt l_ear = /obj/item/device/radio/headset/pilot/alt
uniform_accessories = list(/obj/item/clothing/accessory/storage/webbing/pilot1 = 1)
id_slot = slot_wear_id id_slot = slot_wear_id
pda_slot = slot_belt pda_slot = slot_belt
pda_type = /obj/item/device/pda //VOREStation Edit - Civilian pda_type = /obj/item/device/pda //VOREStation Edit - Civilian