Commit Graph

272 Commits

Author SHA1 Message Date
lolman360
50448549fb ee 2020-08-09 15:26:08 +10:00
silicons
65839060c9 Fixes 2020-08-06 23:39:57 -07:00
silicons
3640a33ff6 e 2020-08-06 23:22:53 -07:00
silicons
8edb374a20 sigh 2020-08-06 23:09:02 -07:00
Timothy Teakettle
b5a16d8945 MORE CLOTHES 2020-07-29 18:20:46 +01:00
Timothy Teakettle
31963b32a4 subcategories cool 2020-07-29 17:14:07 +01:00
timothyteakettle
c15d0de20d subcategories work 2020-07-29 03:57:16 +01:00
Timothy Teakettle
721e018aec loadout stuff 2020-07-28 22:52:00 +01:00
silicons
cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion
Ports RP flannel jackets and a winter coat
2020-07-28 10:45:54 -07:00
zerothebigboy
ef720c3481 a 2020-07-27 01:37:56 -04:00
zerothebigboy
df31d90c1b a 2020-07-27 01:37:47 -04:00
zerothebigboy
9fbcd21af6 a 2020-07-27 00:36:38 -04:00
zerothebigboy
e30a60d0ba a 2020-07-26 23:42:40 -04:00
silicons
c4ec1dfdc1 Update neck.dm 2020-07-24 20:50:52 -07:00
silicons
c3be76b529 Update neck.dm 2020-07-24 19:32:51 -07:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent
maid fetish content pr
2020-07-21 19:20:52 -07:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
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