 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 |
|
|
LinandGitHub
|
c162e9bb5d
|
Merge pull request #10453 from Ghommie/Ghommie-cit500
Fixing an edge case runtime with ore bags.
|
2020-01-07 19:37:49 +00:00 |
|
|
r4d6andGitHub
|
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
|
f6fef84984
|
Make the RCD effect not right-clickable.
|
2020-01-07 11:23:25 -05: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 |
|
|
deathride58andGitHub
|
cde9946e25
|
is this why wrench refuses to work
|
2020-01-07 09:00:30 -05:00 |
|
|
deathride58andGitHub
|
686601334e
|
suggested changes
|
2020-01-07 08:52:13 -05:00 |
|
|
kevinz000
|
0114f9e223
|
whitelist
|
2020-01-07 04:54:32 -08:00 |
|
|
kevinz000
|
fa7dcad49a
|
compile
|
2020-01-07 04:54:11 -08:00 |
|
|
kevinz000
|
ab2292dfd5
|
Fail2Topic
|
2020-01-07 04:48:39 -08:00 |
|
|
Putnam
|
19887691f3
|
added deadchat toggle to dojo mobs too
|
2020-01-07 04:39:04 -08:00 |
|
|
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 |
|
|
TrilbySpaceClone
|
6a2696f1f8
|
ghommie said
|
2020-01-07 03:10:22 -05: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 |
|
|
r4d6andGitHub
|
c3f47e713a
|
Merge branch 'master' into RCD-Updates
|
2020-01-07 00:04:43 -05:00 |
|
|
TrilbyspacecloneandGitHub
|
f7aa4f3050
|
Merge branch 'master' into glassware
|
2020-01-06 23:55:44 -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 |
|
|
kevinz000andGitHub
|
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 |
|
|
kevinz000andGitHub
|
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 |
|
|
LinandGitHub
|
2ce3b7fbf5
|
Merge pull request #10455 from Ghommie/Ghommie-cit501
Porting some runtime fixes.
|
2020-01-07 01:00:25 +00:00 |
|
|
LinandGitHub
|
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 |
|
|
LinandGitHub
|
718d4a080d
|
Merge pull request #9878 from Ghommie/Ghommie-cit382
Unmodularize several machinery and structures
|
2020-01-07 00:31:24 +00:00 |
|
|
LinandGitHub
|
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 |
|
|
GhomandGitHub
|
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 |
|
|
Putnam3145andGitHub
|
3b6cf8c952
|
Merge pull request #10401 from r4d6/SM
Add three more Supermatter Engine variation for Box
|
2020-01-05 23:08:49 -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 |
|
|
LinandGitHub
|
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 |
|
|
Ghommie
|
dcb2ae77fa
|
Porting some runtime fixes.
|
2020-01-06 02:14:25 +01:00 |
|