Commit Graph
6618 Commits
Author SHA1 Message Date
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 d4592449d2 Merge pull request #10484 from deathride58/topiccommandlimit
[s] Caches the status topic to prevent low-effort DDoSes
2020-01-10 14:00:43 -08: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
kevinz000 8725ffe916 Merge remote-tracking branch 'citadel/master' into nightshift_1 2020-01-10 06:12:59 -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
deathride58andGitHub c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
deathride58andGitHub 0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
kevinz000andGitHub 356286f0e5 Merge pull request #10473 from deathride58/serverhopsanity
[s] adds a basic sanity check to server_hop
2020-01-08 19:16:03 -08:00
Putnam fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08:00
deathride58 33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
kappa-samaandGitHub ff5901cadb hi 2020-01-08 16:50:40 -05:00
kappa-samaandGitHub 35353996bd lazy copypaste 2020-01-08 16:36:53 -05:00
kevinz000andGitHub 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
kevinz000andGitHub dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
kevinz000andGitHub 68a0eddeaf Merge pull request #10285 from Ghommie/Ghommie-cit491
[s] Fixes singularity pulls duping rods out of engine floors.
2020-01-08 13:31:31 -08:00
kevinz000andGitHub b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
2020-01-08 13:30:37 -08:00
deathride58 633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam3145andGitHub b09ef97ae3 Merge pull request #10305 from BlackMajor/Yeehaw
Various Mining borg changes. And some extras.
2020-01-07 16:50:21 -08:00
BlackMajor 05a644cc41 Revert "Merge branch 'master' into Yeehaw"
This reverts commit 972c03f79f, reversing
changes made to 8ebd698763.
2020-01-08 12:26:45 +13:00
BlackMajor 972c03f79f Merge branch 'master' into Yeehaw 2020-01-08 12:25:50 +13:00
BlackMajor b41c9cd844 Sync with master 2020-01-08 12:25:22 +13:00
LinandGitHub c162e9bb5d Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
2020-01-07 19:37:49 +00:00
r4d6 f6fef84984 Make the RCD effect not right-clickable. 2020-01-07 11:23:25 -05:00
deathride58andGitHub cde9946e25 is this why wrench refuses to work 2020-01-07 09:00:30 -05:00
kevinz000 ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00