Commit Graph

18049 Commits

Author SHA1 Message Date
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing
modular citadel file destruction but only slightly
2020-01-11 00:30:58 +00:00
Lin
cd8e83e7c0 Merge pull request #10486 from Seris02/observe
moves observe to ghost tab instead of sticking it in the ooc tab
2020-01-10 23:56:46 +00:00
Lin
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
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
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
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
kevinz000
52a0f5779d Update tables_racks.dm 2020-01-09 15:20:57 -08: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
Putnam3145
3d4e68cf26 Merge branch 'master' into random-engine 2020-01-08 21:08:20 -08: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
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
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
Putnam
a97fa8f81a also made objectives deletable 2020-01-07 18:01:24 -08:00