Commit Graph

274 Commits

Author SHA1 Message Date
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
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Jay
29b25841b9 FUUUUUUUUUCK v2 2019-12-21 20:58:50 -06:00
Putnam
f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Ghommie
8a7c559746 Allows ghost mentors to orbit around the target instead of changing their view to the mob's. 2019-12-13 10:45:31 +01:00
Jay
0670db4e63 initial push for a large request - DNM 2019-12-10 08:03:00 -06:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Seris02
0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Seris02
9afbabb55e removes cult coat for now, adds coats to places 2019-12-01 05:42:43 +08:00
loginsandylogout
67754daf22 Fixed 2019-11-29 10:57:51 -06:00
loginsandylogout
7ddaaea267 Cats 2019-11-29 10:56:18 -06:00
loginsandylogout
88bd7678b1 Eee 2019-11-29 10:55:00 -06:00
loginsandylogout
a608003555 Equals 2019-11-29 10:53:57 -06:00
loginsandylogout
c8bc6941eb "don't copy paste code" 2019-11-29 02:46:31 -06:00
loginsandylogout
0da35fdde5 again 2019-11-29 02:33:33 -06:00
loginsandylogout
f9d8c41c3e newline needed apparently 2019-11-29 02:32:47 -06:00
Commandersand
2c2f3ea8aa mandatory meme 2019-11-29 02:03:31 -06:00
Commandersand
60cee5814a keyholesweater 2019-11-29 01:59:34 -06:00
Commandersand
22d0dbc05b sundress and stripper 2019-11-29 01:56:47 -06:00
Commandersand
5b7bf08d10 sundress 2019-11-29 01:47:41 -06:00
Commandersand
b715c088f6 add athletic shorts to loadout 2019-11-29 01:27:15 -06:00
Commandersand
57af7ba8af add plaid skirt,multipen,fountainpen to loadout 2019-11-29 01:24:24 -06:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Winter Flare
e7523862eb Added Newspaperr to Loadout 2019-11-25 06:02:50 -05:00
Fermi
ba4fa1ef67 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE""
This reverts commit 00601a0c87.
2019-11-24 03:04:52 +00:00
Fermi
994c01c8ec Revert "Revert "Trust your insincts""
This reverts commit 82c3e3cd9d.
2019-11-24 03:04:23 +00:00
Fermi
c8b206a4cf Revert "pls"
This reverts commit 8c97511871.
2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls""
This reverts commit b23f2a4460.
2019-11-24 03:02:21 +00:00
Fermi
b23f2a4460 Revert "pls"
This reverts commit 8c97511871.
2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls
ugh
2019-11-24 02:47:52 +00:00
Fermi
82c3e3cd9d Revert "Trust your insincts"
This reverts commit 7a605b4ba6.
2019-11-24 02:44:52 +00:00
Fermi
00601a0c87 Revert "PLASE"
This reverts commit 8af225e6e3.
2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi
7a605b4ba6 Trust your insincts 2019-11-23 00:16:34 +00:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo
For "recruitment" on-station.
2019-11-17 15:08:30 +03:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290
Purging a lot of space indention in favor of tabs.
2019-11-14 15:55:04 -07:00