Commit Graph
3806 Commits
Author SHA1 Message Date
Ghommie 16db38a08f Travis man good 2020-01-11 20:51:15 +01:00
kappa-samaandGitHub 5eb08e25c2 Merge pull request #32 from kappa-sama/moredular
i wanna kill myself
2020-01-11 12:35:59 -05:00
kappa-samaandGitHub 8a7e6d49a6 e 2020-01-11 12:35:49 -05:00
kappa-samaandGitHub eb93e3d1d3 hi 2020-01-11 12:35:04 -05:00
kappa-samaandGitHub 108e585cf1 shit 2020-01-11 12:25:38 -05:00
kappa-samaandGitHub 1aee5e880a god 2020-01-11 12:24:23 -05:00
GhomandGitHub 34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
GhomandGitHub c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2020-01-11 15:21:08 +01:00
GhomandGitHub 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
GhomandGitHub e12f5e9e44 Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
2020-01-11 15:07:55 +01:00
GhomandGitHub 5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00
Putnam 312da86424 Suggested changes 2020-01-11 01:28:49 -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-samaandGitHub b6a187dc6d OOPS 2020-01-10 22:48:33 -05:00
kappa-samaandGitHub bfedc80c64 idk what this even is lmao 2020-01-10 22:39:45 -05:00
kappa-samaandGitHub 799059071f this 2020-01-10 22:32:47 -05:00
kappa-samaandGitHub 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-samaandGitHub e21cb4e67b shocking 2020-01-10 22:28:55 -05:00
kappa-samaandGitHub aacf4bec8b qm set 2020-01-10 22:26:48 -05:00
kappa-samaandGitHub 62ebc2d226 zoom 2020-01-10 22:25:07 -05:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
kappa-samaandGitHub e5e58518e4 boomers 2020-01-10 22:22:44 -05:00
kappa-samaandGitHub 412b0175b6 new file 2020-01-10 22:20:53 -05:00
kappa-samaandGitHub 25422542c9 this 2020-01-10 22:19:00 -05:00
LinandGitHub fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
LinandGitHub 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
kevinz000andGitHub 9cec806875 Update scanners.dm 2020-01-10 12:48:55 -08:00
kevinz000andGitHub 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
Putnam e468fa3e71 Added a binary version and fixed up sprites 2020-01-10 01:26:09 -08:00
Putnam 36a6daa26f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-09 19:09:38 -08:00
Putnam bdda3f940c it works 2020-01-09 18:55:56 -08:00
TrilbyspacecloneandGitHub 3c877c96f5 Update sheet_types.dm 2020-01-09 20:42:56 -05:00
TrilbyspacecloneandGitHub 530d710f57 Update mineral.dm 2020-01-09 20:42:07 -05:00
TrilbyspacecloneandGitHub 7df495f4ba Merge branch 'master' into plastic__world 2020-01-09 20:41:33 -05:00
LinandGitHub e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
LinandGitHub c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
2020-01-10 01:31:20 +00: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
Hatterhat 04aa0eda5a tg 40046, 41695, 46726 - hope i didnt forget smth 2020-01-09 18:35:13 -06:00
kevinz000andGitHub 52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08:00
TrilbyspacecloneandGitHub 17afb84f94 I didnt even touch any maps 2020-01-09 05:53:23 -05:00
TrilbySpaceClone 34c6288d22 so fantastic! 2020-01-09 05:46:30 -05:00
Putnam3145andGitHub 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
Putnam fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
kappa-samaandGitHub 35353996bd lazy copypaste 2020-01-08 16:36:53 -05:00
kevinz000andGitHub dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00