shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,699 Commits 5 Branches 0 Tags
49941ea2e675ee2a9ce54e4fa4e4159a48ca89e1
Commit Graph

255 Commits

Author SHA1 Message Date
silicons 267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Timothy Teakettle c3d490a803 very cool 2020-07-12 20:15:57 +01:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
Anonymous 9e7b884e86 Adds remaining TOSOrvikepi 2020-06-21 13:25:23 +03:00
Anonymous 45dab7fa66 Kepi and Orvilike Kepi 2020-06-20 22:52:33 +03:00
YakumoChen 2473308b4d Adds polychrome uniforms to loadout / kinkmate (#12506) 
* adds revealing poly outfits to kinkmate

* Using unused poly uniforms

* adds polychrome to kinkmate
 2020-06-12 17:07:48 -07:00
NopemanMcHalt e5bc651140 Station has a crew loose (Adds Orville-inspired(?) uniform) (#12447) 
* Station has a crew loose

Also adds paramedic to the MedSci Trekkie list
And allows chaplain to wear UniFed Service uniform

* hotfix for digi ops
 2020-06-08 09:14:19 -07:00
Ghommie a84e7bcecc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-24 04:00:51 +02:00
Lin 4ee5d0cb37 Merge pull request #12296 from kevinz000/paracoat 
Adds a paramedic wintercoat
 2020-05-21 19:26:31 +00:00
SiliconMain 1f4340103e Update suit.dm 2020-05-18 07:06:21 -05:00
Ghom 20ac2f26f4 Demodularizing the gear loadout code a little. (#12261) 2020-05-18 04:45:50 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Anonymous d61c0dc155 KHAAAAAAAAAAN!! 
Adds TMP enlist, trainee and service uniforms.
Also fixes inaccurate restricted description for existing trek loadout.
 2020-04-17 10:53:43 +03:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01: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 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
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
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
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
Unknown 6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
Unknown 0b02439b08 Puts an end to the Christmas Menace 2020-01-02 03:53:04 -07: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
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