kevinz000
|
f85527ab4b
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-19 16:18:12 -07:00 |
|
kevinz000
|
088e586b47
|
Merge pull request #9601 from Ghommie/Ghommie-cit265
Ports move force and move resist, movement/pushing/pulling tweaks & co.
|
2020-01-19 16:10:56 -07:00 |
|
Ghom
|
536900a7ac
|
Merge pull request #10520 from Hatterhat/tg-40920
you like examining things? - port of tgstation 40920
|
2020-01-19 16:37:40 +01:00 |
|
Hatterhat
|
590d71ddc1
|
hey ghom i fixed it i think
|
2020-01-18 23:35:52 -06:00 |
|
Ghommie
|
3ee855ab77
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 22:14:06 +01:00 |
|
Ghom
|
da8b29dd23
|
Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12
Removes blood duplication via virus mix
|
2020-01-18 01:25:34 +01:00 |
|
Ghommie
|
9c0b78bc09
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-18 01:23:08 +01:00 |
|
kevinz000
|
aea0de30d1
|
Merge pull request #10125 from Ghommie/Ghommie-cit449
Ports a few projectile code updates by ke:b:inz.
|
2020-01-17 15:15:08 -07:00 |
|
kevinz000
|
eddb6fda68
|
Update others.dm
|
2020-01-17 14:32:51 -07:00 |
|
kevinz000
|
edccfa3523
|
Update others.dm
|
2020-01-17 14:15:08 -07:00 |
|
kevinz000
|
e69253bf87
|
Update others.dm
|
2020-01-17 14:12:51 -07:00 |
|
kevinz000
|
2cc0e8ee6c
|
k
|
2020-01-16 21:17:43 -07:00 |
|
kevinz000
|
7bcb37c5d1
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-01-16 21:12:56 -07:00 |
|
kevinz000
|
9ef4cbfa76
|
refactor tags
|
2020-01-16 20:58:00 -07:00 |
|
kevinz000
|
14aaca8fa5
|
compile
|
2020-01-16 19:18:54 -07:00 |
|
kevinz000
|
1acac87da3
|
compile
|
2020-01-15 23:54:30 -07:00 |
|
kevinz000
|
45c92bcb6f
|
s
|
2020-01-15 19:07:47 -07:00 |
|
kevinz000
|
ded4d1bed6
|
compile
|
2020-01-15 18:58:26 -07:00 |
|
kevinz000
|
02841f8e92
|
compile
|
2020-01-15 18:49:37 -07: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 |
|
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 |
|
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 |
|
kevinz000
|
42f0aba130
|
s
|
2020-01-12 20:11:26 -08:00 |
|
Hatterhat
|
9aedc62ddb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40920
|
2020-01-12 12:39:17 -06:00 |
|
Hatterhat
|
83f8e42fb3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046
|
2020-01-12 12:37:19 -06:00 |
|
Ghommie
|
c14439494a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265
|
2020-01-12 19:18:03 +01:00 |
|
Ghommie
|
02fbbd4f95
|
Ouch.
|
2020-01-12 16:54:08 +01:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Hatterhat
|
0773f1b7fa
|
sweet merciful FUCK what is this merge
|
2020-01-12 02:53:30 -06: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 |
|
kevinz000
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
Putnam3145
|
01db064038
|
Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
|
2020-01-12 00:41:00 -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 |
|
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 |
|
Ghommie
|
c9375a1288
|
Fixes reagent containers examination.
|
2020-01-10 14:19:22 +01:00 |
|
Trilbyspaceclone
|
d463ba8edd
|
Update others.dm
|
2020-01-09 20:43:31 -05:00 |
|
Trilbyspaceclone
|
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 |
|
Lin
|
ee5d6a3d4a
|
Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
|
2020-01-10 00:38:06 +00:00 |
|
Hatterhat
|
04aa0eda5a
|
tg 40046, 41695, 46726 - hope i didnt forget smth
|
2020-01-09 18:35:13 -06: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 |
|
kevinz000
|
6a350d5d58
|
Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
|
2020-01-08 13:40:39 -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 |
|