Commit Graph

964 Commits

Author SHA1 Message Date
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
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
Ghommie 856ef236f3 Further runtime fixes by AnturK. 2020-01-24 23:01:30 +01:00
Unknown bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
r4d6 869e31b27b Removing useless code 2020-01-22 13:17:47 -05:00
r4d6 96c0a86b5f Make the Radiation Hardsuit a Voidsuit instead 2020-01-22 13:17:29 -05:00
kevinz000 65eaf9787a Merge pull request #10097 from Ghommie/Ghommie-cit444
Made traitor kevlar/armor padding accessories examine-proof.
2020-01-19 16:58:27 -07:00
Seris02 25d7af31a5 merge fixes 2020-01-19 16:36:04 +08: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
r4d6 f7791c3db7 Hopefully help travis 2020-01-15 17:27:09 -05:00
r4d6 e685c3fc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit 2020-01-15 17:15:21 -05:00
Ghom 7b34daae48 Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
2020-01-15 15:51:15 +01:00
Hatterhat 7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Trilbyspaceclone 5351bc9f8a Update miscellaneous.dm 2020-01-14 19:15:35 -05:00
Ghom 5dee355381 Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
2020-01-15 00:47:38 +01: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