Commit Graph

21280 Commits

Author SHA1 Message Date
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
kappa-sama
933916a386 e 2020-01-08 09:46:58 -05:00
kappa-sama
b3e916cc68 e 2020-01-08 09:44:16 -05:00
Unknown
4773a3e374 Fuggin Cowboy Clothes 2020-01-08 07:15:42 -07:00
Ghom
f263a3ea31 Merge pull request #10474 from Putnam3145/fix-traitor-again
[s] Fixes traitors
2020-01-08 13:48:12 +01:00
Putnam
fdce8e2b69 dang 2020-01-08 03:55:23 -08:00
Seris02
83eff39063 nope 2020-01-08 17:20:58 +08:00
Putnam
12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -08:00
Putnam
a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00
Putnam
26064e0992 crap 2020-01-07 17:37:57 -08:00
deathride58
89fcde9927 im like 3 iq dont bulli 2020-01-07 20:24:08 -05:00
deathride58
f0af57d7d6 wrong question mark place aaa 2020-01-07 20:22:06 -05:00
deathride58
633294c590 adds a basic sanity check to server_hop 2020-01-07 20:03:44 -05:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Putnam3145
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
Artur
cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
kevinz000
5b2c4deaa0 lockcharge --> locked_down 2020-01-07 12:04:41 -08:00
kevinz000
e4cfb1fa39 more 2020-01-07 12:03:46 -08:00
kevinz000
606ea46314 parentheses 2020-01-07 11:48:41 -08:00