Commit Graph

11866 Commits

Author SHA1 Message Date
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 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
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 12a04da2d2 Added second flavor text, not copied on save. 2020-01-08 00:57:42 -08:00
Putnam 26064e0992 crap 2020-01-07 17:37:57 -08: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
r4d6 7c757900f2 Fix the category 2020-01-07 13:27:44 -05:00
Artur 97a9ad4714 Nerfs cloak some more 2020-01-07 19:22:39 +01:00
Artur 81f1349cea Nerf Stamina and cloneloss 2020-01-07 18:41:17 +01:00
Artur 7141223f49 All ready now, forgot how stat worked 2020-01-07 18:39:13 +01:00
r4d6 a91f31d9e6 Fix a typo 2020-01-07 11:21:00 -05:00
deathride58 6f2cf0b636 [s] adds a cooldown to area creation attempts 2020-01-07 10:04:09 -05:00
kevinz000 ab2292dfd5 Fail2Topic 2020-01-07 04:48:39 -08:00
r4d6 c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
kevinz000 62b8513795 fix 2020-01-06 19:50:46 -08:00
kevinz000 82ca801c0c Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-06 19:50:21 -08:00
kevinz000 d1533d4d06 Merge remote-tracking branch 'citadel/master' into isbanned2 2020-01-06 19:49:46 -08:00
kevinz000 4599abde4a Merge pull request #10420 from MrJWhit/radiation-plasma-usage
Increase radiation plasma usage in radiation collector
2020-01-06 19:46:42 -08:00
BlackMajor 5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
keronshb a7af5203e7 This is a test to see if they all work together
Title
2020-01-06 20:29:44 -05:00
keronshb 35cd77d433 Adds the nanite remote for some programs
Adds a new remote function from tg
2020-01-06 20:28:33 -05:00
Lin 2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
Lin 46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Ghom d07d436ba2 Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
2020-01-06 21:47:15 +01:00
Artur d283532d97 Removes tresspass handcuff removal 2020-01-06 20:49:14 +01:00
Artur 41f96c0dc9 Whoopsie 2020-01-06 20:31:55 +01:00
Artur 4fc6aa10be Adds a cooldown for revival 2020-01-06 20:29:10 +01:00
Artur 8a193304ee Buffs torpor without coffin 2020-01-06 20:22:39 +01:00
Artur b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Artur 00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
Putnam 32043a9062 whoops forgot permaboner 2020-01-06 01:14:00 -08:00
Putnam 218e701fa9 whoops forgot update appearance 2020-01-05 21:48:04 -08:00
r4d6 f6099f341b Allow Voice Analyzers to recognize languages 2020-01-05 23:55:31 -05:00
r4d6 6d3345d166 Add the Playback Device 2020-01-05 23:32:44 -05:00
Lin 7ad6021472 Merge pull request #10437 from Ghommie/Ghommie-cit497
Fixes roundstart mushpeople being unable to MUSH PUUUUUUUUUUUUNCH!!
2020-01-06 03:49:52 +00:00
Putnam e7684f5df7 whoops forgot to use sensitivity 2020-01-05 19:29:23 -08:00
Putnam fba7a8abb0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-05 19:12:28 -08:00
Putnam d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +01:00
Ghommie 75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00