cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-11 17:35:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds missing armor to accessories (#38800)

Browse Source
This commit is contained in:
AnturK
2018-07-01 00:04:21 +02:00
committed by Tad Hardesty
parent 1f1fb32004
commit 12f64e4637
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/clothing/under/accessories.dm
View File

@@ -28,10 +28,10 @@
pixel_y -= 8
U.add_overlay(src)
if (islist(U.armor)) // This proc can run before /obj/Initialize has run for U and src,
if (islist(U.armor) || isnull(U.armor)) // This proc can run before /obj/Initialize has run for U and src,
U.armor = getArmor(arglist(U.armor)) // we have to check that the armor list has been transformed into a datum before we try to call a proc on it
// This is safe to do as /obj/Initialize only handles setting up the datum if actually needed.
if (islist(armor))
if (islist(armor) || isnull(armor))
armor = getArmor(arglist(armor))
U.armor = U.armor.attachArmor(armor)