 Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
|
Putnam
|
cc1fcee4ac
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
|
2020-01-19 03:56:41 -08:00 |
|
|
Seris02
|
47d1f46172
|
fixes and stuff
|
2020-01-19 15:53:32 +08:00 |
|
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
|
Ghom
|
d709edb1c2
|
Merge pull request #10578 from r4d6/Mining
Port TG's Mining changes
|
2020-01-18 20:32:14 +01:00 |
|
|
Seris02
|
fdf3871cb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-18 18:30:51 +08:00 |
|
|
Seris02
|
04b34ec8ed
|
hijack implant
|
2020-01-18 18:04:31 +08:00 |
|
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
Artur
|
6500d0d9a9
|
Fixes ghost role descriptions
|
2020-01-16 13:43:21 +02:00 |
|
|
kevinz000
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|
|
Putnam
|
c7e3b167e2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into one-more-dojo-tweak
|
2020-01-12 17:40:26 -08:00 |
|
|
Putnam
|
bb0d012d7a
|
well that works
|
2020-01-12 16:08:49 -08:00 |
|
|
Ghommie
|
9dad810edf
|
Merge branch 'Ghommie-cit492' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:11:02 +01:00 |
|
|
Ghommie
|
b2ab8959f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit492
|
2020-01-12 23:00:05 +01:00 |
|
|
kevinz000
|
b341818f04
|
mobility flags
|
2020-01-12 11:00:12 -08: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 |
|
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|
|
Ghom
|
5dc598e2ea
|
Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
|
2020-01-11 15:03:45 +01:00 |
|
|
Putnam
|
312da86424
|
Suggested changes
|
2020-01-11 01:28:49 -08:00 |
|
|
Lin
|
147d948ad8
|
Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
|
2020-01-10 23:55:07 +00:00 |
|
|
kevinz000
|
b6e14c6b86
|
compile
|
2020-01-10 14:30:20 -08:00 |
|
|
kevinz000
|
2c245a18fd
|
compile
|
2020-01-10 13:43:53 -08:00 |
|
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
kevinz000
|
52a0f5779d
|
Update tables_racks.dm
|
2020-01-09 15:20:57 -08:00 |
|
|
kevinz000
|
dbd2cb6195
|
Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
|
2020-01-08 13:31:55 -08:00 |
|
|
kevinz000
|
b68f81f4e6
|
Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
|
2020-01-08 13:30:37 -08:00 |
|
|
Putnam
|
19887691f3
|
added deadchat toggle to dojo mobs too
|
2020-01-07 04:39:04 -08:00 |
|
|
Seris02
|
5fae814e42
|
did it thanks
|
2020-01-07 17:52:46 +08:00 |
|
|
Putnam
|
6f6f0cbb62
|
Tweaks to ghost dojo
|
2020-01-06 23:33:29 -08:00 |
|
|
Lin
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
Lin
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|
|
Ghommie
|
1afd3d76cb
|
Fixes lattice's examine.
|
2020-01-06 01:18:11 +01:00 |
|
|
Ghom
|
e18244671f
|
Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
|
2020-01-05 23:05:13 +01:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
Ghom
|
1a834edd5f
|
f
|
2020-01-05 21:27:04 +01:00 |
|
|
Ghom
|
07a5f052d3
|
Merge pull request #10400 from chefferz/chefferz-toiletshuttle
Gives ability to buckle yourself to a toilet
|
2020-01-04 14:25:54 +01:00 |
|