 Putnam
|
d29603ad77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad
|
2020-01-15 15:57:32 -08:00 |
|
|
r4d6
|
f7791c3db7
|
Hopefully help travis
|
2020-01-15 17:27:09 -05:00 |
|
|
r4d6
|
e685c3fc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into radsuit
|
2020-01-15 17:15:21 -05:00 |
|
|
Ghommie
|
4b090f938c
|
ok
|
2020-01-15 20:51:36 +01:00 |
|
|
Ghom
|
7b34daae48
|
Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
|
2020-01-15 15:51:15 +01:00 |
|
|
Ghom
|
5eb26682e2
|
Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1
remove trait genes without disks
|
2020-01-15 14:54:11 +01:00 |
|
|
kevinz000
|
b0c2e4cbdd
|
Revert "shotgun pointblanking people actually throws them"
|
2020-01-15 01:13:26 -07:00 |
|
|
Artur
|
bede695ebd
|
Undoes minter changes
|
2020-01-15 09:49:57 +02:00 |
|
|
Artur
|
5c9b59aa74
|
Ready for testmerge
|
2020-01-15 09:44:29 +02:00 |
|
|
Artur
|
d04c09aba0
|
Compiles, just need to fix goonchat
|
2020-01-15 09:44:03 +02:00 |
|
|
Artur
|
8b8a112d2c
|
Ohkay
|
2020-01-15 09:41:33 +02:00 |
|
|
Seris02
|
a8e4989d74
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-15 12:15:13 +08:00 |
|
|
Hatterhat
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
|
kevinz000
|
97ded4b27b
|
ok
|
2020-01-14 18:09:12 -07:00 |
|
|
kevinz000
|
5f315ab418
|
ok
|
2020-01-14 18:04:19 -07:00 |
|
|
kevinz000
|
41bbdae220
|
micro optimization
|
2020-01-14 17:50:14 -07:00 |
|
|
kevinz000
|
59ab4c0670
|
hm
|
2020-01-14 17:32:54 -07:00 |
|
|
kevinz000
|
6ead30eab3
|
more shit
|
2020-01-14 17:22:54 -07:00 |
|
|
Trilbyspaceclone
|
5351bc9f8a
|
Update miscellaneous.dm
|
2020-01-14 19:15:35 -05:00 |
|
|
Ghom
|
8a06f2f45c
|
Merge pull request #10499 from Hatterhat/tg-40046
more /tg/station ports - tools! logging! some other fun stuff!
|
2020-01-15 01:05:36 +01:00 |
|
|
Ghom
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
|
kevinz000
|
eff86a449f
|
wew
|
2020-01-14 16:45:22 -07:00 |
|
|
Ghommie
|
26d6e7f05c
|
Work.
|
2020-01-14 22:04:38 +01:00 |
|
|
Ghommie
|
3984943b0d
|
[s] makes master compile.
|
2020-01-14 20:02:26 +01:00 |
|
|
Ghom
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
|
Seris02
|
cb3a4caa63
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics
|
2020-01-14 23:42:37 +08:00 |
|
|
Seris02
|
8ce7ac8854
|
custom reagent creampie
|
2020-01-14 22:10:41 +08:00 |
|
|
Ghom
|
99a6214d22
|
Merge pull request #10538 from Putnam3145/chemistry-aaa
Fixes to chemistry
|
2020-01-14 13:52:10 +01:00 |
|
|
Ghom
|
77bdc8ee58
|
Merge pull request #10558 from DeltaFire15/clockfixes
Slimepeople can no longer just chill on vitality matrixes
|
2020-01-14 13:51:03 +01:00 |
|
|
Ghom
|
9189455fb1
|
Merge pull request #10549 from Seris02/durathread
durathread winter coats from hyper
|
2020-01-14 13:49:53 +01:00 |
|
|
Putnam
|
21dde64da2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa
|
2020-01-14 03:27:03 -08:00 |
|
|
Hatterhat
|
464b893790
|
Merge branch 'master' into tg-40046
|
2020-01-13 23:06:48 -06:00 |
|
|
Seris02
|
d46f3232f9
|
tada
|
2020-01-14 10:57:32 +08:00 |
|
|
Ghommie
|
a0f35f5cfc
|
Merge branch 'Ghommie-cit265' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit435
|
2020-01-14 00:55:28 +01:00 |
|
|
timothyteakettle
|
17ce27bd70
|
remove trait genes without disks
botany fix that lets you remove trait genes without having to have a redundant disk inserted
|
2020-01-13 23:23:49 +00:00 |
|
|
Detective-Google
|
fce73c84c7
|
Merge branch 'master' into the-p-o-o-l
|
2020-01-13 16:38:53 -06:00 |
|
|
Detective Google
|
2c4daf3a99
|
Merge remote-tracking branch 'upstream/master' into the-p-o-o-l
|
2020-01-13 16:32:18 -06:00 |
|
|
Ghommie
|
1d948907f6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-13 23:26:21 +01:00 |
|
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
|
Ghom
|
330d96d549
|
Merge pull request #10409 from kevinz000/isbanned2
IT WORKED ON LOCAL
|
2020-01-13 18:49:46 +01:00 |
|
|
TrilbySpaceClone
|
04eab97058
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 11:54:14 -05:00 |
|
|
Ghom
|
984c43116c
|
Merge pull request #10539 from Savotta/cum
ports hShark snout from hyper-station-13
|
2020-01-13 16:07:28 +01:00 |
|
|
Ghom
|
ed42ed5a1e
|
Merge pull request #10551 from Arturlang/mesmerize_quickfiz
[s]Fixes bloodsucker mesmerize mute
|
2020-01-13 12:49:13 +01:00 |
|
|
Ghom
|
942e321b76
|
Merge pull request #10555 from Arturlang/Lummox_suggestions
Ports lummoxes suggestions
|
2020-01-13 12:48:19 +01:00 |
|
|
Artur
|
e3d3f7b750
|
Ported
|
2020-01-13 13:20:55 +02:00 |
|
|
TrilbySpaceClone
|
92dc5e61c3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into glassware
|
2020-01-13 03:42:20 -05:00 |
|
|
Putnam
|
e412852c8f
|
Made temp flavor "more" pop up with actual temp flavor
|
2020-01-12 23:44:49 -08:00 |
|
|
Arturlang
|
f98bc85db0
|
Merge branch 'master' into mesmerize_quickfiz
|
2020-01-13 09:44:17 +02:00 |
|
|
Artur
|
1b852b3a03
|
Fixes mesmerize
|
2020-01-13 09:34:40 +02:00 |
|
|
Xantholne
|
903e59d6ed
|
Merge branch 'master' into xantholne-christmas03
|
2020-01-12 22:29:59 -07:00 |
|