Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 1ee50c0

Browse files
authored
vox should correctly spawn with selected mask and tank at roundstart (#22827)
1 parent a3fac96 commit 1ee50c0

File tree

3 files changed

+5
-5
lines changed
  • code/modules
  • yogstation/code/modules/mob/living/carbon/human/species_types

3 files changed

+5
-5
lines changed

code/modules/jobs/job_types/_job.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@
177177
if(outfit_override || outfit)
178178
H.equipOutfit(outfit_override ? outfit_override : outfit, visualsOnly)
179179

180-
H.dna.species.after_equip_job(src, H, visualsOnly)
180+
H.dna.species.after_equip_job(src, H, preference_source)
181181

182182
if(!visualsOnly && announce)
183183
announce(H)

code/modules/mob/living/carbon/human/_species.dm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1457,7 +1457,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
14571457
/datum/species/proc/before_equip_job(datum/job/J, mob/living/carbon/human/H)
14581458
return
14591459

1460-
/datum/species/proc/after_equip_job(datum/job/J, mob/living/carbon/human/H)
1460+
/datum/species/proc/after_equip_job(datum/job/J, mob/living/carbon/human/H, client/preference_source)
14611461
H.update_mutant_bodyparts()
14621462

14631463
// Do species-specific reagent handling here

yogstation/code/modules/mob/living/carbon/human/species_types/vox.dm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,20 +86,20 @@
8686
soon_added_items += pick(possible_masks)
8787
..()
8888

89-
/datum/species/vox/after_equip_job(datum/job/J, mob/living/carbon/human/H, visualsOnly = FALSE) // Don't forget your voxygen tank
89+
/datum/species/vox/after_equip_job(datum/job/J, mob/living/carbon/human/H, client/preference_source) // Don't forget your voxygen tank
9090
if(!H.can_breathe_mask())
9191
var/obj/item/clothing/mask/current_mask = H.get_item_by_slot(ITEM_SLOT_MASK)
9292
if(!H.equip_to_slot_if_possible(current_mask, ITEM_SLOT_BACKPACK, disable_warning = TRUE))
9393
H.put_in_hands(current_mask)
9494
var/obj/item/clothing/mask/vox_mask
95-
var/mask_pref = H.client?.prefs?.read_preference(/datum/preference/choiced/vox_mask)
95+
var/mask_pref = preference_source?.prefs?.read_preference(/datum/preference/choiced/vox_mask)
9696
if(mask_pref == "Respirator")
9797
vox_mask = new /obj/item/clothing/mask/breath/vox/respirator
9898
else
9999
vox_mask = new /obj/item/clothing/mask/breath/vox
100100
H.equip_to_slot_or_del(vox_mask, ITEM_SLOT_MASK)
101101
var/obj/item/tank/internals_tank
102-
var/tank_pref = H.client?.prefs?.read_preference(/datum/preference/choiced/vox_tank_type)
102+
var/tank_pref = preference_source?.prefs?.read_preference(/datum/preference/choiced/vox_tank_type)
103103
if(tank_pref == "Large")
104104
internals_tank = new /obj/item/tank/internals/nitrogen
105105
else

0 commit comments

Comments
 (0)