-
Notifications
You must be signed in to change notification settings - Fork 92
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
Max-023
wants to merge
125
commits into
cmss13-devs:master
Choose a base branch
from
Max-023:customizablearmor
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+862
−763
Open
Customizable Armor #430
Changes from 8 commits
Commits
Show all changes
125 commits
Select commit
Hold shift + click to select a range
0ac9b91
Da Revolva
b1f8fc5
Oopsiedaisies
2803a43
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
e747764
Revert "Oopsiedaisies"
c3cee8a
Auto stash before revert of "Oopsiedaisies"
6c995e9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
763913d
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
0fae340
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
49133af
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
4e9b759
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
807e1ae
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
2aa51ac
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
47fb185
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
cd11ccc
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
939b7fa
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
5256522
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
e3d4a54
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
0f33748
Fix
a54119c
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
619ba83
Merge branches 'master' and 'master' of https://github.com/PvE-CMSS13…
64c3fa7
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
b198276
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
ff918c9
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
5b47911
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
36a9f84
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
0074e0b
Preliminary Work
7675d67
More Spritework
b20ca34
Even More Spritework
e1e22ab
Alt Pad Overlays
5d56847
More Pad Overlays
750e115
Unbelting Armors
90aada9
Coding Wave
ee1cec3
More Spritework
e0de796
Whoops
e40683f
Webbing code
4d4972d
More Webbing Work
ddc8462
More Spritework
e661e88
Sprite Adjustments
bb8afa2
Black SG and Skull Sprites
9147b70
Objective Complete
4283435
Compile Compatibility
228efdf
Oversight
0a77dfa
Drag 'n Drop Fix
1aa2f8f
SL Armor and Presets
8c197ed
Character Setup Stuff
37b9b76
Storage Completion
be3ffa8
Comma Fixes
085361e
Category Changes
b52d6b1
Camo Alts
25f9af6
Shading Correction
632e2f2
Pad Fixes
2c675e8
PVP Snow Uniform Compatibility
f784dab
Merge branch 'master' of https://github.com/PvE-CMSS13/PvE-CMSS13
819b354
Merge branch 'customizablearmor' of https://github.com/Max-023/PvE-CM…
7237899
Fixes
469e9c2
Pad Attachment
cd92b93
Pad Removal from Vendors
7fae27f
OBJ Overhaul
fe7fc1c
SG belt fix
21dcde7
Merge remote-tracking branch 'PvE-CMSS13/master'
78a8b12
Merge remote-tracking branch 'PvE-CMSS13/master'
26f127c
Merge remote-tracking branch 'PvE-CMSS13/master'
d735b4d
Merge remote-tracking branch 'origin/master' into customizablearmor
ad7e00a
Redoes everything *pain*
16e4cbe
No Longer Needed
f858e06
Fixes
8422f2d
Update squad_prep.dm
Max-023 21882c0
Update squad_prep.dm
Max-023 ea0a397
PvE ERT Removal
b5b0566
Merge remote-tracking branch 'PvE-CMSS13/master'
fb26c33
Desc Alterations
ef2f2bc
Unneeded
1b8b2b9
Maybe???
9a07a27
Honk Fix
e5727b3
Merge remote-tracking branch 'PvE-CMSS13/master'
f224a69
Savefile fix
bca82cd
Savefile fix
60e2d5e
Fix
091143e
Format Fix
ada78cc
Corpsman Vendor Hotfix
678b370
Typo
f1b49ae
Bracers, Webbing Fixes, Etc
d195be5
Forecon storage armor return
ca7535e
Forecon Corpsman
a8881c3
Savefile and Shotgun Webbing Fixes
1225dd7
Aliens: Colonial Marines
156e5ef
Heart!
fa20be1
Merge remote-tracking branch 'PvE-CMSS13/master'
644d5ba
Harness Fix
4bac4ca
Harness Fix
dacfff9
Smartgunner Skull
d308ec7
Snow Sprite Fixes
d6ff2b7
Corpsman Paint
30c9e48
Whoopsie Poopsie
70cbfcd
Movie Accurate M10s And Minor Tweaks
08a212b
Override Fixes
b44325a
Removes Herobrine
341902d
Merge remote-tracking branch 'PvE-CMSS13/master'
36e3dd5
Fixes
afeeb24
UA FLAG, HOORAH
b3ffc14
Flag Fixes
194ad3b
Garb Fixes
b848fa8
Forecon Stuff
8519d18
Typos and OBJs
60c52e0
Errors
4fdde22
Whoops
bf393a3
Krill Issue
8b938c6
IM GONNA KRILL MYSELF
c5c04c8
SG Stuff
b0f9617
Finishing SG Stuff
ce9ccc5
Headset Fix
91ac64c
MARSOC more like DEADSOC
468629a
Lamp Fixes
3c0f38c
SG Armor Fix
ed4a1dd
Garb Fix
f334fa7
Mag Harness Fix
3766c8b
Clean up 1
ad45204
Clean up 2
40f8213
Lore
6eedad9
Update code/modules/projectiles/gun_helpers.dm
Max-023 cdeee70
Merge remote-tracking branch 'PvE-CMSS13/master'
5df048d
Belt.dmi Fix
2b6b378
Winter Helmet Cams
d6f166d
Officer Cap OBJ Fix
6f82ae1
Merge remote-tracking branch 'origin/master' into customizablearmor
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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 becomesFALSE in GLOB.armor_style_list
.can read more here: https://www.byond.com/docs/ref/#/operator/in