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
deathride58
0c8b82168d
Merge branch 'master' into Ghommie-cit222
2019-10-12 11:20:32 -04: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
kevinz000
dcb37bfd0e
Merge pull request #9418 from Ghommie/Ghommie-cit216
...
Porting a load of viro, (sentient) disease, symptoms code updates from tg.
2019-10-07 23:36:11 -07:00
Ghommie
fce6f13471
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
2019-10-07 23:58:15 +02:00
Ghommie
e31c441b3d
rogue tabbing
2019-10-05 07:52:52 +02:00
Ghommie
3d22f4ec60
Porting a load of disease/symptoms code updates.
2019-10-05 07:14:25 +02:00
Fermi
89f3a01bc0
Merge branch 'master' into tg-Organ-port
2019-10-01 06:17:58 +01:00
JTGSZ
5b3f6dca29
Species Job Check
2019-09-23 23:58:57 -04:00
Fermi
587568bf88
Merge branch 'master' into tg-Organ-port
2019-09-19 01:33:15 +01:00
Fermi
107dd67cbe
Well it compiles; just synthtissue and TongueLoss now.
2019-09-19 01:14:12 +01:00
deathride58
cc6e436e96
further fixes
2019-09-17 21:48:48 -04:00
deathride58
d0296a5e81
fixes roundstart runtimes by job_preferences index checks be explicit key checks instead, plus some extra sanity checks
2019-09-17 20:15:06 -04:00
Fermi
c23d6f0113
I missed an earlier port.
2019-09-17 01:08:37 +01:00
Poojawa
f0afc9c490
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-13 12:59:15 -05:00
Poojawa
8988d1e506
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-09-11 02:41:36 -05:00
Alonefromhell
eee1ccbe2c
merge oracle ui from kepler
2019-09-04 11:42:04 -05:00
nik707
624d717d08
Merge pull request #9168 from Seris02/loochotkey
...
Adds looc hotkey - on examination, just makes it better
2019-08-29 19:11:57 -05:00
nik707
bfd17d66cd
Merge pull request #9074 from Citadel-Station-13/donator_grouping
...
Donator grouping system
2019-08-29 18:31:23 -05:00
Seris02
4fbbed3a43
adds looc hotkey
2019-08-20 14:32:48 +08:00
Poojawa
2922f08ef6
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-17 23:41:28 -05:00
BlackMajor
13f27c040e
Merge pull request #8848 from Citadel-Station-13/trait_blacklisting
...
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
2019-08-18 15:33:08 +12:00
kevinz000
fb2971e3e6
Merge remote-tracking branch 'origin/master' into donator_grouping
2019-08-15 14:40:44 -07:00
Poojawa
3de3f511cf
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into blurry-runtimes
2019-08-15 08:24:55 -05:00
Poojawa
2b2bdb37ba
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 23:26:20 -05:00
BlackMajor
5dcd419d8a
Merge pull request #8356 from Thalpy/master
...
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
2019-08-11 16:09:23 +12:00
Poojawa
d496e16dde
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-08-10 19:14:41 -05:00
Poojawa
f76bb27127
Fixes some runtimes and removes a holodeck exploit
...
and a cleanup >.>;
2019-08-08 21:33:42 -05:00
BurgerLua
810251a37c
Fixed bug with voting
2019-08-07 20:47:36 -07:00
kevinz000
277971971f
s
2019-08-07 13:07:38 -07:00
kevinz000
d6885d41a9
Update quirks.dm
2019-07-31 07:54:14 -07:00
Poojawa
8c63ea7b6d
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements
2019-07-26 17:36:46 -05:00
kevinz000
d976dd016a
Merge remote-tracking branch 'origin/master' into trait_blacklisting
2019-07-25 15:20:46 -07:00
kevinz000
f8fdbfc211
Update quirks.dm
2019-07-21 02:30:19 -07:00
Thalpy
15ab1a26a4
Merge branch 'master' into master
2019-07-21 01:50:41 +01:00
kevinz000
08fd6af7fc
Merge pull request #8830 from Ghommie/Ghommie-cit114
...
Ports the toggleable dark mode to the game!
2019-07-20 11:57:13 -07:00
BurgerLua
9d183beb9c
Added
2019-07-17 18:15:55 -07:00
Thalpy
9c7b1dee97
Merge branch 'master' into master
2019-07-15 21:23:04 +01:00
kevinz000
628244c0ba
Merge pull request #8869 from Ghommie/Ghommie-cit129
...
Ports "Show codewords on round end screen"
2019-07-14 14:49:11 -07:00
kevinz000
a573689101
Merge pull request #8887 from Poojawa/last-word-hearing-psychics
...
Gang victory news report and last words for discord bot
2019-07-14 14:04:20 -07:00
Thalpy
f77bcc9765
Merge branch 'master' into master
2019-07-14 15:10:32 +01:00
kevinz000
570fa0cd3b
fix
2019-07-14 03:53:15 -07:00
Poojawa
245bd3e650
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics
2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0
Gang victory news report and last words for discord bot
...
also slight improvement to gangster greetings
2019-07-13 08:38:19 -05:00
Ghommie
71720f8a32
missed bits.
2019-07-13 07:12:37 +02:00
Ghommie
8f410429de
Ports "Renames SSsqueak to SSminor_mapping"
2019-07-13 07:08:03 +02:00
Ghommie
bef0027287
In a haste, we forget thousand things.
2019-07-11 08:50:47 +02:00
Poojawa
c4f736eb94
Merge branch 'master' into job-menu-improvements
2019-07-10 18:55:29 -05:00
Thalpy
c418312cc6
Merge branch 'master' into master
2019-07-09 05:33:09 +01:00
kevinz000
30a006e42f
additions, and it now nulls out.
2019-07-08 18:21:04 -07:00
