Commit Graph

28315 Commits

Author SHA1 Message Date
kevinz000
eff86a449f wew 2020-01-14 16:45:22 -07:00
CitadelStationBot
8c50b578b4 Automatic changelog generation for PR #10544 [ci skip] 2020-01-12 09:02:24 -06:00
Ghom
e90cef5c69 Merge pull request #10544 from AffectedArc07/file-standardisation
[LARGE PR] Standardises all files from CRLF to LF
2020-01-12 16:02:20 +01:00
AffectedArc07
3e9de4d1ed Ill explain in comments 2020-01-12 14:42:38 +00:00
AffectedArc07
653b302d46 Forgot this 2020-01-12 14:36:00 +00:00
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
CitadelStationBot
ca848e547f Automatic changelog generation for PR #10492 [ci skip] 2020-01-12 02:49:42 -06: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
CitadelStationBot
abd4754631 Automatic changelog generation for PR #10416 [ci skip] 2020-01-12 02:45:23 -06:00
kevinz000
60524fb9c7 Merge pull request #10416 from r4d6/RCD-Updates
Massive RCD Port & Updates
2020-01-12 00:45:21 -08:00
CitadelStationBot
d9d0e7c5e7 Automatic changelog generation for PR #10504 [ci skip] 2020-01-12 02:42:21 -06:00
kevinz000
0b56e76b29 Merge pull request #10504 from Xantholne/xantholne-bees02
Bees
2020-01-12 00:42:19 -08:00
CitadelStationBot
f13851704f Automatic changelog generation for PR #10480 [ci skip] 2020-01-12 02:41:50 -06: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
CitadelStationBot
33a705e067 Automatic changelog generation for PR #10532 [ci skip] 2020-01-12 02:41:03 -06: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
CitadelStationBot
58f41ffee2 Automatic changelog generation for PR #10522 [ci skip] 2020-01-12 02:40:20 -06: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
CitadelStationBot
958abdc515 Automatic changelog generation for PR #10518 [ci skip] 2020-01-12 02:38:46 -06:00
kevinz000
ddff903532 Merge pull request #10518 from Seris02/explosionport
ports the explosion rework thingamajig
2020-01-12 00:38:43 -08:00
CitadelStationBot
ef00d1522c Automatic changelog generation for PR #10513 [ci skip] 2020-01-12 02:37:36 -06: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
CitadelStationBot
555747df90 Automatic changelog generation for PR #10516 [ci skip] 2020-01-12 02:37:15 -06: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
CitadelStationBot
ae46c1f63d Automatic changelog generation for PR #10509 [ci skip] 2020-01-11 16:16:29 -06: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
Ghom
16997433c9 Merge pull request #10528 from Citadel-Station-13/kevinz000-patch-12
fixes vampires
2020-01-11 19:16:46 +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
CitadelStationBot
81fee7384d Automatic changelog generation for PR #10247 [ci skip] 2020-01-11 08:29:28 -06:00
Ghom
34502cab1d Merge pull request #10247 from Seris02/atmosfirelock
ATMOS Firelocks and more
2020-01-11 15:29:25 +01:00
CitadelStationBot
ec01d60b49 Automatic changelog generation for PR #10497 [ci skip] 2020-01-11 08:28:07 -06: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
CitadelStationBot
7a41fc4ee8 Automatic changelog generation for PR #10505 [ci skip] 2020-01-11 08:21:11 -06: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
CitadelStationBot
bd53100e72 Automatic changelog generation for PR #10495 [ci skip] 2020-01-11 08:09:39 -06: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
CitadelStationBot
49bc21d906 Automatic changelog generation for PR #10511 [ci skip] 2020-01-11 08:07:57 -06: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
CitadelStationBot
6264e368f4 Automatic changelog generation for PR #10523 [ci skip] 2020-01-11 08:06:23 -06: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
CitadelStationBot
600732728a Automatic changelog generation for PR #10465 [ci skip] 2020-01-11 08:03:47 -06:00
Ghom
5dc598e2ea Merge pull request #10465 from Putnam3145/more-dojo-tweaks
More ghost dojo tweaks
2020-01-11 15:03:45 +01:00