Commit Graph

9940 Commits

Author SHA1 Message Date
YakumoChen
61bc735ee7 remove gatling laser 2019-10-20 03:07:23 +00:00
YakumoChen
37f58798ab no crafting 2019-10-20 03:05:21 +00: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
Linzolle
b9572c0fc8 somebody FORGOT 2019-10-17 18:00:08 -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
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
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
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
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
kevinz000
65841a9485 Merge pull request #9507 from Ghommie/Ghommie-cit238
Ports some in operator misuse bugfixes.
2019-10-17 12:59:44 -07:00
kevinz000
eef68f43cf Merge pull request #9498 from JTGSZ/october-dwarves
Halloween Dwarves
2019-10-17 12:58:28 -07: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
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements
Vore fixes and optimizations
2019-10-17 12:48:01 -07: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
kappa-sama
cbf02e76a4 fixes cringe
why is this broken and who added this
2019-10-16 19:47:14 -04: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
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
kevinz000
7187da9e72 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2019-10-15 23:11:35 -07:00
kevinz000
e187f806a0 Merge pull request #9479 from lolman360/ltsurge
fixes bug with new surgerytools examine
2019-10-15 23:04:15 -07:00
kevinz000
6d1035e995 Merge pull request #9491 from Poojawa/wingfix
Fixes missing decorative wing states
2019-10-15 22:59:45 -07:00
kevinz000
3d5facdea5 Merge pull request #9502 from Putnam3145/pandemic-qol2
Makes beaker spawn on pandemic instead of on user when hands full
2019-10-15 22:53:44 -07:00
Poojawa
2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Fermi
f587beeef4 2 hats and undoes halloween accidental change 2019-10-15 22:56:42 +01:00
Fermi
00adead300 Fixes syringes too. 2019-10-15 21:43:04 +01:00
Ghommie
fb94e4fef1 properly blacklists space skeletons kek. 2019-10-15 20:45:49 +02:00
Poojawa
d9af826333 whatever 2019-10-15 13:19:56 -05:00
Poojawa
1780f1addd animal nom still don't work but runtimes are fixed
whatever
2019-10-15 12:11:46 -05:00
Poojawa
04b414f6b4 Improving Sounds yet again 2019-10-15 08:58:22 -05:00
Thalpy
597160ca15 Fixed werid stuff. 2019-10-15 14:17:36 +01:00
Thalpy
e115c456f3 Ohh I'm fixing 2019-10-15 13:41:49 +01:00
Poojawa
4396bd4280 runtime fixings I guess 2019-10-15 07:08:00 -05:00
Poojawa
9308ee517f fixing some belly mode quirks 2019-10-15 06:49:31 -05:00
Thalpy
acc0ff8a17 Adds craftable extended mags 2019-10-15 12:37:35 +01:00
deathride58
9fd4e7f673 Merge pull request #9472 from Thalpy/Quickfixforfood
[speedmerge] Quickfixforfood and fixes the chem hindenburg
2019-10-15 06:32:59 -04:00
Thalpy
23743c8630 Updates chemmaster 2019-10-15 11:21:05 +01:00
deathride58
df17f34eb6 Merge pull request #9488 from Ghommie/Ghommie-cit231
Adds some missing species_traits for cloth, clockwork and cult golems.
2019-10-15 06:20:43 -04:00
deathride58
ffa7898f45 Merge pull request #9478 from Putnam3145/podfatfix
Makes pod people not constantly slightly fat
2019-10-15 06:19:26 -04:00
Thalpy
1eccc93137 Oh it's so good 2019-10-15 10:44:35 +01:00
Poojawa
f0860afd09 Probably fixes broke ass interactions
Fuckin byond
2019-10-15 04:33:55 -05:00
Thalpy
1b170fe2b7 Costume for meee 2019-10-15 10:27:31 +01:00
Poojawa
d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa
ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
Thalpy
4b069afb42 Scrub a dub dub 2019-10-15 08:42:40 +01:00
Thalpy
91762d7c65 Cleanup 2019-10-15 08:22:53 +01:00