Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
Artur
|
e360ac1d36
|
Conflict fix
|
2020-01-24 23:06:32 +01:00 |
|
Artur
|
255f2ce449
|
Testmerge Conflict fix?
|
2020-01-22 20:17:42 +01:00 |
|
Ghom
|
7a3f0d140c
|
Merge pull request #10468 from Citadel-Station-13/stop-ghosting
ghosting no longer makes it so you don't count for abductors
|
2020-01-21 02:26:25 +01: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 |
|
Lin
|
cd8e83e7c0
|
Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
|
2020-01-10 23:56:46 +00:00 |
|
Seris02
|
c7790aba1a
|
moves observe to ghost tab
|
2020-01-09 10:46:18 +08:00 |
|
kevinz000
|
5f7f1b09f3
|
Update observer.dm
|
2020-01-07 02:41:05 -08:00 |
|
kevinz000
|
b9260a62df
|
Update observer.dm
|
2020-01-07 02:16:52 -08:00 |
|
kevinz000
|
5975f4c17d
|
Update observer.dm
|
2020-01-07 02:12:47 -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 |
|
Putnam
|
71fcd23f1f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole
|
2019-12-30 13:31:15 -08:00 |
|
Seris02
|
9653dc470b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc
|
2019-12-30 22:48:39 +08:00 |
|
Putnam
|
90ebbdfdb9
|
elements are so good. they're so good
|
2019-12-30 00:53:03 -08:00 |
|
Putnam3145
|
640419eed5
|
Merge pull request #10343 from Ghommie/Ghommie-cit494
[s] Fixes anti-ghost-role vars a little.
|
2019-12-29 20:54:55 -08:00 |
|
Ghommie
|
0ab817c208
|
[s] Fixes ghost anti-ghostrole timers a little.
|
2019-12-29 22:22:20 +01:00 |
|
Seris02
|
3d3407363c
|
auto ooc
|
2019-12-29 18:48:00 +08: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 |
|
Ghommie
|
80402a0d88
|
Ports some hud and update_icon code updates.
|
2019-12-16 23:29:20 +01:00 |
|
Ghommie
|
3891c91799
|
virtual reality component improvements, fixes and documentation.
|
2019-12-14 17:19:48 +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
|
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 |
|
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 |
|
Ghommie
|
dd101ef221
|
Part 2
|
2019-11-19 18:00:56 +01:00 |
|
Ghommie
|
7a1f3dcdba
|
Fixing the ghost roles/mid-round antag lock out suicide/cryo refactor.
|
2019-11-15 23:14:28 +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
|
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 |
|
kevinz000
|
af0962088c
|
Merge pull request #9453 from Ghommie/Ghommie-cit226
Mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-11-14 15:47:18 -07:00 |
|
kevinz000
|
4e3147b228
|
Merge pull request #9755 from Ghommie/Ghommie-cit331
lentext to length, yet another 513 requirement.
|
2019-11-12 23:59:31 -07:00 |
|
Ghommie
|
c5a7c28a1b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281
|
2019-11-12 16:04:05 +01:00 |
|
Ghommie
|
09860d463f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2019-11-10 23:23:36 +01:00 |
|
Ghommie
|
279c22b781
|
lentext to length.
|
2019-11-09 23:17:04 +01:00 |
|
Ghommie
|
298f2e02c6
|
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
|
2019-11-08 22:33:26 +01:00 |
|
Ghommie
|
892b66470b
|
Fixing several minor runtimes.
|
2019-11-05 23:07:29 +01:00 |
|
Ghommie
|
a5086d5813
|
3 seconds penalties fix
|
2019-10-29 13:16:36 +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
|
ec22088534
|
Complying with suggestions. Also stops dnr observers from getting ghost role notifications
|
2019-10-20 09:15:35 +02:00 |
|
Ghommie
|
f73516a17f
|
made it into config.
|
2019-10-17 04:44:30 +02:00 |
|
Ghommie
|
aa6860250b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit226
|
2019-10-15 20:40:07 +02:00 |
|
Ghommie
|
ac0b3629f1
|
roundstart quitters
|
2019-10-09 07:53:59 +02:00 |
|
Ghommie
|
b4e975ef75
|
mitigates the ghost roles/mid-round antag lock out for suicide/cryo. And related fixes.
|
2019-10-09 06:51:07 +02:00 |
|
Ghommie
|
5d1cac62da
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45
|
2019-08-24 13:50:22 +02:00 |
|
Ghommie
|
ee32e1680f
|
Ports "Replaces radio channel names and keys with defines"
|
2019-07-17 00:52:41 +02:00 |
|