Skip to content

Commit

Permalink
Savefile and Shotgun Webbing Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Max-023 committed Sep 16, 2024
1 parent ca7535e commit a8881c3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
if(savefile_version < 27)
var/old_pref_armor
S["preferred_armor"] >> old_pref_armor
if((!old_pref_armor) in GLOB.armor_style_list)
if((!old_pref_armor in GLOB.armor_style_list))

Check warning on line 171 in code/modules/client/preferences_savefile.dm

View workflow job for this annotation

GitHub Actions / Run Linters

ambiguous `!` on left side of an `in`
preferred_armor = "Random"
S["preferred_armor"] << preferred_armor

Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/under/ties.dm
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,9 @@
/obj/item/ammo_magazine/rifle,
)

/obj/item/storage/internal/accessory/webbing/m3/shotgun
/obj/item/storage/internal/accessory/black_vest/m3/shotgun
can_hold = list(
/obj/item/ammo_magazine/handful/shotgun,
/obj/item/ammo_magazine/handful,
)

/obj/item/clothing/accessory/storage/webbing
Expand Down Expand Up @@ -1128,7 +1128,7 @@
name = "\improper M3 Pattern Shell Webbing"
desc = "A sturdy mess of synthcotton belts and buckles, ready to share your burden."
icon_state = "m3webbingshotgun"
hold = /obj/item/storage/internal/accessory/webbing/m3/shotgun
hold = /obj/item/storage/internal/accessory/black_vest/m3/shotgun

/obj/item/clothing/accessory/storage/webbing/m3
name = "\improper M3 Pattern Webbing"
Expand Down

0 comments on commit a8881c3

Please sign in to comment.