Commit Graph

25989 Commits

Author SHA1 Message Date
Neerti
50562f79cf Merge pull request #3886 from Anewbe/more_promethean_fixes
Merc Prommies should be able to wear their space suits.
2017-09-22 00:58:21 -04:00
Neerti
98a4158fa7 Merge pull request #3884 from Anewbe/condensation_sceptre
Condensation can now freeze floors, if you have the scepter.
2017-09-22 00:57:16 -04:00
Neerti
3bce4ed285 Merge pull request #3893 from Anewbe/bioprinter
Improves the bioprinter
2017-09-21 00:58:41 -04:00
Anewbe
61936496b1 Merge pull request #3813 from Belsima/clickityclack
Adds a metric assload of sounds.
2017-09-20 22:20:17 -05:00
Belsima
c67865ac63 Adds a load of new FBPs. (#3850)
* Adds a load of new FBPs.

* Replaces cyber solutions sprites.

* Fixes and price adjustments.

* Revert "Fixes and price adjustments."

This reverts commit d56c3f082e.

* Fixes + supply price adjustments.

This time without... for some reason adding an empty line to the map
files. Not sure how that got caught by Git.

* Makes the new knockoffs into alternatives for the currently existing brands.

* new names
2017-09-20 22:02:18 -05:00
Belsima
1c2c5833f9 Adds a bunch of dreams. (#3888)
* Adds a bunch of dreams.

* fix

* maintaining connection

* capitalism
2017-09-20 13:51:14 -05:00
Anewbe
d279c188c9 Adds the enchancement_desc 2017-09-20 13:10:06 -05:00
Belsima
b95828d8e8 Changes Tradeband syllables. (#3879)
* Replaces tradeband syllables.

* fuck i didnt indent

* Adds syllables from latin.
2017-09-20 12:57:11 -05:00
Anewbe
1431ac5148 Merge pull request #3891 from MisterLayne/9/19/2017_Rainbow_Slime_Fix
Rainbow Slime Fix
2017-09-20 12:11:01 -05:00
Neerti
afaa029b2b Merge pull request #3875 from Anewbe/frost_spider
Adds the Frost Spider. Starts support for more complicated spiderlings.
2017-09-20 00:18:10 -04:00
Anewbe
b633d35104 Merge pull request #3880 from Belsima/pro-lathe
Xenoarch adjustments.
2017-09-19 21:04:48 -05:00
Anewbe
d3cf04dbef Merge pull request #3878 from Belsima/oopsmygoopiscaptainagain
The default for if your job is unavailable is assistant.
2017-09-19 21:00:48 -05:00
Anewbe
9fe2ba0743 Merge pull request #3863 from Belsima/master
Adds sounds to opening/closing firelocks.
2017-09-19 21:00:10 -05:00
Anewbe
e01cbf4f02 Merge pull request #3861 from Belsima/hair
Adds a bunch of new hair styles.
2017-09-19 20:59:08 -05:00
Anewbe
0c200a312b Merge pull request #3828 from Belsima/xenospritz
Replaces xeno sprites with cooler and darker ones.
2017-09-19 20:56:53 -05:00
Anewbe
3beca956a0 Improves the bioprinter 2017-09-19 20:18:13 -05:00
MisterLayne
cfdb777a13 Fixes Rainbow Slime Antagonism 2017-09-19 20:57:11 -04:00
Neerti
992101bbf4 Merge pull request #3868 from Anewbe/gamemaster_part_one
Adds an event_manager chat channel
2017-09-19 18:21:55 -04:00
Neerti
6311e663a1 Merge pull request #3882 from Anewbe/ghost_rune_chat
Should let ghosts see communicate rune chat again.
2017-09-19 03:27:40 -04:00
Anewbe
79581c5341 Merge pull request #3877 from Neerti/9/17/2017_trash_pile_port
Ports Trashpiles
2017-09-19 01:26:20 -05:00
Anewbe
ba353abb7f Merc Prommies should be able to wear their space suits. 2017-09-18 19:49:53 -05:00
Anewbe
a8c9b61b75 Condensation can now freeze floors, if you have the scepter. 2017-09-18 16:34:21 -05:00
Anewbe
fb3b5864b6 Space Lube dries off eventually 2017-09-18 14:31:07 -05:00
Anewbe
649ca6d53a Should let ghosts see communicate rune chat again. 2017-09-18 14:03:46 -05:00
Anewbe
1894dc7060 Merge pull request #3857 from Neerti/9/17/2017_slime_update
Slime Update
2017-09-18 11:49:22 -05:00
Anewbe
1ff1eb5e88 Merge pull request #3825 from Neerti/9/12/2017_fire_unbugged
Makes Fire Hot Again
2017-09-18 11:22:04 -05:00
Anewbe
4b201ca6ec Merge pull request #3845 from Woodratt/09162017_RailingsnCatwalks
Catwalks and Railings
2017-09-18 11:10:15 -05:00
Mechoid
17dfae4020 Tweaks Xenomorph spitting. (#3852)
* Tweaks Xenomorph spitting.

* Swap 'them' for 'the target'. ..Also fixes the mismatched costs.

* Swaps 'them' for 'the target'. Also, in-progress fixing phoron costs of acid.

* Fixes the acid phoron cost. Because Git wasn't playing nice. AAAAAAA.

* Swaps a long line out for a small check.
2017-09-18 11:03:04 -05:00
Belsima
e94e375cd5 Adds nicotine to cigarettes. (#3856)
* Adds nicotine to cigarettes.

* Fixes pathing.

* Adjusts the volume of nicotine added.

* satisfies the lord travis

* Better way of adding nicotine to cigs.
2017-09-18 11:02:51 -05:00
Belsima
69b09d859b Xenoarch adjustments. 2017-09-18 11:15:14 -04:00
Belsima
18346b864a The new default for 'if you don't get your job' is assistant. 2017-09-18 10:15:06 -04:00
Neerti
1c264176d9 Ports Trashpiles
Mostly ports Vore's Trashpile code, and made more generic, as I plan to use these for surface loot later.
Adds mold reagent to give a consequence to eating food you found in the garbage.
These aren't mapped in but I or someone else can do that later.
2017-09-18 06:34:10 -04:00
Neerti
835148250c Comments out fire spreading pending discussion in the future. Hopefully. 2017-09-18 04:48:43 -04:00
Belsima
16ed4f025a Microwave is no longer a proper noun. (#3873) 2017-09-18 00:22:18 -05:00
Anewbe
9e5d96b663 Merge pull request #3866 from PrismaticGynoid/dirthairunderwear
Dirt, hair, and underwear
2017-09-18 00:21:59 -05:00
PrismaticGynoid
2a866c4924 Fixes for nettles (#3854)
* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.

* Fixes for nettles
Nettle plants can now spawn randomly from weeds - it was trying to spawn 'nettles', but the name of the plant is 'nettle', so it never spawned. Now it can.

You now hit people with food if you use it on harm intent. This is mostly so that you can use nettles as a weapon again, but hey, who wouldn't want to hit people over the head with a baguette.

Nettles and other stinging "fruits" can no longer be used to generate infinite chemicals by throwing them. Chemicals that the "fruits" inject are now properly removed when hitting a target.
2017-09-17 23:45:29 -05:00
Anewbe
d79a983eba Adds the Frost Spider. Starts support for more complicated spiderlings. 2017-09-17 23:43:31 -05:00
Anewbe
d0d840082a Adds an event_manager chat channel 2017-09-17 19:48:51 -05:00
Belsima
356d551ace Adds a pair of Skrellian drugs. (#3849)
* Adds a pair of Skrellian drugs.

* Fixes talum_quem damage.

* i copypastad wrong and now it wont compile

* Adds nicotine to cigarettes.

* Revert "Adds nicotine to cigarettes."

This reverts commit f7640f1142.
2017-09-17 19:09:20 -05:00
Belsima
cc712ed20e Adds a new hud & removes red crosses from huds. (#3846)
* Adds a new hud & removes red crosses from huds.

* Changeling.

* i missed a comma
2017-09-17 19:07:32 -05:00
Anewbe
9079d67e60 Merge pull request #3803 from chaoko99/FUCKINGSNOWFLAKES
Removes Chemspill volatile fuel. Makes N2O an oxidizer.
2017-09-17 19:07:01 -05:00
PrismaticGynoid
da62af2fdb Dirt, hair, and underwear
Fixes the bug where prometheans would be able to eat the same dirt repeatedly, since the tile never actually got the dirt removed. Also, prometheans are no longer able to eat dirt and other messes off the floor unless their feet are uncovered.

Prometheans are now able to pick their hair in the character setup menu, and also to have underwear. Hopefully you get the goo-resistant kind.
2017-09-17 16:05:19 -07:00
Belsima
72300b669b Fixes resin doors. 2017-09-17 18:27:52 -04:00
Belsima
f72493c304 Fixes referencing things that don't exist. 2017-09-17 16:32:20 -04:00
Belsima
a696ba8126 Adds sounds to opening/closing firelocks. 2017-09-17 16:26:03 -04:00
Belsima
0a9cacd04e adds a bunch of hair styles 2017-09-17 14:54:27 -04:00
Neerti
d741b0e987 Slime Update
Pink Slime Aura and Mend Synthetic (technomancer) should now fix FBPs again.
Adds procs to get the 'real' number of damage from humans, including limb damage on prosthetic limbs.
Slime following made a bit more robust, slimes (and other simple animals) stop wandering when following.
Slimes following a leader that passes the can_command() check will refrain from attacking things if not attacked first.
Slime kill command implemented, requires the slime to be in your faction or be the slime's friend, and not just obedient.  This can be accomplished with end-game slime agents.
Slimes require three 'free' tiles to split, which should prevent super overcrowed cells and by extension avoid Amber Tide from crashing the mob controller.
Dark Blue Cold Aura now properly adjusts temperature based on protection gradually instead of instantly setting to the lowest value.
2017-09-17 13:18:16 -04:00
Anewbe
dcf31a959c Merge pull request #3848 from Belsima/scietist
Mild changes to alcohol strength + a spellcheck.
2017-09-17 10:39:09 -05:00
Anewbe
c9f83a9d68 Merge pull request #3769 from PrismaticGynoid/forgottenlanguages
Brain transplants, synthetics, and languages
2017-09-16 15:35:29 -05:00
Neerti
8d5759d03a Merge pull request #3844 from Anewbe/slime_petting
Lets you pet slimes.
2017-09-16 16:32:06 -04:00