Commit Graph

254 Commits

Author SHA1 Message Date
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
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
Anonymous
837052740a Merge branch 'master' into assu
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
2019-11-13 11:59:53 +03:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
nik707
12a69dcee5 Merge pull request #9574 from r4d6/patch-4
Add departemental Winter Coats to loadout
2019-11-05 13:52:48 -06:00
Ghommie
29daa0c908 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-04 22:59:24 +01:00
r4d6
0114b7fbe2 Comment out Sec coat 2019-11-03 16:51:07 -05:00
Anonymous
537ac0f6ca Merge branch 'master' into assu 2019-11-01 19:05:53 +03:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156
Cleaning up the arousal module.
2019-10-31 17:27:03 -07:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
Jay
9d830610bb onion necklace 2019-10-27 11:52:38 -05:00
Ghommie
79c3700d25 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-25 12:42:28 +02:00
r4d6
cdb9d40bae Add departemental Winter Coats to loadout 2019-10-22 14:38:09 -04:00
Anonymous
6a73abfe32 Adds ASSU suit+helmet and loadout stuff
Also adds newlines reeeeeeeeeeee
2019-10-20 23:52:06 +03:00
Ghommie
475303bd02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-17 00:50:30 +02:00
Linzolle
1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000
11a93d41de Merge pull request #9499 from r4d6/patch-1
Add a Blindfold to the loadout list
2019-10-15 22:57:02 -07:00
r4d6
a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Jay
02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Ghommie
02df68a1cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156 2019-10-02 07:26:09 +02:00
Jay
e0b8d28386 donator item 2019-09-30 22:16:27 -05:00