kevinz000
|
eca7eeace3
|
aa
|
2020-01-15 19:11:49 -07:00 |
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
kevinz000
|
ded4d1bed6
|
compile
|
2020-01-15 18:58:26 -07:00 |
|
Ghommie
|
9c526d0348
|
riot foam dart design cost consistency.
|
2020-01-16 02:56:58 +01:00 |
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07:00 |
|
kevinz000
|
b42de8d457
|
compile
|
2020-01-15 18:49:29 -07:00 |
|
r4d6
|
8bc8edb56f
|
Fixes
|
2020-01-15 20:46:28 -05:00 |
|
kevinz000
|
c710c332e4
|
compile
|
2020-01-15 18:37:09 -07:00 |
|
kevinz000
|
e8d8d32a33
|
ree
|
2020-01-15 18:34:16 -07:00 |
|
kevinz000
|
90be124730
|
Merge remote-tracking branch 'citadel/master' into map_network_helpers
|
2020-01-15 18:30:14 -07:00 |
|
kevinz000
|
2a4e2204c5
|
no definemania then..
|
2020-01-15 18:29:45 -07:00 |
|
kevinz000
|
8f7460ff96
|
definemania
|
2020-01-15 18:24:13 -07:00 |
|
kevinz000
|
c5b95ff5d0
|
Mapping helpers
|
2020-01-15 18:22:43 -07:00 |
|
kevinz000
|
554f23e790
|
aight bet
|
2020-01-15 18:04:05 -07:00 |
|
kevinz000
|
872628d9aa
|
Apply suggestions from code review
thank you gamer
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-01-15 18:02:23 -07:00 |
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
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 |
|