Commit Graph

357 Commits

Author SHA1 Message Date
kevinz000
67c857292f Aa 2020-02-27 20:09:33 -07:00
kevinz000
9bd4719c0a wrong type 2020-02-27 20:09:29 -07:00
kevinz000
995aa6cdec fix 2020-02-27 20:07:34 -07:00
kevinz000
045d5b2dbf fixes 2020-02-27 20:06:52 -07:00
kevinz000
34fbcd1dc0 fixes 2020-02-19 07:49:05 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom
f38e694673 Does it work? Yes. Does it compile? No. 2020-02-07 03:42:08 +01:00
Ghommie
2d8f85d810 A few nuisances solved. 2020-02-07 02:59:59 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
kevinz000
c345852abb Update human_movement.dm 2020-01-22 01:53:53 -07:00
kevinz000
e5759f21e3 Update human_movement.dm 2020-01-22 01:52:20 -07:00
kevinz000
afe9498ebe Update living.dm 2020-01-22 01:51:56 -07:00
kevinz000
871ae49192 Update living.dm 2020-01-22 01:12:44 -07:00
kevinz000
b47f92716e Update human_movement.dm 2020-01-22 01:07:06 -07:00
kevinz000
4a40090061 Update human_movement.dm 2020-01-22 01:00:29 -07:00
kevinz000
6e31db958c fixes 2020-01-20 12:08:18 -07:00
kevinz000
f85527ab4b Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-19 16:18:12 -07:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
kevinz000
1d184b8cad s 2020-01-16 00:21:21 -07:00
kevinz000
350c5aa060 compile 2020-01-16 00:18:40 -07:00
kevinz000
1acac87da3 compile 2020-01-15 23:54:30 -07:00
Ghommie
c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000
f1a4956afc easier for me to type 2020-01-10 13:26:34 -08:00
kevinz000
830054c106 sigh 2020-01-10 13:25:47 -08:00
kevinz000
e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000
2a304800df more reformatting 2020-01-07 11:46:32 -08:00
kevinz000
ae73927b67 patches 2020-01-07 02:39:16 -08:00
kevinz000
c77005af8a changes 2020-01-06 04:17:53 -08:00
kevinz000
a8cc37eaf0 ok 2020-01-06 03:57:58 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
kevinz000
1f2597784f git commit death 2020-01-05 15:40:23 -08:00
Ghom
3d8c329223 Kevinz, pls 2020-01-04 13:52:17 +01:00
Ghommie
686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
kevinz000
094d225874 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-31 19:54:01 -08:00
kevinz000
f920e7b73c changes 2019-12-31 10:08:14 -08:00
kevinz000
24e3b88a34 Merge remote-tracking branch 'citadel/master' into michael_labs 2019-12-30 00:32:25 -08:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Ghommie
e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie
395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Ghommie
9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Lin
42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
kevinz000
dcca9eb0d6 Merge pull request #10223 from BlackMajor/Yeehaw
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
2019-12-19 03:24:36 -07:00
Ghommie
f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 2019-12-18 19:20:38 +01:00
BlackMajor
03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
kevinz000
78e9b82eb6 trying too hard 2019-12-15 23:03:44 -07:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00