Commit Graph

18 Commits

Author SHA1 Message Date
Fermi
1509d9d183 Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit 135608551f, reversing
changes made to ce7e9ac452.
2019-11-24 03:04:13 +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
Seris02
468b6eb609 mining winter coat shtuff
- adds the mining winter coat to mining wardrobes and mining lockers
2019-11-17 22:27:09 +08:00
Seris02
dea5019bc9 cosmic winter coat yeeeehaw 2019-11-17 20:06:01 +08: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
Ghommie
7e4aef46d9 Unmodularize and update pAI/Intellicards very slighty. 2019-11-03 04:23:31 +01:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Trilbyspaceclone
14000502b4 Update recipes_weapon_and_ammo.dm 2019-10-21 21:07:27 -04:00
Trilbyspaceclone
2c72b91fbd Triv curb kick 2019-10-21 19:16:13 -04:00
Trilbyspaceclone
5fced4427b buffs paperwork 2019-10-21 19:05:53 -04:00
TrilbySpaceClone
1707d6e6d2 er? 2019-10-18 01:22:19 -04:00
Trilbyspaceclone
0b2c743f72 readds 2019-10-05 11:53:14 -04:00
Trilbyspaceclone
0a43c2b64d Update recipes_clothing.dm 2019-09-05 06:42:41 -04:00
TrilbySpaceClone
00c01709b2 moves banners into crafting 2019-08-26 15:46:41 -04:00
TrilbySpaceClone
44893b6ee7 It just works 2019-08-26 06:32:54 -04:00