Commit Graph

17 Commits

Author SHA1 Message Date
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Kraseo
9da493b483 i genuinely do not like anything robustin has ever touched in his lifetime 2020-02-27 02:28:13 +01:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
Ghom
506f1199ad I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry 2020-02-09 02:56:17 +01:00
Ghom
ea9bdcd087 Update gangs.dm 2020-02-09 02:49:20 +01:00
Trilbyspaceclone
90a1b249f1 Update gangs.dm 2020-02-08 20:39:45 -05:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Ghommie
95db5084ab Screw commit history. 2020-02-02 01:26:04 +01:00
kevinz000
0e1c46150f Merge pull request #10767 from KeRSedChaplain/gangnerf
Removes stim packs from gangs
2020-01-29 16:24:51 -07:00
KeRSe
9c18d4fdad makes stimulants no longer purchasable by gangs 2020-01-28 15:53:29 -05:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Ghommie
5644617786 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450 2020-01-20 20:59:38 +01:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie
563a0fef3c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit390 2019-12-13 02:45:53 +01:00
Ghommie
0ac188bde9 Unmodularize gamemodes folder. 2019-11-22 05:00:53 +01:00