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 |
|
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 |
|
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 |
|
kappa-sama
|
3f57f30e14
|
Merge branch 'master' into modularer
|
2020-01-13 16:32:00 -05:00 |
|
Letter N
|
6ace5fc4b3
|
ell eff
|
2020-01-13 21:19:21 +08:00 |
|
Letter N
|
450cb2b01a
|
Merge branch 'master' into banjo
|
2020-01-13 20:53:30 +08:00 |
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
kappa-sama
|
4e3a5379a4
|
augh
|
2020-01-12 14:21:06 -05: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
|
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 |
|
kevinz000
|
e1ae3f3c07
|
Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
|
2020-01-12 00:49:39 -08:00 |
|
kevinz000
|
f210971889
|
Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk
Significantly lowers the forcefield projector health, lowers armor.
|
2020-01-12 00:47:17 -08:00 |
|
kevinz000
|
60524fb9c7
|
Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
|
2020-01-12 00:45:21 -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 |
|
kevinz000
|
c69d882943
|
Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
|
2020-01-12 00:40:48 -08:00 |
|
kevinz000
|
4b4864740b
|
Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
|
2020-01-12 00:40:17 -08:00 |
|
kevinz000
|
ddff903532
|
Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
|
2020-01-12 00:38:43 -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 |
|
kappa-sama
|
5eb08e25c2
|
Merge pull request #32 from kappa-sama/moredular
i wanna kill myself
|
2020-01-11 12:35:59 -05:00 |
|
kappa-sama
|
8a7e6d49a6
|
e
|
2020-01-11 12:35:49 -05:00 |
|
kappa-sama
|
eb93e3d1d3
|
hi
|
2020-01-11 12:35:04 -05:00 |
|
kappa-sama
|
108e585cf1
|
shit
|
2020-01-11 12:25:38 -05:00 |
|
kappa-sama
|
1aee5e880a
|
god
|
2020-01-11 12:24:23 -05:00 |
|
Ghom
|
34502cab1d
|
Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
|
2020-01-11 15:29:25 +01:00 |
|
Ghom
|
c2b3e7b0ec
|
Merge pull request #10505 from LetterN/beep-boom
better electropack ui
|
2020-01-11 15:21:08 +01:00 |
|
Ghom
|
1f9a7066f0
|
Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7
Grey Tide spear is now vareditable
|
2020-01-11 15:10:16 +01:00 |
|
Ghom
|
e12f5e9e44
|
Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
|
2020-01-11 15:07:55 +01:00 |
|
Hatterhat
|
b5f8e46941
|
this is blackmajors fault im not gonna lie
|
2020-01-10 23:41:30 -06:00 |
|
BlackMajor
|
30fc5b560b
|
Couple of lingering fixes
|
2020-01-11 17:57:18 +13:00 |
|
kappa-sama
|
b6a187dc6d
|
OOPS
|
2020-01-10 22:48:33 -05:00 |
|
kappa-sama
|
bfedc80c64
|
idk what this even is lmao
|
2020-01-10 22:39:45 -05:00 |
|
kappa-sama
|
f88eefa8a9
|
stunsword
|
2020-01-10 22:30:28 -05:00 |
|
Seris02
|
29b66db9e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport
|
2020-01-11 11:29:30 +08:00 |
|
kappa-sama
|
e21cb4e67b
|
shocking
|
2020-01-10 22:28:55 -05:00 |
|
kappa-sama
|
aacf4bec8b
|
qm set
|
2020-01-10 22:26:48 -05:00 |
|
kappa-sama
|
62ebc2d226
|
zoom
|
2020-01-10 22:25:07 -05:00 |
|
Seris02
|
0b0b80f174
|
explosions
|
2020-01-11 11:22:59 +08:00 |
|
kappa-sama
|
e5e58518e4
|
boomers
|
2020-01-10 22:22:44 -05:00 |
|
kappa-sama
|
412b0175b6
|
new file
|
2020-01-10 22:20:53 -05:00 |
|
Lin
|
fb94bf5fa0
|
Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
|
2020-01-11 00:30:58 +00:00 |
|
kevinz000
|
9cec806875
|
Update scanners.dm
|
2020-01-10 12:48:55 -08:00 |
|
kevinz000
|
7392760f38
|
Update scanners.dm
|
2020-01-10 12:48:19 -08:00 |
|
Letter N
|
315756d95a
|
banjo
|
2020-01-10 19:39:57 +08:00 |
|
Letter N
|
6ec3fde836
|
better-signalers
|
2020-01-10 18:06:55 +08:00 |
|
Trilbyspaceclone
|
3c877c96f5
|
Update sheet_types.dm
|
2020-01-09 20:42:56 -05:00 |
|