Commit Graph

28160 Commits

Author SHA1 Message Date
kevinz000 8f60099595 Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
2020-01-10 14:01:06 -08:00
kevinz000 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
CitadelStationBot c4f64c13e5 Automatic changelog generation for PR #10503 [ci skip] 2020-01-09 23:24:21 -06:00
Putnam3145 c21dbe850a Merge pull request #10503 from r4d6/quick-fix
[S] Fix a pipe problem for the 5x5 SM
2020-01-09 21:24:19 -08:00
r4d6 f11cc9bcee Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into quick-fix 2020-01-10 00:09:24 -05:00
r4d6 48abd31dee Fix SM 5x5 2020-01-10 00:06:06 -05:00
CitadelStationBot b522cfafb8 Automatic changelog generation for PR #10329 [ci skip] 2020-01-09 19:34:42 -06:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
2020-01-10 01:34:39 +00:00
CitadelStationBot 4887510573 Automatic changelog generation for PR #10112 [ci skip] 2020-01-09 19:31:23 -06:00
Lin 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
Lin ee5d6a3d4a Merge pull request #10449 from Ghommie/Ghommie-cit498
Improves the set_APTFT verb into a proc.
2020-01-10 00:38:06 +00:00
CitadelStationBot 42b7255a40 Automatic changelog generation for PR #10463 [ci skip] 2020-01-09 16:08:57 -06:00
Ghom 959e87185a Merge pull request #10463 from Putnam3145/random-engine
Allowed random engines to be weighted
2020-01-09 23:08:54 +01:00
Unknown 753c572a5e I'm about to go into a comma 2020-01-09 11:21:00 -07:00
Unknown 62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
Unknown 6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
Putnam3145 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
Unknown 07b8169d52 Fuggin more DMI merges 2020-01-08 20:58:07 -07:00
Unknown 8e58c416f6 Fuggin DMI merges amirite 2020-01-08 20:40:34 -07:00
Unknown 8a8d0bf6da Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:36:22 -07:00
Unknown afc0ca44f2 Merge branch 'master' into xantholne-cowboy02 2020-01-08 20:35:36 -07:00
deathride58 c39058379e Merge branch 'master' into topiccommandlimit 2020-01-08 22:19:56 -05:00
deathride58 0b9d566076 Merge pull request #10469 from kevinz000/fail2topic
Ports fail2topic from Aurora
2020-01-08 22:19:22 -05:00
CitadelStationBot f4e508615d Automatic changelog generation for PR #10473 [ci skip] 2020-01-08 21:16:06 -06:00
kevinz000 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
CitadelStationBot 5dd58950ab Automatic changelog generation for PR #10483 [ci skip] 2020-01-08 20:04:47 -06:00
Ghom dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
deathride58 580119f038 makes it account for key_valid 2020-01-08 19:17:09 -05:00
deathride58 33df154689 Caches the status topic to prevent low-effort DDoSes 2020-01-08 18:47:45 -05:00
Putnam df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
CitadelStationBot d9783d2bba Automatic changelog generation for PR #10440 [ci skip] 2020-01-08 15:41:28 -06:00
kevinz000 652cf6e60c Merge pull request #10440 from Putnam3145/weird-secret
Allows users to vote their least favorite game modes in secret/extended vote
2020-01-08 13:41:26 -08:00
CitadelStationBot ebf87a173b Automatic changelog generation for PR #10442 [ci skip] 2020-01-08 15:40:42 -06:00
kevinz000 6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
2020-01-08 13:40:39 -08:00
kevinz000 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
CitadelStationBot 9ed90235ab Automatic changelog generation for PR #10472 [ci skip] 2020-01-08 15:34:45 -06:00
kevinz000 e6a061ee8f Merge pull request #10472 from keronshb/DermalFix
Dermal Button nanite icon fix
2020-01-08 13:34:42 -08:00
CitadelStationBot 3894d85c30 Automatic changelog generation for PR #10459 [ci skip] 2020-01-08 15:34:30 -06:00
kevinz000 5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded
Adds cold-blooded neutral quirk
2020-01-08 13:34:27 -08:00
CitadelStationBot 146b8f898c Automatic changelog generation for PR #10457 [ci skip] 2020-01-08 15:33:56 -06:00
kevinz000 5f03f5e3d8 Merge pull request #10457 from r4d6/Voice-Copy
Add a playback device and make the Voice Analyzer actually care about languages.
2020-01-08 13:33:54 -08:00
CitadelStationBot 4a5a89ffdc Automatic changelog generation for PR #10467 [ci skip] 2020-01-08 15:31:58 -06:00
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08:00
CitadelStationBot 465145a0a3 Automatic changelog generation for PR #10285 [ci skip] 2020-01-08 15:31:33 -06:00
kevinz000 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
CitadelStationBot 65d9f13abe Automatic changelog generation for PR #10452 [ci skip] 2020-01-08 15:30:39 -06:00
kevinz000 b68f81f4e6 Merge pull request #10452 from Ghommie/Ghommie-cit499
Fixes lattice's examine.
2020-01-08 13:30:37 -08:00
kevinz000 1e6d05dc59 Merge pull request #10470 from deathride58/deletesminers
[s] adds a cooldown to area creation attempts
2020-01-08 13:29:36 -08:00
Arturlang cc174d91ec Reviewer suggestion
Co-Authored-By: Lin <linzolle@gmail.com>
2020-01-08 22:02:50 +02:00