Commit Graph

193 Commits

Author SHA1 Message Date
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Trilbyspaceclone
551a2593d4 Update color.dm 2020-02-12 14:28:57 -05:00
Trilbyspaceclone
1b06506209 Update color.dm 2020-02-11 15:54:37 -05:00
Winter Flare
599185654f Rename, Add item to Loadout
Renamed scrubs based on color, added Mailman Hat to loadout.
2020-01-31 21:54:21 -05:00
loginsandylogout
7054e697db spacing 2020-01-30 02:07:59 -06:00
Commandersand
27c915ec75 honk 2020-01-30 02:04:48 -06:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Unknown
bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
Ghommie
224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
Hatterhat
7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Ghommie
26d6e7f05c Work. 2020-01-14 22:04:38 +01:00
Ghommie
3984943b0d [s] makes master compile. 2020-01-14 20:02:26 +01:00
Ghom
03ebab6ec5 Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
2020-01-14 18:24:50 +01:00
Hatterhat
7fac15caeb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform 2020-01-12 12:39:57 -06:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Hatterhat
47fd3823e8 staff assistant jumpsuit gang 2020-01-11 15:58:24 -06:00
Lin
c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00:00
loginsandylogout
709a803f19 oops 2020-01-08 23:34:43 -06:00
loginsandylogout
02541f1e3e thisis it 2020-01-08 23:34:26 -06:00
loginsandylogout
725828b996 fixes ti? 2020-01-08 22:52:47 -06:00
loginsandylogout
248785dc94 aaa 2020-01-08 22:45:23 -06:00
loginsandylogout
20948b66bb should hide legs 2020-01-08 22:45:23 -06:00
Commandersand
11aab54864 oops 2020-01-08 22:45:23 -06:00
Commandersand
c2a8c23751 fixes 2020-01-08 22:45:22 -06:00
Hatterhat
186194418e tg 43454+43688 port, tweaks w/ trilby, db crate 2020-01-04 01:33:32 -06:00
Ghommie
80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Commandersand
6b6ef569c2 fix 2019-12-27 12:14:46 -06:00
Commandersand
45e6cca8b8 clothing add 2019-12-27 11:53:57 -06:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Michiyamenotehifunana
0b2568a9cf Modernizes Polychromic Uniform Code
No more modular_citadel, but the neck polychrome crap needs more work in another PR
2019-12-21 21:38:04 +08:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
Ghommie
3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie
8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Ghommie
f83d1c4763 Made kevlar and armor padding accessories inconspicious and examine-proof. 2019-12-07 10:53:10 +01:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Ghommie
4a3a7c841a Removes literally atrocious polka dotted accessories. 2019-11-28 03:54:38 +01:00
TrilbySpaceClone
2136968585 Ring ring 2019-11-21 21:55:17 -05:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
kevinz000
5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235
Fixes the "gear" harness.
2019-10-29 21:37:11 -07:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
ee0c436651 legs 2019-10-22 09:17:37 +02:00
Ghommie
8cd93f2085 bad. 2019-10-20 07:28:04 +02:00