Commit Graph

979 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
kevinz000
a5f06430e4 repulse armor sanity (#10949) 2020-02-16 07:36:50 +01:00
Trilbyspaceclone
661e01ca0c Update miscellaneous.dm (#11094) 2020-02-15 19:12:19 +01:00
Ghom
06d38eb3dc Merge pull request #11086 from YakumoChen/the-ring-2
Ring Improvements
2020-02-15 09:04:54 +01:00
YakumoChen
2924be6a80 now with visible rings on hand(s) 2020-02-14 03:52:10 +00:00
YakumoChen
5c246fd389 diamond ring changes
More code I stole from RP
2020-02-14 03:00:31 +00: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
Trilbyspaceclone
a8778417e4 Update standard.dm 2020-02-11 15:52:41 -05:00
Lin
4f546c90e3 Merge pull request #10982 from Ghommie/Ghommie-cit566
something about suit_digi.dmi
2020-02-10 20:24:35 +00:00
Arturlang
29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
Ghommie
98a525568f Ok. 2020-02-08 23:59:20 +01:00
Ghommie
3485d82dd0 salty digi man bad. 2020-02-08 23:58:05 +01:00
kevinz000
de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
Ghom
4cdade4b2d Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
2020-02-05 07:36:14 +01:00
Ghom
fb32b018ef Merge pull request #10838 from Owai-Seek/loadout
Minor Loadout/Outfit Changes
2020-02-02 18:07:00 +01:00
kevinz000
c94b5688db Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
2020-02-02 03:16:01 -07:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
2020-02-02 01:47:24 -07:00
kevinz000
2cdf7fa0bb Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
2020-02-02 01:46:58 -07: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
YakumoChen
74fd722871 Update ring.dm 2020-02-01 00:28:04 +00:00
YakumoChen
0020977891 this line ending shit is legitimate cancer 2020-01-31 19:05:23 -05:00
YakumoChen
c120221234 Update ring.dm 2020-01-31 23:13:58 +00:00
YakumoChen
35e16c5cd5 Update ring.dm 2020-01-31 22:58:05 +00:00
YakumoChen
6d44e59497 Update ring.dm 2020-01-31 22:56:34 +00:00
YakumoChen
65ca071eb4 linting?? 2020-01-31 14:29:40 +00:00
YakumoChen
c489571d69 Update ring.dm 2020-01-31 13:55:06 +00:00
YakumoChen
922f91b409 adds ring.dm to gloves 2020-01-31 06:34:29 -05:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
Seris02
dd09fa554f Update code/modules/clothing/shoes/magboots.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-01-31 11:54:30 +08:00
Seris02
450f33de39 fix 2020-01-31 11:46:10 +08:00
necromanceranne
43c4debb4f Repaths the formal security items into armor vest subtypes and subtypes of their respective owner's armors. Probably has some really silly balance ramifications. Oh and russian officers have armor vests now I guess. Oh and the sec wardrobe no longer has the formal suits. 2020-01-31 11:54:18 +11:00
Seris02
a415dbf31b yas 2020-01-31 08:19:35 +08:00
Seris02
88e42b2e15 *crunch crunch stomp stomp* 2020-01-30 18:07:35 +08:00
Seris02
bf47daf099 MY PRECIOUS! GONE!! GOOOOOONE!!! 2020-01-30 17:00:14 +08:00
loginsandylogout
7054e697db spacing 2020-01-30 02:07:59 -06:00
Commandersand
27c915ec75 honk 2020-01-30 02:04:48 -06:00
Seris02
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
Seris02
afb4bebf2d merge conflicts 2020-01-30 12:47:48 +08:00
Seris02
beb90d39a6 polychromic winter coat 2020-01-30 12:44:40 +08:00
Lin
cde6601c60 Merge pull request #10759 from Ghommie/Ghommie-cit534
demodularize and removes lot of unused clothing with missing sprites.
2020-01-29 19:58:26 +00:00
Seris02
1a40bec44b merge maybe fix 2020-01-29 18:45:21 +08:00
Seris02
e6f8f478d7 prototype 2020-01-29 18:43:15 +08:00
kevinz000
3bf0e1d5c4 Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
2020-01-28 17:57:26 -07:00
Ghommie
5875f2578c demodularize and removes lot of unused clothing with missing sprites. 2020-01-28 02:32:46 +01:00
Hatterhat
4db9eadaf1 drake armor deserves to be good 2020-01-24 18:16:40 -06:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
2020-01-24 16:14:32 -07:00