Commit Graph

11647 Commits

Author SHA1 Message Date
kevinz000
932bdfd325 kay 2019-12-15 21:57:22 -07:00
kappa-sama
9f71900052 oop 2019-12-15 23:29:01 -05:00
kappa-sama
b6c9c73372 this cannot go wrong 2019-12-15 23:28:17 -05:00
kevinz000
b4bd2cbb5c Update preferences.dm 2019-12-15 20:20:04 -07:00
kevinz000
ba7a3f5fd2 Merge pull request #9971 from Xantholne/xantholne-christmas01
Adds the Christmas Clothes you never knew you wanted.
2019-12-15 20:11:09 -07:00
kevinz000
3b47949f82 haha fuck that's a lotta changes 2019-12-15 19:59:15 -07:00
Ghommie
843f4ed0da FLAK 2019-12-16 02:44:58 +01:00
BlackMajor
74cc1ec547 Merge pull request #10177 from BlackMajor/FIST
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
2019-12-16 14:14:35 +13:00
kevinz000
5f27103641 god FUCK you icons 2019-12-15 17:30:30 -07:00
kevinz000
0190054c97 Update carbon.dm 2019-12-15 17:08:41 -07:00
kevinz000
e496b7c397 Update eyes.dm 2019-12-15 17:02:43 -07:00
kevinz000
762cd00a5f Update eyes.dm 2019-12-15 16:55:56 -07:00
Unknown
ad88481f3e OwO whats this notices your 2019-12-15 16:45:34 -07:00
Putnam3145
363380405e Merge pull request #10198 from Ghommie/Ghommie-cit466
Fixes ranged syndicate mobs stormtrooper training: The port.
2019-12-15 15:42:13 -08:00
Putnam3145
7aa454dbbb Merge pull request #10197 from Ghommie/Ghommie-cit465
fixing double-flavour (and bland custom) ice creams.
2019-12-15 15:24:17 -08:00
Ghommie
22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. 2019-12-16 00:21:28 +01:00
Unknown
008c4ef822 according to all known laws of aviation 2019-12-15 16:18:42 -07:00
Unknown
9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Ghommie
0a4a2acbab fixing double-flavour ice creams. 2019-12-16 00:00:58 +01:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers
Bloodsuckers, or, yknow, vampires.
2019-12-15 14:41:36 -08:00
kappa-sama
f8a05b5ae1 perhaps 2019-12-15 17:31:49 -05:00
Artur
58f4f58cd2 Slaughter demons shouldnt bleed 2019-12-16 00:05:51 +02:00
Ghommie
d3d1f8328f compiles now. 2019-12-15 22:16:02 +01: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
4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13: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
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
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
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
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