Commit Graph

5947 Commits

Author SHA1 Message Date
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
Seris02
b22ec2ffd8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-12 11:14:33 +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
kevinz000
9fd9f60855 compile 2020-01-11 10:49:44 -08: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
Ghom
5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00
Seris02
aaff36e9dc better now 2020-01-11 17:50:24 +08:00
Seris02
218c6bdc8f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into bowmanupgrade 2020-01-11 17:35:46 +08:00
Seris02
3ce8d2a61c adds bopwmanizing 2020-01-11 17:33:44 +08:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08: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
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
Hatterhat
080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06: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
799059071f this 2020-01-10 22:32:47 -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
kappa-sama
25422542c9 this 2020-01-10 22:19:00 -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
Lin
147d948ad8 Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13
reduces table cooldown to 0.4
2020-01-10 23:55:07 +00:00
kevinz000
b6e14c6b86 compile 2020-01-10 14:30:20 -08:00
kevinz000
2c245a18fd compile 2020-01-10 13:43:53 -08:00
kevinz000
f1a4956afc easier for me to type 2020-01-10 13:26:34 -08: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
kevinz000
7ace9f0203 abstract types 2020-01-10 06:25:23 -08:00
kevinz000
a16a7a7fe0 subtypes 2020-01-10 06:12:03 -08:00
kevinz000
24c1baddd0 compile compile compile 2020-01-10 05:50:19 -08:00