Commit Graph

19834 Commits

Author SHA1 Message Date
Ghommie d3d1f8328f compiles now. 2019-12-15 22:16:02 +01:00
Putnam f943bcb3b5 make cowabunga description less, uh, bad 2019-12-15 12:17:07 -08:00
loginsandylogout 6f9be0c863 saves the world 2019-12-15 14:11:44 -06:00
Putnam3145 b7d082a204 Merge pull request #10144 from Linzolle/sabre-noise
makes the officer's sabre play the un/sheating noise properly
2019-12-15 12:08:46 -08:00
Ghommie 80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
Trilbyspaceclone 499c2a30e7 corrections for .4 metaballic rate 2019-12-15 13:59:54 -05:00
kevinz000 8c27c176ca move this.. 2019-12-15 09:12:58 -07:00
BlackMajor c6732bb516 typo lol 2019-12-16 01:28:34 +13:00
BlackMajor 4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13:00
loginsandylogout 0f40db60ce honk 2019-12-15 03:38:00 -06:00
Trilbyspaceclone 9a2311b72b grammar 2019-12-15 02:42:17 -05:00
Trilbyspaceclone b41eb4426e there's 2019-12-15 02:38:38 -05:00
kevinz000 db767d8ddf bad idea 2019-12-15 00:37:34 -07:00
kevinz000 a4ffef5b1f Typos 2019-12-15 00:36:20 -07:00
kevinz000 600017f4e1 experimental filter 2019-12-15 00:34:12 -07:00
kevinz000 297c909b76 resting stuff 2019-12-15 00:29:18 -07:00
kevinz000 586dcb6f81 welp i got lazy 2019-12-15 00:15:32 -07:00
kevinz000 4970675467 s 2019-12-15 00:06:11 -07:00
TrilbySpaceClone c5cac186fc bad notes bgone 2019-12-15 01:50:57 -05:00
TrilbySpaceClone 32cbe8588e fogot the beest one 2019-12-15 01:15:55 -05:00
TrilbySpaceClone 5febc54fb8 whats all the buzz around this new drink? 2019-12-15 01:13:15 -05:00
Putnam3145 2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457
Ports "Roundstart borg brains no longer decay."
2019-12-14 20:37:57 -08:00
Putnam e44566038b linter is correct 2019-12-14 20:32:34 -08:00
Putnam 74e4391cee uh, vote changes necessary too 2019-12-14 20:01:38 -08:00
Putnam b96d36e719 alright that's that 2019-12-14 20:01:30 -08:00
Lin cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
2019-12-15 00:16:34 +00:00
Unknown 73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Lin 49c37641a7 Merge pull request #10122 from Citadel-Station-13/kevinz000-patch-124
nerfs factorio (conveyors can no longer stack more than 150 items on one tile)
2019-12-15 00:04:58 +00:00
Lin 1f852ea92a Merge pull request #10150 from Trilbyspaceclone/patch-245
Corrects telegram hat icon, adds a new dog fashion to telegram hat
2019-12-15 00:02:57 +00:00
Lin 43646434a0 Merge pull request #10163 from Ghommie/Ghommie-cit455
Allows blood bank generators to be wrenched and unwrenched.
2019-12-14 23:59:58 +00:00
Putnam 967bcce38e actually i still need this 2019-12-14 14:17:05 -08:00
Putnam 0deaebc4ca voting makes everything dumb 2019-12-14 14:16:02 -08:00
Putnam e1f0c52b96 that's storytellers. time for voting 2019-12-14 14:13:23 -08:00
Ghommie 081d3df750 This is one serious Pepe Silvia complex. 2019-12-14 22:52:40 +01:00
Putnam3145 bd1040ab60 Merge pull request #10171 from r4d6/patch-1
Who the fuck put 10 shielding when you need 9?
2019-12-14 11:04:37 -08:00
Ghommie 12b87b4f3d Better. 2019-12-14 19:29:51 +01:00
Ghommie 2ccfaf38fb consistency. 2019-12-14 19:27:39 +01:00
Ghommie 6117434c7f Ok 2019-12-14 19:24:43 +01:00
Ghommie 70252d2914 Fixing a few pill bottle issues with the ChemMaster. 2019-12-14 19:20:02 +01:00
Ghommie e5d45faee8 deadchat, not deathchat. 2019-12-14 18:53:53 +01:00
Artur 6124fbf316 Hopefully this fixes the linter errors 2019-12-14 19:04:36 +02:00
Ghommie 3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
Artur d0493ac471 Reviewer and linter fixes, and veil tweak 2019-12-14 17:09:39 +02:00
Lin 2e003b7383 Merge pull request #10050 from Ghommie/Ghommie-cit427
Adds view and viewers checks for ranged construction devices such as ARCD and RLD.
2019-12-14 05:33:31 +00:00
BlackMajor 59d0376985 finished 2019-12-14 17:31:26 +13:00
Hatterhat 44ed639169 i should probably write an actual changelog for this 2019-12-13 22:16:50 -06:00
Hatterhat a1cc129d0b slightly better storage, cucks the surgery duffel 2019-12-13 21:10:12 -06:00
kevinz000 659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw
Removes medihounds (actually just makes them a medical aux sprite)
2019-12-13 16:52:22 -07:00
Artur 9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00