 kevinz000
|
5b6f95cb1e
|
shuttle hijack
|
2020-01-22 05:16:33 -07:00 |
|
|
r4d6
|
e3cb379bde
|
Add the Mining Base as a submap
|
2020-01-21 20:31:40 -05:00 |
|
|
kevinz000
|
b5ca546ac3
|
patch
|
2020-01-20 22:45:21 -07:00 |
|
|
Seris02
|
74be93a8cc
|
hasSiliconAccessInArea vars change
|
2020-01-21 11:44:49 +08: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
|
6e31db958c
|
fixes
|
2020-01-20 12:08:18 -07:00 |
|
|
Putnam
|
815b4f033d
|
made flavor things a game option + more hoard
|
2020-01-20 04:13:54 -08:00 |
|
|
Artur
|
8b21a60ac9
|
MF Line endings
|
2020-01-20 14:09:22 +02:00 |
|
|
Artur
|
f5ad854c2c
|
Conflict fix
|
2020-01-20 13:50:52 +02:00 |
|
|
Seris02
|
a100f9382e
|
better, there, happy now github
|
2020-01-20 14:51:53 +08:00 |
|
|
kevinz000
|
89e204b980
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 23:12:17 -07:00 |
|
|
Seris02
|
5524b0fa03
|
yes.
|
2020-01-20 13:00:24 +08:00 |
|
|
kevinz000
|
5d485a95c3
|
Merge remote-tracking branch 'citadel/master' into the-p-o-o-l
|
2020-01-19 20:25:51 -07:00 |
|
|
Putnam
|
06c66617e6
|
m o r e traitor objectives
|
2020-01-19 18:58:10 -08:00 |
|
|
Ghom
|
77911f9009
|
Merge pull request #10597 from Putnam3145/player-panel-can-reenter
Ghost role eligibility activation in player panel
|
2020-01-20 03:24:46 +01:00 |
|
|
kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
|
kevinz000
|
90fcb4cc14
|
initial changes
|
2020-01-19 16:13:05 -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 |
|
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
|
Ghom
|
812182230f
|
Merge pull request #10307 from Seris02/stunglasses
stunglasses
|
2020-01-19 16:35:47 +01: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 |
|
|
Putnam
|
bc5646f8b1
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-01-19 00:56:17 -08:00 |
|
|
Seris02
|
0ea3e275e3
|
yep
|
2020-01-19 16:54:46 +08:00 |
|
|
Seris02
|
25d7af31a5
|
merge fixes
|
2020-01-19 16:36:04 +08:00 |
|
|
Seris02
|
47d1f46172
|
fixes and stuff
|
2020-01-19 15:53:32 +08:00 |
|
|
Seris02
|
f54417f99e
|
fixes
|
2020-01-19 15:50:48 +08:00 |
|
|
Seris02
|
718ff58e0b
|
fixes + advanced injectors
|
2020-01-19 15:17:57 +08:00 |
|
|
Putnam
|
d287835d14
|
Made quirk blacklisting antag-sided
|
2020-01-18 21:29:27 -08:00 |
|
|
Putnam
|
3dc3f28748
|
Moved cold-blooded to negative, made it cost -2
|
2020-01-18 18:41:04 -08:00 |
|
|
Ghommie
|
072eca6ec0
|
fixes and more PRs
|
2020-01-18 23:01:00 +01: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 |
|
|
Putnam
|
95dc861ad8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into player-panel-can-reenter
|
2020-01-18 03:39:35 -08:00 |
|
|
Putnam
|
c612462b8c
|
some demodularization + new eligibility stuff
|
2020-01-18 03:39:27 -08: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
|
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
|
14aaca8fa5
|
compile
|
2020-01-16 19:18:54 -07:00 |
|
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
|
r4d6
|
ce16c91b2f
|
Code changes
|
2020-01-16 14:08:14 -05:00 |
|
|
Artur
|
1f718df41a
|
Reverts crafting changes
|
2020-01-16 14:26:36 +02:00 |
|
|
Artur
|
eb77c6b86b
|
This too
|
2020-01-16 12:57:11 +02:00 |
|
|
Artur
|
472d18403c
|
Merge remote-tracking branch 'Upstream/master' into TGUIs_Nexties
|
2020-01-16 11:38:09 +02:00 |
|
|
kevinz000
|
b22e1a1cb4
|
compile
|
2020-01-16 02:27:35 -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
|
26525b8fa7
|
s
|
2020-01-16 00:14:03 -07:00 |
|
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|