kevinz000
|
02e8a73265
|
Merge pull request #9737 from Ghommie/Ghommie-cit326
Ports techweb backend refactor & co.
|
2019-11-14 16:45:09 -07: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
|
487f98bf68
|
Merge pull request #9775 from Ghommie/Ghommie-cit340
ports "Adds superlube to the clown ruin", "Replaces the slime extract in the clown biodome with a superlube sprayer." and buffs clown PDAs
|
2019-11-14 01:40:16 -07:00 |
|
kevinz000
|
3015ec5c04
|
Merge pull request #9764 from Ghommie/Ghommie-cit335
Dreamchecker compatibility changes, part 1.
|
2019-11-14 01:37:41 -07:00 |
|
Ghommie
|
4ef1d64356
|
PR #47500, #47501, #47557, #47588.
|
2019-11-12 19:00:45 +01:00 |
|
Ghommie
|
e50c56150e
|
ports "Adds superlube to the clown ruin" and buffs clown PDAs
|
2019-11-11 23:10:22 +01:00 |
|
Ghommie
|
d06b6fd83e
|
Adding a new PDA reskin, sprites from CEV-Eris (plus bits from Beestation and Cit-RP)
|
2019-11-11 21:34:47 +01:00 |
|
Ghommie
|
1e49ce76d3
|
Dreamchecker compatibility changes, part 1.
|
2019-11-10 20:48:30 +01:00 |
|
Ghommie
|
b2b1390bd3
|
Ports techweb backend refactor & co.
|
2019-11-07 05:07:38 +01:00 |
|
kevinz000
|
906c58d339
|
Merge pull request #9672 from Ghommie/Ghommie-cit299
Obligatory changes for 513 support kevinz forgot about.
|
2019-11-03 06:15:42 -07:00 |
|
Ghommie
|
05dc64fd0a
|
Obligatory changes for 513 kevinz forgot about.
|
2019-10-30 21:47:33 +01:00 |
|
Ghommie
|
79c3700d25
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-25 12:42:28 +02:00 |
|
Poojawa
|
66c8c17bbd
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-17 05:45:06 -05:00 |
|
Ghommie
|
475303bd02
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-17 00:50:30 +02:00 |
|
kevinz000
|
994bfddc1b
|
Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
|
2019-10-16 12:44:34 -07:00 |
|
Fermi
|
7b2c8e58ff
|
Fixes freezing and ghost rider
|
2019-10-14 13:23:39 +01:00 |
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
deathride58
|
0c8b82168d
|
Merge branch 'master' into Ghommie-cit222
|
2019-10-12 11:20:32 -04:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
Ghommie
|
fce6f13471
|
Ports "Chat Subsystem ported from TerraGov-Marine-Corps"
|
2019-10-07 23:58:15 +02:00 |
|
Ghommie
|
02df68a1cf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit156
|
2019-10-02 07:26:09 +02:00 |
|
Fermi
|
587568bf88
|
Merge branch 'master' into tg-Organ-port
|
2019-09-19 01:33:15 +01:00 |
|
Fermi
|
c23d6f0113
|
I missed an earlier port.
|
2019-09-17 01:08:37 +01:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
Linzolle
|
daba09582a
|
move to misc.dm
|
2019-09-11 10:18:10 -05:00 |
|
Ghommie
|
36ffd3d6a8
|
More lines.
|
2019-09-01 03:35:36 +02:00 |
|
Poojawa
|
0290a46ddc
|
Impliments Ghom review, reverts blood list back to component
|
2019-08-15 12:32:44 -05:00 |
|
Poojawa
|
dcd682bd59
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-10 23:48:47 -05:00 |
|
Fermi
|
eb9e6a041d
|
Ghommie's fix.
|
2019-08-09 12:17:54 +01:00 |
|
Poojawa
|
283b5d050e
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-08-08 16:51:53 -05:00 |
|
Poojawa
|
3499d73f6b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods
|
2019-07-31 19:24:39 -05:00 |
|
Ghommie
|
ec2a3ea778
|
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
|
2019-07-31 18:56:00 +02: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 |
|
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
|
03315d1cbb
|
Ports a toggleable darkmode to the game!
|
2019-07-05 22:29:50 +02:00 |
|
Ghommie
|
ad3b709c40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit97
|
2019-06-29 06:39:21 +02:00 |
|
Ghommie
|
0371a5513a
|
Porting in 18 new drinks from the TGstation, plus tweaking and fixes.
|
2019-06-29 06:03:57 +02:00 |
|
Ghommie
|
67f00fc049
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit42
|
2019-06-24 16:48:15 +02:00 |
|
Ghommie
|
55795355fd
|
Ports "[s] Fixes pride mirror exploit"
|
2019-06-19 03:31:36 +02:00 |
|
Ghommie
|
093b0a15ed
|
alakazam
|
2019-06-10 14:52:23 +02:00 |
|
Ghommie
|
e62d17f5ab
|
more pda sprites
|
2019-06-10 02:38:16 +02:00 |
|
Ghommie
|
b4ccfe078a
|
snap
|
2019-06-10 00:35:57 +02:00 |
|
Ghommie
|
79c4ce502e
|
more pda skins.
|
2019-06-10 00:28:43 +02:00 |
|
Ghommie
|
d2e216f2de
|
tested fixed tested fixed tested.
|
2019-06-09 19:55:08 +02:00 |
|
Ghommie
|
52d217a92b
|
deathride man good.
|
2019-06-08 21:48:39 +02:00 |
|
Ghommie
|
480ee9a9da
|
Reskinnable PDAs.
|
2019-06-08 19:55:47 +02:00 |
|
Ghommie
|
b6f35435ec
|
Ports the get_area conversion to define.
|
2019-06-07 06:50:26 +02:00 |
|
Poojawa
|
f6f4c946e6
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-05-22 00:08:13 -05:00 |
|
deathride58
|
06ea7de46b
|
[S] Fixes a fairly huge vector for server crashes
|
2019-05-13 21:49:33 -04:00 |
|
Poojawa
|
fcdc748bf1
|
u h g. I hate this
|
2019-05-10 07:07:09 -05:00 |
|