Commit Graph

18273 Commits

Author SHA1 Message Date
Seris02 5fae814e42 did it thanks 2020-01-07 17:52:46 +08:00
Putnam 70a1a0a9c1 better way to do it tbh 2020-01-07 00:39:14 -08:00
Putnam 6f6f0cbb62 Tweaks to ghost dojo 2020-01-06 23:33:29 -08:00
r4d6 68e48209da Fix 2020-01-07 02:04:06 -05:00
r4d6 20d5e4f480 Make the RCD show its upgrades on examination.
And remove a small copy-pasta.
2020-01-07 01:45:59 -05:00
r4d6 c3f47e713a Merge branch 'master' into RCD-Updates 2020-01-07 00:04:43 -05:00
r4d6 d7718c8dd1 Revert "Conflict Fix part 1"
This reverts commit 2ab07fdb82.
2020-01-06 23:43:27 -05:00
r4d6 2ab07fdb82 Conflict Fix part 1 2020-01-06 23:43:04 -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
kevinz000 f6b9396096 Merge pull request #10439 from LetterN/tachelon-logs
doppler logs
2020-01-06 19:45:28 -08:00
BlackMajor 5a97259ba9 Fix a couple of bugs, add wrapping paper and destination tagger 2020-01-07 15:33:16 +13:00
Lin 2ce3b7fbf5 Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
2020-01-07 01:00:25 +00:00
Lin da43d336c3 Merge pull request #10047 from Ghommie/Ghommie-cit425
Turns dog/cat petting into an element datum.
2020-01-07 00:55:19 +00:00
Lin 718d4a080d Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
2020-01-07 00:31:24 +00:00
Lin 46420a693d Merge branch 'master' into Ghommie-cit425 2020-01-07 00:28:37 +00:00
Putnam f728c4746f Allowed random engines to be weighted. 2020-01-06 16:25:17 -08: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 2859e6e5ba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into cold-blooded 2020-01-06 02:07:09 -08:00
Putnam 72dded26f2 cold-blooded trait 2020-01-06 02:06:19 -08:00
Putnam 32043a9062 whoops forgot permaboner 2020-01-06 01:14:00 -08:00
Putnam3145 3b6cf8c952 Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
2020-01-05 23:08:49 -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
Putnam da830d3449 Added scores for my own dastardly reasons 2020-01-05 19:49:54 -08: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 4cc0833b28 Fixing an edge case runtime with ore bags. 2020-01-06 01:45:53 +01:00
Letter N de14073956 limit 2020-01-06 08:34:48 +08:00
Ghommie 1afd3d76cb Fixes lattice's examine. 2020-01-06 01:18:11 +01:00
Ghommie 75d47c2a0d Improves the set_APTFT verb into a proc. 2020-01-05 23:51:42 +01:00
Ghom 869ed7a4aa Merge pull request #10427 from Hatterhat/beakers-but-quirky
beaker tweaks: setting transfer values verb on altclick, value tweaks
2020-01-05 23:08:23 +01:00
Ghom e18244671f Merge pull request #10350 from Putnam3145/dojo-ghostrole
Ghost cafe quality-of-life, plus making ghost role eligibility an element
2020-01-05 23:05:13 +01:00
Ghom a8741a8462 As you command. 2020-01-05 23:01:35 +01:00
Ghommie 592422ee70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-05 22:53:00 +01:00
Artur c438d39eb3 Initial Commit 2020-01-05 22:32:29 +01:00
kevinz000 0f909a1437 Update twohanded.dm 2020-01-05 12:50:51 -08:00
kevinz000 6e50bb9c03 Revert "Makes mob/Stat on a 1 second timer rather than fast-as-possible to tone down highpop lag" 2020-01-05 12:47:24 -08:00