Putnam3145
|
56a349bcd0
|
Merge pull request #10195 from Ghommie/Ghommie-cit464
Fixes a few quirks not being properly removed when deleted, also bringing them in line with the rest instead of being removable through surgery.
|
2019-12-15 15:24:59 -08:00 |
|
CitadelStationBot
|
78575bd47d
|
Automatic changelog generation for PR #10197 [ci skip]
|
2019-12-15 17:24:20 -06: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 |
|
CitadelStationBot
|
423b2e7e90
|
Automatic changelog generation for PR #10011 [ci skip]
|
2019-12-15 16:41:39 -06: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 |
|
Ghommie
|
7118210911
|
GOTTA KEEP THIS AROUND UNTIL OFFSTATION ANTAGS ARE STOPPED FROM BEING QUIRK'D.
WIZARDS GOTTA CHANT THEIR MAGICK SOMEHOW.
|
2019-12-15 23:07:18 +01:00 |
|
Artur
|
58f4f58cd2
|
Slaughter demons shouldnt bleed
|
2019-12-16 00:05:51 +02:00 |
|
Ghommie
|
6593b2a5a7
|
Fixes some quirks not being properly removed when deleted.
|
2019-12-15 23:02:41 +01:00 |
|
Ghommie
|
d3d1f8328f
|
compiles now.
|
2019-12-15 22:16:02 +01:00 |
|
CitadelStationBot
|
7ee71f9702
|
Automatic changelog generation for PR #10144 [ci skip]
|
2019-12-15 14:08:48 -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 |
|
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 |
|
CitadelStationBot
|
8e97b0e331
|
Automatic changelog generation for PR #10166 [ci skip]
|
2019-12-14 22:37:59 -06: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 |
|
CitadelStationBot
|
0921c3541a
|
Automatic changelog generation for PR #9970 [ci skip]
|
2019-12-14 18:16:37 -06: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 |
|
CitadelStationBot
|
979807926f
|
Automatic changelog generation for PR #10122 [ci skip]
|
2019-12-14 18:05:01 -06: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 |
|
CitadelStationBot
|
773d574427
|
Automatic changelog generation for PR #10150 [ci skip]
|
2019-12-14 18:03:00 -06: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 |
|
CitadelStationBot
|
f24dfa6387
|
Automatic changelog generation for PR #10163 [ci skip]
|
2019-12-14 18:00:01 -06: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 |
|
Ghommie
|
081d3df750
|
This is one serious Pepe Silvia complex.
|
2019-12-14 22:52:40 +01:00 |
|
CitadelStationBot
|
b84b54d53f
|
Automatic changelog generation for PR #10171 [ci skip]
|
2019-12-14 13:04:40 -06: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 |
|
CitadelStationBot
|
8ddde88199
|
Automatic changelog generation for PR #10050 [ci skip]
|
2019-12-13 23:33:34 -06: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 |
|
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 |
|
r4d6
|
5f95e0d5a6
|
Remove an extra antimatter engine shielding
|
2019-12-13 08:17:06 -05:00 |
|
BlackMajor
|
2bf35ec81c
|
Nuclear fist
|
2019-12-14 02:15:09 +13:00 |
|
Ghommie
|
221291f525
|
Fixing some not safe for work oddity.
|
2019-12-13 08:02:39 +01:00 |
|