Commit Graph

154 Commits

Author SHA1 Message Date
kevinz000
a0ecf85e4b Update conveyor2.dm 2020-06-16 08:27:58 -07:00
Ghom
335f5a37b9 Plane adjustments on several low layer objects. (#12286) 2020-05-17 17:02:57 -07:00
Ghommie
42201343a9 Backward 512 compatibility removal. 2020-04-23 00:59:23 +02:00
Winter Flare
8e3f48a761 Reduces (or gives) weight classes to several items. 2020-04-19 17:13:19 -04:00
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
kevinz000
93d995eb18 k 2020-03-06 10:13:11 -07:00
kevinz000
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghom
fdbef6a93c Update bin.dm 2020-02-13 13:10:36 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Artur
fe92573fc3 Forgot this 2020-02-02 13:44:44 +01:00
Artur
e7ddfdd8d8 Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties 2020-02-02 13:31:54 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Artur
db36a90e35 Fixes. 2020-01-30 19:23:38 +01:00
kevinz000
611fd7ea89 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-27 23:35:35 -07:00
Artur
e360ac1d36 Conflict fix 2020-01-24 23:06:32 +01:00
Artur
f5ad854c2c Conflict fix 2020-01-20 13:50:52 +02:00
Seris02
ab771d9505 I deleted an important thing 2020-01-20 15:48:55 +08:00
Seris02
afd848e45a weh 2020-01-20 10:29:09 +08: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
Artur
d04c09aba0 Compiles, just need to fix goonchat 2020-01-15 09:44:03 +02:00
Artur
8b8a112d2c Ohkay 2020-01-15 09:41:33 +02: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
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08: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
Lin
f7b91f9b65 Merge pull request #10238 from Ghommie/Ghommie-cit478
Brings in some mapping code updates.
2020-01-03 00:01:54 +00:00
Ghommie
d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghom
a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +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
Ghommie
8566e2396d Brings in some mapping code updates. 2019-12-19 00:44:14 +01:00
kevinz000
ded283fa55 Update conveyor2.dm 2019-12-11 14:41:58 -07:00
kevinz000
20defaba8e Update conveyor2.dm 2019-12-08 21:46:53 -07: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
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +01:00
lolman360
dc1c17226d Merge branch 'master' into HeadCorgi 2019-11-28 08:45:19 +11:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
lolman360
216790d442 Merge branch 'master' into HeadCorgi 2019-11-22 21:54:05 +11:00
Ghommie
dd101ef221 Part 2 2019-11-19 18:00:56 +01:00
lolman360
4d71f95b16 Merge branch 'master' into HeadCorgi 2019-11-17 12:24:04 +11:00
lolman360
aed866339f pickup pickup pickup pickup 100% pickup 2019-11-17 12:00:17 +11:00
GrayRachnid
3edaf75722 Ports the Saboteur borg for nukeops and ports new cyborg tool icons and cyborg taser/laser icons. 2019-11-15 16:58:45 -05:00
Ghommie
6484eea339 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-11-15 00:36:50 +01:00
kevinz000
6909857e04 Merge pull request #9632 from Ghommie/Ghommie-cit281
Porting multi-z support updates.
2019-11-14 15:58:53 -07:00
Ghommie
592d1a4b54 Unmodularize cargo console, disposal bin, lighting bulbs/tubes and alien nest ruin. 2019-11-03 01:55:59 +01:00
Ghommie
5fcf5b1c5e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-10-29 13:38:16 +01:00
Ghommie
4aa1d55abb Porting multi-z support updates. 2019-10-27 16:32:32 +01:00
Ghommie
2c578ca683 Ports move force and move resist, movement/pushing/pulling tweaks & co. 2019-10-24 18:01:46 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
4855474955 Making sure altdisarm() works as intended. 2019-10-02 19:39:23 +02:00