Commit Graph

333 Commits

Author SHA1 Message Date
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
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
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
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
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote
No adrenals for borgs please
2019-12-12 23:50:34 -06:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Lin
9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
2019-12-10 23:52:31 +00:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Ghommie
542c9007ee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-06 20:09:35 +01:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Putnam3145
8da17c5aaf Merge pull request #9946 from Citadel-Station-13/kevinz000-patch-117
Removes hyperspeed from light pink stabilized for -4.5 stam/tick + free sprint
2019-12-01 23:12:35 -08:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Ghommie
af0110db40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-11-27 21:16:20 +01:00
Ghommie
f9680130f9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-27 18:48:20 +01:00
Ghommie
d43d996c38 ouch 2019-11-27 06:19:17 +01:00
Ghommie
c67f138d23 patching some combat mode edge cases and issues. 2019-11-27 06:10:08 +01:00
kevinz000
2bb1e93d05 Update human_movement.dm 2019-11-25 22:53:56 -07:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Ghommie
911a33bfd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit387 2019-11-21 06:36:59 +01:00
Ghommie
dccb3c2e22 part 3 2019-11-21 06:36:22 +01:00
kevinz000
8df8acb1b7 Merge pull request #9811 from Ghommie/Ghommie-cit353
Dreamchecker compatibility changes, part 2.
2019-11-20 21:49:58 -07:00
Ghommie
21f15e411d Part 3 2019-11-19 19:34:42 +01:00
BlackMajor
d4f6bc67ca Whoops that cansprint is in the wrong place 2019-11-19 22:41:39 +13:00
BlackMajor
1b1ed21f42 No adrenals for borgs please 2019-11-19 22:13:22 +13:00
Ghommie
bddb437872 It works now. 2019-11-18 18:30:46 +01:00
Ghommie
f401e622c3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-11-15 01:01:08 +01:00
Ghommie
358db4f390 Dreamchecker compatibility changes, part 2. 2019-11-14 14:54:12 +01:00