Commit Graph

24607 Commits

Author SHA1 Message Date
kappa-sama
68dfb6939f master
monkey
2019-10-19 11:34:01 -04:00
CitadelStationBot
9fd95537bc Automatic changelog generation for PR #9515 [ci skip] 2019-10-17 19:29:20 -05:00
kevinz000
a6acb212fa Merge pull request #9515 from Ghommie/Ghommie-cit241
Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer.
2019-10-17 17:29:18 -07:00
CitadelStationBot
59cc07637e Automatic changelog generation for PR #9523 [ci skip] 2019-10-17 19:28:59 -05:00
kevinz000
e9f4757446 Merge pull request #9523 from Linzolle/surgeryfixesohboy
[s] fix advanced surgery tools not working for coronary bypass and lobectomy
2019-10-17 17:28:57 -07:00
Linzolle
b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -05:00
CitadelStationBot
80072840bf Automatic changelog generation for PR #9505 [ci skip] 2019-10-17 15:23:36 -05:00
kevinz000
1d0931ede9 Merge pull request #9505 from Thalpy/Smartdart-QoL
[READY] Tweaks smartdarts with a few quality of life functions, and add a few new things.
2019-10-17 13:23:33 -07:00
CitadelStationBot
2d12f014fd Automatic changelog generation for PR #9414 [ci skip] 2019-10-17 15:19:00 -05:00
kevinz000
6103ffbafd Merge pull request #9414 from Poojawa/metabolize-lazychem
nerfs styptic/silversulf/synthflesh to have overdoses
2019-10-17 13:18:58 -07:00
CitadelStationBot
1c811c3f88 Automatic changelog generation for PR #9343 [ci skip] 2019-10-17 15:13:53 -05:00
kevinz000
1cc4ccee0d Merge pull request #9343 from Linzolle/dissection
port just like a ton of surgery changes from tg also abductor too
2019-10-17 13:13:51 -07:00
kevinz000
3e1120cd97 Merge pull request #9509 from Ghommie/Ghommie-cit239
properly blacklists space skeletons kek.
2019-10-17 13:11:05 -07:00
CitadelStationBot
9ab26fa3cb Automatic changelog generation for PR #9211 [ci skip] 2019-10-17 15:09:58 -05:00
kevinz000
d2497a8ba1 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance
[Atomic] Cargo rework - Mat selling nerf, addtion of grater gear to sell MK I
2019-10-17 13:09:55 -07:00
CitadelStationBot
bf3abe50e1 Automatic changelog generation for PR #9351 [ci skip] 2019-10-17 15:07:42 -05:00
kevinz000
1ff69c23fd Merge pull request #9351 from YakumoChen/holeymelon
Removes antimagic from holymelon
2019-10-17 13:07:40 -07:00
kevinz000
805fe2a91a Merge pull request #9496 from Ghommie/Ghommie-cit236
Removes the need of "_l" suffixes for digitigrade clothing on mob states
2019-10-17 13:06:17 -07:00
CitadelStationBot
fb232302d3 Automatic changelog generation for PR #9510 [ci skip] 2019-10-17 15:05:17 -05:00
kevinz000
033cd3cc53 Merge pull request #9510 from Ghommie/Ghommie-cit240
Fixing tracking implant teleport issues.
2019-10-17 13:05:15 -07:00
CitadelStationBot
d14d538848 Automatic changelog generation for PR #9516 [ci skip] 2019-10-17 15:04:17 -05:00
kevinz000
d9cb2792e5 Merge pull request #9516 from Ghommie/Ghommie-cit242
Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc."
2019-10-17 13:04:15 -07:00
CitadelStationBot
f8e5b5565a Automatic changelog generation for PR #9482 [ci skip] 2019-10-17 15:01:40 -05:00
kevinz000
8be030a931 Merge pull request #9482 from Thalpy/Wiki
Gives chemistry a library (and updates buttons at the top right of the game too).
2019-10-17 13:01:37 -07:00
kevinz000
65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238
Ports some in operator misuse bugfixes.
2019-10-17 12:59:44 -07:00
CitadelStationBot
8e3f11a1d2 Automatic changelog generation for PR #9498 [ci skip] 2019-10-17 14:58:30 -05:00
kevinz000
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves
Halloween Dwarves
2019-10-17 12:58:28 -07:00
CitadelStationBot
707cbacc9b Automatic changelog generation for PR #9483 [ci skip] 2019-10-17 14:55:45 -05:00
kevinz000
9c21659afc Merge pull request #9483 from ZeroNetAlpha/toylathe-fix
Update toylathe.dm
2019-10-17 12:55:43 -07:00
CitadelStationBot
ecff4f9d47 Automatic changelog generation for PR #9514 [ci skip] 2019-10-17 14:49:10 -05:00
kevinz000
5e049bc64a Merge pull request #9514 from Linzolle/kevin-has-a-foot-fetish
foot fetish content for kevin (ankle coverings)
2019-10-17 12:49:08 -07:00
CitadelStationBot
8f4b3c5d52 Automatic changelog generation for PR #9504 [ci skip] 2019-10-17 14:48:04 -05:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07:00
Poojawa
49ee9af897 metadata because people are throwing a fit about it 2019-10-17 01:30:47 -05:00
Trilbyspaceclone
113f62a705 right
we removed my tools...
2019-10-17 01:38:29 -04:00
Trilbyspaceclone
c0034e93a1 readds chose goose 2019-10-16 22:31:34 -04:00
Trilbyspaceclone
c91421984c Merge branch 'master' into Cargo_rebalance 2019-10-16 22:30:12 -04:00
CitadelStationBot
d658f23637 Automatic changelog generation for PR #9517 [ci skip] 2019-10-16 18:57:06 -05:00
kevinz000
ff56970c73 Merge pull request #9517 from kappa-sama/patch-1
Gee Nameko, why'd your syndicate employer let you have EIGHT ENERGY CROSSBOWS?
2019-10-16 16:57:04 -07:00
kappa-sama
cbf02e76a4 fixes cringe
why is this broken and who added this
2019-10-16 19:47:14 -04:00
kappa-sama
10bcfe3803 merge cringe
cringebaby naenae
2019-10-16 19:37:59 -04:00
Ghommie
57794421e3 Ports "Fixes morgues being able to consume ghosts, AI-eyes, etc." 2019-10-16 23:57:31 +02:00
Ghommie
f3a9cac11e Porting "Moves machine/computer frames and structures below object layer." and lowering trays layer. 2019-10-16 23:39:21 +02:00
Linzolle
1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
CitadelStationBot
c2cec9df43 Automatic changelog generation for PR #9477 [ci skip] 2019-10-16 14:44:37 -05:00
kevinz000
994bfddc1b Merge pull request #9477 from Thalpy/tgOrganFixes
[READY] Fixes a few organ code and lets organs freeze based on ambient temperature.
2019-10-16 12:44:34 -07:00
JTGSZ
f1b2eb93d7 Moonshiner doesn't exist here 2019-10-16 13:19:39 -04:00
CitadelStationBot
12393b82b1 Automatic changelog generation for PR #9506 [ci skip] 2019-10-16 03:00:17 -05:00
BlackMajor
e8649e5c3c Merge pull request #9506 from izzyinbox/bark
Adds *bark emote
2019-10-16 21:00:15 +13:00
Zna12
64819066c6 Update toylathe.dm
Think I fixed it.
2019-10-16 01:15:35 -05:00