Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Customizable Armor #430

Open
wants to merge 125 commits into
base: master
Choose a base branch
from
Open
Changes from 8 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
0ac9b91
Da Revolva
Mar 27, 2024
b1f8fc5
Oopsiedaisies
Mar 27, 2024
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 30, 2024
e747764
Revert "Oopsiedaisies"
Mar 30, 2024
c3cee8a
Auto stash before revert of "Oopsiedaisies"
Mar 30, 2024
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Mar 31, 2024
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 3, 2024
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 5, 2024
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 7, 2024
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 8, 2024
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 10, 2024
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Apr 23, 2024
47fb185
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
May 21, 2024
cd11ccc
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 15, 2024
939b7fa
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 22, 2024
5256522
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 23, 2024
e3d4a54
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
0f33748
Fix
Aug 25, 2024
a54119c
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 25, 2024
619ba83
Merge branches 'master' and 'master' of https://github.com/PvE-CMSS13…
Aug 25, 2024
64c3fa7
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
b198276
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 27, 2024
ff918c9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 28, 2024
5b47911
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Aug 29, 2024
36a9f84
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Sep 1, 2024
0074e0b
Preliminary Work
Sep 1, 2024
7675d67
More Spritework
Sep 2, 2024
b20ca34
Even More Spritework
Sep 2, 2024
e1e22ab
Alt Pad Overlays
Sep 2, 2024
5d56847
More Pad Overlays
Sep 2, 2024
750e115
Unbelting Armors
Sep 2, 2024
90aada9
Coding Wave
Sep 2, 2024
ee1cec3
More Spritework
Sep 2, 2024
e0de796
Whoops
Sep 2, 2024
e40683f
Webbing code
Sep 3, 2024
4d4972d
More Webbing Work
Sep 3, 2024
ddc8462
More Spritework
Sep 3, 2024
e661e88
Sprite Adjustments
Sep 3, 2024
bb8afa2
Black SG and Skull Sprites
Sep 3, 2024
9147b70
Objective Complete
Sep 3, 2024
4283435
Compile Compatibility
Sep 3, 2024
228efdf
Oversight
Sep 3, 2024
0a77dfa
Drag 'n Drop Fix
Sep 3, 2024
1aa2f8f
SL Armor and Presets
Sep 3, 2024
8c197ed
Character Setup Stuff
Sep 3, 2024
37b9b76
Storage Completion
Sep 3, 2024
be3ffa8
Comma Fixes
Sep 3, 2024
085361e
Category Changes
Sep 3, 2024
b52d6b1
Camo Alts
Sep 3, 2024
25f9af6
Shading Correction
Sep 3, 2024
632e2f2
Pad Fixes
Sep 3, 2024
2c675e8
PVP Snow Uniform Compatibility
Sep 4, 2024
f784dab
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
Sep 4, 2024
819b354
Merge branch 'customizablearmor' of https://github.com/Max-023/PvE-CM…
Sep 4, 2024
7237899
Fixes
Sep 4, 2024
469e9c2
Pad Attachment
Sep 5, 2024
cd92b93
Pad Removal from Vendors
Sep 5, 2024
7fae27f
OBJ Overhaul
Sep 5, 2024
fe7fc1c
SG belt fix
Sep 5, 2024
21dcde7
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 5, 2024
78a8b12
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 9, 2024
26f127c
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 13, 2024
d735b4d
Merge remote-tracking branch 'origin/master' into customizablearmor
Sep 13, 2024
ad7e00a
Redoes everything *pain*
Sep 13, 2024
16e4cbe
No Longer Needed
Sep 13, 2024
f858e06
Fixes
Sep 13, 2024
8422f2d
Update squad_prep.dm
Max-023 Sep 13, 2024
21882c0
Update squad_prep.dm
Max-023 Sep 14, 2024
ea0a397
PvE ERT Removal
Sep 14, 2024
b5b0566
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 14, 2024
fb26c33
Desc Alterations
Sep 14, 2024
ef2f2bc
Unneeded
Sep 15, 2024
1b8b2b9
Maybe???
Sep 15, 2024
9a07a27
Honk Fix
Sep 16, 2024
e5727b3
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 16, 2024
f224a69
Savefile fix
Sep 16, 2024
bca82cd
Savefile fix
Sep 16, 2024
60e2d5e
Fix
Sep 16, 2024
091143e
Format Fix
Sep 16, 2024
ada78cc
Corpsman Vendor Hotfix
Sep 16, 2024
678b370
Typo
Sep 16, 2024
f1b49ae
Bracers, Webbing Fixes, Etc
Sep 16, 2024
d195be5
Forecon storage armor return
Sep 16, 2024
ca7535e
Forecon Corpsman
Sep 16, 2024
a8881c3
Savefile and Shotgun Webbing Fixes
Sep 16, 2024
1225dd7
Aliens: Colonial Marines
Sep 16, 2024
156e5ef
Heart!
Sep 16, 2024
fa20be1
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 16, 2024
644d5ba
Harness Fix
Sep 16, 2024
4bac4ca
Harness Fix
Sep 16, 2024
dacfff9
Smartgunner Skull
Sep 16, 2024
d308ec7
Snow Sprite Fixes
Sep 16, 2024
d6ff2b7
Corpsman Paint
Sep 18, 2024
30c9e48
Whoopsie Poopsie
Sep 18, 2024
70cbfcd
Movie Accurate M10s And Minor Tweaks
Sep 18, 2024
08a212b
Override Fixes
Sep 18, 2024
b44325a
Removes Herobrine
Sep 18, 2024
341902d
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 18, 2024
36e3dd5
Fixes
Sep 18, 2024
afeeb24
UA FLAG, HOORAH
Sep 18, 2024
b3ffc14
Flag Fixes
Sep 18, 2024
194ad3b
Garb Fixes
Sep 18, 2024
b848fa8
Forecon Stuff
Sep 20, 2024
8519d18
Typos and OBJs
Sep 20, 2024
60c52e0
Errors
Sep 20, 2024
4fdde22
Whoops
Sep 20, 2024
bf393a3
Krill Issue
Sep 20, 2024
8b938c6
IM GONNA KRILL MYSELF
Sep 20, 2024
c5c04c8
SG Stuff
Sep 20, 2024
b0f9617
Finishing SG Stuff
Sep 20, 2024
ce9ccc5
Headset Fix
Sep 20, 2024
91ac64c
MARSOC more like DEADSOC
Sep 21, 2024
468629a
Lamp Fixes
Sep 21, 2024
3c0f38c
SG Armor Fix
Sep 21, 2024
ed4a1dd
Garb Fix
Sep 21, 2024
f334fa7
Mag Harness Fix
Sep 21, 2024
3766c8b
Clean up 1
Sep 21, 2024
ad45204
Clean up 2
Sep 21, 2024
40f8213
Lore
Sep 21, 2024
6eedad9
Update code/modules/projectiles/gun_helpers.dm
Max-023 Sep 22, 2024
cdeee70
Merge remote-tracking branch 'PvE-CMSS13/master'
Sep 24, 2024
5df048d
Belt.dmi Fix
Sep 24, 2024
2b6b378
Winter Helmet Cams
Sep 24, 2024
d6f166d
Officer Cap OBJ Fix
Sep 27, 2024
6f82ae1
Merge remote-tracking branch 'origin/master' into customizablearmor
Sep 28, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions code/modules/client/preferences_savefile.dm
Original file line number Diff line number Diff line change
Expand Up @@ -664,6 +664,12 @@
backbag = sanitize_integer(backbag, 1, length(GLOB.backbaglist), initial(backbag))
preferred_armor = sanitize_inlist(preferred_armor, GLOB.armor_style_list, "Random")
//b_type = sanitize_text(b_type, initial(b_type))
var/old_pref_armor
S["preferred_armor"] >> old_pref_armor

if(!old_pref_armor in GLOB.armor_style_list)

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

View workflow job for this annotation

GitHub Actions / Run Linters

ambiguous `!` on left side of an `in`
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in is goofy as it is much later in the order of operations than you'd think. The ! executes first so it becomes FALSE in GLOB.armor_style_list.
can read more here: https://www.byond.com/docs/ref/#/operator/in

Suggested change
if(!old_pref_armor in GLOB.armor_style_list)
if(!(old_pref_armor in GLOB.armor_style_list))

preferred_armor = "Random"
S["preferred_armor"] << preferred_armor

platoon_name = platoon_name ? sanitize_text(platoon_name, initial(platoon_name)) : "Sun Riders"
dropship_camo = sanitize_inlist(dropship_camo, GLOB.dropship_camos, initial(dropship_camo))
Expand Down
Loading