Commit Graph

389 Commits

Author SHA1 Message Date
Timothy Teakettle e413fcb091 more fixes 2020-12-06 22:14:35 +00:00
timothyteakettle 0f540884eb Merge branch 'master' into loadout-json 2020-12-06 17:24:24 +00:00
Jay e1c8d669d5 Exo frame donator 2020-11-07 10:23:14 -06:00
silicons 871084f43e Merge pull request #13636 from SiliconMain/patch-11
gas masks for engi loadouts
2020-10-29 14:05:19 -07:00
silicons 0307884eab Merge pull request #13627 from Ghommie/Ghommie-cit841
Here I fix a few issues.
2020-10-28 07:53:22 -07:00
silicons 5c53a2cbe2 Merge pull request #13607 from timothyteakettle/polychrome-maid
polychromic maid outfit
2020-10-28 07:46:55 -07:00
SiliconMain 1f46248c2c Update mask.dm 2020-10-28 09:27:59 -05:00
Timothy Teakettle 0c2e1997ce more loadout 2 2020-10-25 22:49:39 +00:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
timothyteakettle 71134ed8c3 better loadout flags 2020-10-25 01:08:35 +00:00
timothyteakettle 049f153cbf works but looks weird 2020-10-21 00:55:02 +01:00
Timothy Teakettle 608e5147de Revert "Revert "add color type to all polychromics""
This reverts commit 587a2f8f19.
2020-10-20 20:05:11 +01:00
LetterJay 81d0eb5631 Update __donator.dm 2020-10-19 22:10:20 -05:00
Jay 44fa0d5387 donator vest and shirt 2020-10-19 12:30:35 -05:00
Timothy Teakettle 587a2f8f19 Revert "add color type to all polychromics"
This reverts commit 02912aa4ad.
2020-10-15 23:05:07 +01:00
Timothy Teakettle 02912aa4ad add color type to all polychromics 2020-10-15 20:57:45 +01:00
Timothy Teakettle 37030baa70 Merge remote-tracking branch 'upstream/master' into loadout-json 2020-10-15 20:05:56 +01:00
Timothy Teakettle f337061c51 more defines 2020-10-15 20:05:39 +01:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
CoreFlare 9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
Detective Google c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
EmeraldSundisk 079d4eeb58 Merge pull request #63 from EmeraldSundisk/Citadel-Station-13-master
ffs
2020-09-24 19:18:50 -07:00
EmeraldSundisk e4f0cd6a27 loadout 2020-09-23 22:27:53 -07:00
Jay 67cc7ea04e getting annoying 2020-09-19 10:02:34 -05:00
Jay efa3627460 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into customskirt 2020-09-16 11:20:43 -05:00
Jay 43ddae6542 ckey 2020-09-15 12:31:14 -05:00
Jay 05c580023d Custom atmos skirt for donator 2020-09-15 08:13:14 -05:00
LetterJay 680dee6a82 Update __donator.dm 2020-09-13 16:28:24 -05:00
Jay 511b845b75 donator 2020-09-13 15:32:09 -05:00
dapnee 45cebd8ad1 inb4 this gets denied
Removes cebu soap cause not even it can clean their stain /end edgyness
2020-08-24 16:52:06 -06:00
silicons 2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
silicons 7f942abef2 Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
2020-08-23 05:08:14 -07:00
zeroisthebiggay 8873b6b48f pathé
pathé
2020-08-22 18:29:33 -04:00
zeroisthebiggay 66e81c75f8 i have been convinced
: )
2020-08-22 18:22:43 -04:00
Timothy Teakettle 6392367df4 donator items 2020-08-18 17:28:09 +01:00
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