shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,548 Commits 5 Branches 0 Tags
34fbcd1dc04cf3340bbd30bc6f4bd11904142240
Commit Graph

311 Commits

Author SHA1 Message Date
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
Ghommie
0eb5aa0a2a Removing a couple troublesome NSFW unused prefs. 2020-02-04 04:58:09 +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
c3ca884273 Moved Nurse Stuff below Scrubs 2020-01-31 23:08:31 -05:00
Winter Flare
847946bfe3 Fix cause I'm dumb 2020-01-31 22:53:27 -05:00
Winter Flare
12c0e475d8 Add Nurse Stuff to Loadout, fixes. 2020-01-31 22:36:25 -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
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
YakumoChen
9ba8a0e8e0 empty line 2020-01-31 14:15:59 +00:00
YakumoChen
babeea0b28 empty line 2020-01-31 14:15:38 +00:00
YakumoChen
77f6074c67 adds rings to loadout 2020-01-31 08:56:20 -05:00
Seris02
52e86a1ad6 yeet 2020-01-31 13:13:06 +08:00
Seris02
924d8a676c fixes kevinz error 2020-01-31 10:07:01 +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
dbb6218e0d merp 2020-01-30 14:54:07 +08:00
Lin
15f36fab60 Merge pull request #10763 from Citadel-Station-13/cosmosbedsheet 
Adds cosmic bedsheet to loadout for donator
 2020-01-29 19:43:01 +00:00
kevinz000
3de59b75fa Merge pull request #10678 from Ghommie/Ghommie-cit516 
Stops the donor patriotic cape from being considered a bed sheet.
 2020-01-28 17:58:07 -07:00
Jay
7171b661d1 Adds cosmic bedsheet to loadout for donator 2020-01-27 22:15:00 -06:00
kevinz000
ea9513864d Merge pull request #10674 from Xantholne/lunar01 
Culturally Appropriate Lunar Clothes
 2020-01-24 16:14:32 -07:00
Ghommie
52d5074051 Stops the patriotic cape from being considered a bed sheet. 2020-01-23 18:19:31 +01:00
Unknown
bd8ce9a7b6 Culturally Appropriate Lunar Clothes 2020-01-23 06:35:50 -07:00
Arturlang
0d8a0e4963 Hah..... 2020-01-22 18:12:04 +01:00
Arturlang
aeb3a2f971 Update backpack.dm 2020-01-22 18:07:43 +01:00
Arturlang
53d80b2ef8 Initial Commit 2020-01-22 17:55:09 +01:00
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08:00
Hatterhat
7b322ff467 Merge branch 'master' into greytide-standard-uniform 2020-01-14 19:39:16 -06:00
Hatterhat
3622dd118b forgive me, grey jumpsuit entry 2020-01-14 19:38:11 -06:00
Xantholne
903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07: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
Hatterhat
7216ae545c how the hell did that fall out 2020-01-11 16:08:51 -06:00
Hatterhat
47fd3823e8 staff assistant jumpsuit gang 2020-01-11 15:58:24 -06:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Unknown
6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Unknown
0b02439b08 Puts an end to the Christmas Menace 2020-01-02 03:53:04 -07:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000
7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459 
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
 2019-12-30 00:17:46 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
Commandersand
60905cc09b loadout 2019-12-27 12:44:08 -06:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Lin
9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator 
Donator Item - Ready For Review
 2019-12-23 05:29:06 +00:00
LetterJay
98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:10 -06:00
LetterJay
28e909ad74 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:05 -06:00
LetterJay
1d933dd0f3 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:00 -06:00
LetterJay
4def28ddf9 Update __donator.dm 2019-12-22 14:16:40 -06:00