 kevinz000
|
ac6695bd68
|
Merge pull request #10679 from Ghommie/Ghommie-cit517
neuter/plural gender fixes.
|
2020-01-24 16:15:44 -07:00 |
|
|
Ghommie
|
f6beadb494
|
missed this little one.
|
2020-01-24 23:45:50 +01:00 |
|
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
|
Ghommie
|
856ef236f3
|
Further runtime fixes by AnturK.
|
2020-01-24 23:01:30 +01:00 |
|
|
Putnam
|
847b3c0a09
|
Fixed flavor objectives and added more.
|
2020-01-24 10:46:07 -08:00 |
|
|
Putnam
|
11b5881721
|
wait no this should be 2
|
2020-01-24 09:15:43 -08:00 |
|
|
Putnam
|
0493db0ac6
|
allowed dojo banning, made dojo mobs dust upon leaving
|
2020-01-24 09:11:33 -08:00 |
|
|
kevinz000
|
831ac91917
|
Merge pull request #10073 from Ghommie/Ghommie-cit435
Ports timestop and sepia extracts improvements/tweaks.
|
2020-01-24 00:25:53 -07:00 |
|
|
kevinz000
|
f8ec01676a
|
Merge pull request #10609 from Putnam3145/cold-blooded-buff
Moved cold-blooded to negative, made it cost -2
|
2020-01-24 00:22:08 -07:00 |
|
|
Ghommie
|
1ba4c19c64
|
A couple more.
|
2020-01-24 03:50:44 +01:00 |
|
|
Ghommie
|
78934c52fe
|
A handful of runtime fixes.
|
2020-01-24 02:27:06 +01:00 |
|
|
kevinz000
|
e7bf1738cd
|
ok putnom
|
2020-01-23 18:00:33 -07:00 |
|
|
kevinz000
|
5cbe2226e1
|
Merge remote-tracking branch 'citadel/master' into hijack
|
2020-01-23 17:15:49 -07:00 |
|
|
Ghommie
|
56d31b0c8c
|
neuter/plural gender fixes.
|
2020-01-23 22:50:30 +01:00 |
|
|
Seris02
|
5499638c5e
|
yes
|
2020-01-23 15:41:49 +08:00 |
|
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
|
Ghom
|
047059617c
|
Merge pull request #10645 from r4d6/Modular-Lavaland
Modularize the mining base
|
2020-01-23 02:53:34 +01:00 |
|
|
kevinz000
|
cd0fc537b6
|
lgoic
|
2020-01-22 16:03:56 -07:00 |
|
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
|
kevinz000
|
ccb5d32ab2
|
varnames
|
2020-01-22 05:38:09 -07:00 |
|
|
kevinz000
|
ff98fe7bf5
|
update
|
2020-01-22 05:35:21 -07:00 |
|
|
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 |
|
|
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 |
|
|
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
|
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 |
|
|
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 |
|