cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes random gear sometimes not spawning (#7388)

Browse Source
This commit is contained in:
Matt Atlas
2019-11-17 17:43:44 +01:00
committed by Erki
parent ca7d8aac1a
commit 663df76364
2 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
code/controllers/subsystems/job.dm
View File

@@ -754,7 +754,12 @@
if(G.slot && !(G.slot in custom_equip_slots))
// This is a miserable way to fix the loadout overwrite bug, but the alternative requires
// adding an arg to a bunch of different procs. Will look into it after this merge. ~ Z
var/metadata = prefs.gear[G.display_name]
var/metadata
var/list/gear_test = prefs.gear[G.display_name]
if(gear_test?.len)
metadata = gear_test
else
metadata = list()
var/obj/item/CI = G.spawn_item(null,metadata)
if (G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
if (leftovers)
@@ -787,7 +792,12 @@
if (G.slot in used_slots)
. += thing
else
var/metadata = prefs.gear[G.display_name]
var/metadata
var/list/gear_test = prefs.gear[G.display_name]
if(gear_test?.len)
metadata = gear_test
else
metadata = list()
var/obj/item/CI = G.spawn_item(H, metadata)
if (H.equip_to_slot_or_del(CI, G.slot))
to_chat(H, "<span class='notice'>Equipping you with [thing]!</span>")
@@ -813,7 +823,12 @@
for (var/thing in items)
to_chat(H, "<span class='notice'>Placing \the [thing] in your [B.name]!</span>")
var/datum/gear/G = gear_datums[thing]
var/metadata = prefs.gear[G.display_name]
var/metadata
var/list/gear_test = prefs.gear[G.display_name]
if(gear_test?.len)
metadata = gear_test
else
metadata = list()
G.spawn_item(B, metadata)
Debug("EIS/([H]): placed [thing] in [B].")