Commit Graph

937 Commits

Author SHA1 Message Date
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
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
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
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
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
Seris02 16b5c83a3a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-01-13 12:53:52 +08:00
Seris02 10944719b1 erge branch 'master' of https://github.com/Citadel-Station-16/Citade-Station-18 into bowmanupgrade
nope
2020-01-13 11:50:39 +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
kevinz000 b341818f04 mobility flags 2020-01-12 11:00:12 -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
Ghommie 268146bb93 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit374 2020-01-12 17:19:57 +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 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 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 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
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 c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2020-01-11 15:21:08 +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
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 080cb74893 tgstation 40920 tweaked and tested for cit 2020-01-10 22:56:11 -06: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
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 24c1baddd0 compile compile compile 2020-01-10 05:50: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
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
kevinz000 7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Ghommie dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Ghom 499907f9b7 Merge pull request #10191 from Citadel-Station-13/michael_labs
Custom Holoforms for pAIs and AIs oh and adds certain cyborg pai holograms. also mild pai nerf.
2020-01-04 14:07:25 +01:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
chefferz 6222b41204 Update forcefieldprojector.dm 2020-01-01 20:44:16 -05:00