Commit Graph

18158 Commits

Author SHA1 Message Date
Ghom
00325e7de6 Merge pull request #10493 from Putnam3145/score-instead
Makes the post-secret gamemode vote score-based instead of schulze-based
2020-01-13 13:46:39 +01:00
Ghom
ed42ed5a1e Merge pull request #10551 from Arturlang/mesmerize_quickfiz
[s]Fixes bloodsucker mesmerize mute
2020-01-13 12:49:13 +01:00
Ghom
942e321b76 Merge pull request #10555 from Arturlang/Lummox_suggestions
Ports lummoxes suggestions
2020-01-13 12:48:19 +01:00
Artur
e3d3f7b750 Ported 2020-01-13 13:20:55 +02:00
Arturlang
f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur
1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
Xantholne
903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
Putnam
4c4c965e86 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into score-instead 2020-01-12 17:36:56 -08:00
r4d6
d04a882c29 Prevent Playback Devices from triggering Voice Analyzer 2020-01-12 18:49:33 -05:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
Putnam
82d8900e5d aaand move this over 2020-01-12 03:36:47 -08:00
Putnam
3f5e68765e am i fucking stupid? 2020-01-12 03:10:42 -08:00
Putnam
295c134243 i'm so dumb dude 2020-01-12 03:06:17 -08:00
kevinz000
e1ae3f3c07 Merge pull request #10492 from Trilbyspaceclone/plastic__world
Plastic snow
2020-01-12 00:49:39 -08:00
kevinz000
f210971889 Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk
Significantly lowers the forcefield projector health, lowers armor.
2020-01-12 00:47:17 -08:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
kevinz000
0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02
Bees
2020-01-12 00:42:19 -08:00
kevinz000
6396c95bec Merge pull request #10480 from Putnam3145/more_flavor
Added second flavor text, not copied anywhere.
2020-01-12 00:41:47 -08:00
kevinz000
fe720dbb9c Merge pull request #10500 from rossark/robo
ports fast augmentation surgery pr from /tg/
2020-01-12 00:41:30 -08:00
Putnam3145
01db064038 Merge pull request #10532 from Ghommie/Ghommie-cit503
A few reagents related fixes.
2020-01-12 00:41:00 -08:00
kevinz000
c69d882943 Merge pull request #10521 from BlackMajor/master
Fixes roundstart borg spawns, plus a little bit extra.
2020-01-12 00:40:48 -08:00
kevinz000
4b4864740b Merge pull request #10522 from Hatterhat/syndi-sleeper
printable syndicate sleepers - this is blackmajors fault im not gonna lie
2020-01-12 00:40:17 -08:00
kevinz000
ddff903532 Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
2020-01-12 00:38:43 -08:00
kevinz000
ce1dabb585 Merge pull request #10513 from r4d6/open-message
Add a message when pulsing the open wire on airlocks
2020-01-12 00:37:33 -08:00
kevinz000
68d02de239 Merge pull request #10516 from BonniePandora/Proc-call-shit
Allows calling procs in SDQL update queries without storing the return anywhere
2020-01-12 00:37:12 -08:00
kevinz000
f5995cfaaa this is a massive security risk 2020-01-12 00:36:52 -08:00
Putnam
5dc5ddaa76 daddy compiler please stop hating me 2020-01-11 22:17:18 -08:00
Putnam
0c64ea1351 wow that was fucking dumb 2020-01-11 18:37:16 -08:00
Putnam
37c6119708 Sanity
this is a commit by jimmy buffett
2020-01-11 18:26:32 -08:00
Lin
d6b28c59d4 Merge pull request #10509 from Ghommie/Ghommie-cit502
Fixes reagent containers examine.
2020-01-11 22:16:27 +00:00
Ghommie
16db38a08f Travis man good 2020-01-11 20:51:15 +01:00
Ghommie
c709a9e4a9 A few reagents related fixes. 2020-01-11 18:45:54 +01:00
kevinz000
af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
Ghom
7fa3289013 Merge pull request #10497 from Trilbyspaceclone/uplink_redo
Cleans up uplink_items into each folder
2020-01-11 15:28:04 +01:00
Ghom
894abc67c0 Merge pull request #10502 from Linzolle/big-boss
[s] i'm trying to sneak around
2020-01-11 15:24:21 +01:00
Ghom
c2b3e7b0ec Merge pull request #10505 from LetterN/beep-boom
better electropack ui
2020-01-11 15:21:08 +01:00
Ghom
1f9a7066f0 Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7
Grey Tide spear is now vareditable
2020-01-11 15:10:16 +01:00
Ghom
3a72d1f434 Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12
allow guests to use looc
2020-01-11 15:09:37 +01:00
Ghom
e12f5e9e44 Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15
Fixes health analyzers
2020-01-11 15:07:55 +01:00
Ghom
e851939281 Merge pull request #10523 from Hatterhat/fuck-you-baltimore
you can finally put armor plating on your standard explorer suit hood again
2020-01-11 15:06:20 +01:00
Ghom
5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00
Putnam
85f6367df5 weh 2020-01-11 03:50:19 -08:00
Putnam
9d3873f26f traitor always available 2020-01-11 03:32:14 -08:00
Putnam
312da86424 Suggested changes 2020-01-11 01:28:49 -08:00
Putnam
e0587aeac0 another dumb patch 2020-01-10 23:33:26 -08:00
Hatterhat
2006ccf4ef nicc you buffoon you never adjusted the hood type 2020-01-11 00:12:52 -06:00
Hatterhat
b5f8e46941 this is blackmajors fault im not gonna lie 2020-01-10 23:41:30 -06:00
BlackMajor
30fc5b560b Couple of lingering fixes 2020-01-11 17:57:18 +13:00
Putnam
c6507d47e2 bad patches, ugh 2020-01-10 20:06:35 -08:00