 Seris02
|
16b5c83a3a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-13 12:53:52 +08:00 |
|
|
kevinz000
|
42f0aba130
|
s
|
2020-01-12 20:11:26 -08:00 |
|
|
Ghommie
|
f45f979c27
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-12 23:21:03 +01:00 |
|
|
Hatterhat
|
55c6e0d97e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 02:51:21 -06:00 |
|
|
Hatterhat
|
2842434d00
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 02:49:58 -06:00 |
|
|
kevinz000andGitHub
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
|
Putnam
|
38dcb78625
|
chemistry fixes
|
2020-01-11 18:15:50 -08:00 |
|
|
Ghommie
|
16db38a08f
|
Travis man good
|
2020-01-11 20:51:15 +01:00 |
|
|
Ghommie
|
c709a9e4a9
|
A few reagents related fixes.
|
2020-01-11 18:45:54 +01:00 |
|
|
Seris02
|
ac4489c6a8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-11 13:55:29 +08:00 |
|
|
Hatterhat
|
080cb74893
|
tgstation 40920 tweaked and tested for cit
|
2020-01-10 22:56:11 -06:00 |
|
|
Putnam
|
48fadffbfb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-10 17:57:03 -08:00 |
|
|
TrilbyspacecloneandGitHub
|
d463ba8edd
|
Update others.dm
|
2020-01-09 20:43:31 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
7df495f4ba
|
Merge branch 'master' into plastic__world
|
2020-01-09 20:41:33 -05:00 |
|
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
|
TrilbySpaceClone
|
34c6288d22
|
so fantastic!
|
2020-01-09 05:46:30 -05:00 |
|
|
Putnam
|
244d46ee41
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-08 17:08:01 -08:00 |
|
|
Putnam
|
cd35e516ac
|
back by popular demand: maso/nympho
|
2020-01-07 17:01:14 -08:00 |
|
|
kevinz000
|
7378d91684
|
([\W\.])Knockdown\(
|
2020-01-06 03:39:20 -08:00 |
|
|
Putnam
|
32043a9062
|
whoops forgot permaboner
|
2020-01-06 01:14:00 -08:00 |
|
|
Putnam
|
218e701fa9
|
whoops forgot update appearance
|
2020-01-05 21:48:04 -08:00 |
|
|
Putnam
|
e7684f5df7
|
whoops forgot to use sensitivity
|
2020-01-05 19:29:23 -08:00 |
|
|
Putnam
|
fba7a8abb0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-05 19:12:28 -08:00 |
|
|
Putnam
|
d75a525b3c
|
let's fix arousal huh
|
2020-01-05 19:10:48 -08:00 |
|
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
|
TrilbyspacecloneandGitHub
|
c0f38aa27f
|
Update food_reagents.dm
|
2020-01-05 11:40:58 -05:00 |
|
|
GhomandGitHub
|
fdff70b702
|
Merge pull request #10256 from Putnam3145/alcohol-intolerance
Adds an alcohol intolerance trait (NOT light drinker)
|
2020-01-05 15:19:48 +01:00 |
|
|
GhomandGitHub
|
0e74c94d8c
|
Merge pull request #10278 from Trilbyspaceclone/patch-248
Fixes Fermi plushie reaction. Removes carbonation of caramel
|
2020-01-05 15:17:14 +01:00 |
|
|
GhomandGitHub
|
ca8d93ad17
|
Merge branch 'master' into alcohol-intolerance
|
2020-01-04 23:17:55 +01:00 |
|
|
Ghommie
|
f5b251db66
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-03 18:24:39 +01:00 |
|
|
LinandGitHub
|
b1ccd512db
|
Merge pull request #10215 from Ghommie/Ghommie-cit473
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
|
2020-01-03 00:00:51 +00:00 |
|
|
LinandGitHub
|
4b7e6ec2a5
|
Merge pull request #10270 from Ghommie/Ghommie-cit489
randomized recipes fallback fix.
|
2020-01-02 23:56:43 +00:00 |
|
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
|
GhomandGitHub
|
4660465115
|
Merge pull request #10362 from Trilbyspaceclone/patch-258
Corrects bottle/pill/patch/condiments "#$39;"
|
2019-12-31 14:39:34 +01:00 |
|
|
GhomandGitHub
|
78e4c608ad
|
Merge pull request #10319 from Seris02/coconutsyep
porting azarak's coconuts from hyper station
|
2019-12-31 13:16:07 +01:00 |
|
|
Seris02
|
54f859fe06
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2019-12-31 17:52:49 +08:00 |
|
|
TrilbyspacecloneandGitHub
|
ea43069222
|
Update chem_master.dm
|
2019-12-30 18:05:34 -05:00 |
|
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
|
Ghommie
|
37441437d1
|
a
|
2019-12-28 23:02:28 +01:00 |
|
|
Seris02
|
862acf2f06
|
ports hyper's genetics
|
2019-12-28 21:33:15 +08:00 |
|
|
TrilbyspacecloneandGitHub
|
3177b5786a
|
Update food_reagents.dm
|
2019-12-28 05:26:46 -05:00 |
|
|
Seris02
|
4a2b7c2438
|
cocooooonuuuuuuts
|
2019-12-28 16:02:53 +08:00 |
|
|
Ghommie
|
21cfb2914b
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-27 17:49:59 +01:00 |
|
|
Ghommie
|
b4c0433d6d
|
more work.
|
2019-12-27 17:45:19 +01:00 |
|
|
|
e97ca5f924
|
yeah fair enough
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2019-12-26 14:22:03 -05:00 |
|
|
kappa-samaandGitHub
|
4689d805a3
|
e
|
2019-12-26 02:54:38 -05:00 |
|
|
Putnam
|
88222c0901
|
uh, actually did that
|
2019-12-24 23:58:22 -08:00 |
|
|
Putnam
|
0b1b249eba
|
just makes alcohol toxic rather than drunk-inducing
|
2019-12-24 23:53:33 -08:00 |
|
|
Ghommie
|
57cecd2499
|
work
|
2019-12-25 06:54:44 +01:00 |
|
|
Ghommie
|
53d142b4c0
|
more work.
|
2019-12-25 01:34:33 +01:00 |
|