Commit Graph

19834 Commits

Author SHA1 Message Date
kevinz000 dfce4ea75f Update looc.dm 2020-01-09 09:30:49 -08:00
Putnam 896df2ace3 score instead of ranked choice 2020-01-09 04:47:14 -08:00
Putnam a7cf509230 relief valve. 2020-01-09 03:43:06 -08:00
Trilbyspaceclone 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
Seris02 3f7a0f4b7c fixes chameleon cloak icon 2020-01-09 15:07:43 +08:00
Seris02 adfb077a0a chameleon fixes 2020-01-09 15:05:46 +08:00
Unknown 62396bffb1 Clothesmate vending 2020-01-08 22:47:28 -07:00
loginsandylogout 709a803f19 oops 2020-01-08 23:34:43 -06:00
loginsandylogout 02541f1e3e thisis it 2020-01-08 23:34:26 -06:00
Putnam3145 3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08:00
loginsandylogout 725828b996 fixes ti? 2020-01-08 22:52:47 -06:00
loginsandylogout 248785dc94 aaa 2020-01-08 22:45:23 -06:00
loginsandylogout 20948b66bb should hide legs 2020-01-08 22:45:23 -06:00
Commandersand 11aab54864 oops 2020-01-08 22:45:23 -06:00
Commandersand c2a8c23751 fixes 2020-01-08 22:45:22 -06: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
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
Seris02 c7790aba1a moves observe to ghost tab 2020-01-09 10:46:18 +08:00
Ghom dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs
Fix limb damage
2020-01-09 03:04:44 +01:00
Putnam 244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
Putnam fdbbcfe59a it's functional, sprite time 2020-01-08 17:05:43 -08: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
kappa-sama f69c67cf5c tabs 2020-01-08 17:03:48 -05:00
kappa-sama ff5901cadb hi 2020-01-08 16:50:40 -05:00
kappa-sama ceea7cd021 moves these over too 2020-01-08 16:47:22 -05:00
kappa-sama 38015d0d02 moves this 2020-01-08 16:45:52 -05:00
kappa-sama 341e076d40 refill 2 2020-01-08 16:43:47 -05:00
kappa-sama 18b78e7671 refill 2020-01-08 16:43:33 -05:00
kappa-sama ebf8d048fd perhaps? 2020-01-08 16:42:16 -05:00
kappa-sama c88f58bb67 hm 2020-01-08 16:41:44 -05: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
kevinz000 6a350d5d58 Merge pull request #10442 from Trilbyspaceclone/patch-264
Halfs the nutriments in sugar
2020-01-08 13:40:39 -08:00
kappa-sama 35353996bd lazy copypaste 2020-01-08 16:36:53 -05:00
kevinz000 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks
[READY] Bloodsucker tweaks
2020-01-08 13:36:24 -08:00
kevinz000 5360f85e21 Merge pull request #10459 from Putnam3145/cold-blooded
Adds cold-blooded neutral quirk
2020-01-08 13:34:27 -08: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
kevinz000 dbd2cb6195 Merge pull request #10467 from Seris02/boxfix
stops lightspeed spessmen in boxes
2020-01-08 13:31:55 -08: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
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
Artur e16f1d2f21 Makes regen coles not heal instead of affecting aheal 2020-01-08 21:01:37 +01:00
Artur 039248dac7 Kills legion core healing 2020-01-08 20:29:30 +01:00
Trilbyspaceclone 5f5c45c0ff Update glass.dm 2020-01-08 13:01:51 -05:00