Commit Graph

16044 Commits

Author SHA1 Message Date
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
Neerti
835148250c Comments out fire spreading pending discussion in the future. Hopefully. 2017-09-18 04:48:43 -04: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
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
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
Neerti
ef2d1b3fbd Merge pull request #3842 from Anewbe/beard
Fixes Dwarf Beard
2017-09-16 16:31:56 -04:00
Anewbe
bd95ce48a1 Merge pull request #3843 from Neerti/9/15/2017_borg_lighting_correction
Corrects Borg Light Intensity
2017-09-16 14:50:52 -05:00
Anewbe
8f49d604c0 Merge pull request #3831 from Belsima/sqeakyboy
Returns the old sound for stepping on mice.
2017-09-16 14:38:02 -05:00
Belsima
a3bd21c387 Mild changes to alcohol strength + spellcheck. 2017-09-16 12:45:46 -04:00
Woodratt
3e90725a45 Catwalks and Railings
Added catwalks and railings. Ported from Vorestation who ported them from Eris.

Note, catwalks can be placed on plating (as is seen on the vorestation map Tether) and is done so here as well. However it doesn't seem like it is possible to build said catwalks on plating. Did not bother to adjust this at this time. Something to sort in the future.

Adjusted SC station dmm to use both the railing and catwalks as well as a couple fixes for the floor tile adjustment in a earlier commit.
2017-09-16 00:54:33 -07:00
Anewbe
e917fd2cf5 Lets you pet slimes. 2017-09-16 00:46:15 -05:00
Neerti
20831936ba Corrects Borg Light Intensity
Apparently default intensity before the handle_light() change is 1 and not the range repeated, so now it's 1 again.
2017-09-15 23:51:44 -04:00
Anewbe
c0aff71c72 Fixes Dwarf Beard 2017-09-15 22:14:03 -05:00
Anewbe
aa6866bf44 Merge pull request #3684 from Cyantime/detables
Reduces effectiveness of tabling as opening combat move.
2017-09-15 21:55:50 -05:00
Neerti
55162bb099 Fixes Borg Lighting Conflicts
Borg lights should be functional again.
Being on fire now makes you glow orange instead of white.  Intensity scales based on fire stacks.
2017-09-15 21:21:27 -04:00
Belsima
fb0e4d3cf9 General uniform updates. (#3814)
* General uniform update.

* Maps in bathrobe.

* Revert "Maps in bathrobe."

This reverts commit 9cbe47671d.

* Fixes cheongsams and maps in the bath robe.

* Removes unintentionally added sprite.

* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
Belsima
8b130ce221 Replaces the sound mice make when you step on them. 2017-09-15 18:13:19 -04:00
Mechoid
9373917b5c Makes Prometheans process various Toxins differently. Step One. (#3815)
* Makes Prometheans process various and base toxins differently.

* Tweak Slime jelly again
2017-09-15 17:00:48 -05:00
Belsima
c5651146fe Adds an icon state for SWAT gloves. (#3832) 2017-09-15 16:58:47 -05:00
Belsima
3f853ef1cf Lowers the volume for stepping on mice. 2017-09-14 18:19:09 -04:00
Neerti
47b463f4cb Makes Fire Burn Again
Being lit on fire barely did anything, for multiple reasons, all which should be fixed in this PR.
First, the code to do damage based on bodytemperature was literally bugged and only applied the lowest level of damage, no matter what.
Second, wounds made autohealed them fairly fast, sometimes even outhealing the incoming damage.
Third, being on fire raised your temperature rather slowly.
Fourth, the lowest level of 'overheating' damage was rather low.

Changes:
The bodytemperature part of Life() is now unbroken and I accidentally fixed freezing not hurting, so yay.
Added a ten minute delay to wounds being able to autoheal them away.  Applying bandage/salves will skip this.
Temperature climb is now based on fire stacks while on fire, so more stacks means more and longer pain.
Lowest level of overheating was tweaked.
Running into people while on fire will split your fire stacks with them and light them on fire.
Port's /tg/'s on fire sprite.
Different mobs can have different icons for being on fire.
Bonus: Rejuv now removes pain.
2017-09-13 06:26:08 -04:00
Anewbe
bf11fd569f Fixes the beanbag clip sprites 2017-09-12 22:02:03 -05:00
Unknown
44b3905eca REmoves chemspill volatile fuel. Adds Oxidizing N2o 2017-09-12 09:41:08 -07:00
Mechoid
cd1c8f00ef Fixes Prometheans being unable to select secondary languages. 2017-09-11 20:09:40 -07:00
Anewbe
7cc1506901 Merge pull request #3810 from Mechoid/Dart_Gun_2_Dart_Harder
Fixes the Dartgun, makes a Research-Produceable variant.
2017-09-11 17:38:19 -04:00
Anewbe
d9b8e1dc0d Merge pull request #3799 from ghost/genderlessblobs
Adds a non-gendered biological option for prometheans.
2017-09-11 17:26:25 -04:00
Anewbe
096159ac37 Merge pull request #3796 from ghost/hephaestus
Standardizes spellings to wiki and adds more major corps and places to setup.
2017-09-11 17:19:55 -04:00
Anewbe
6ffebcef6e Merge pull request #3775 from Neerti/9/8/2017_tg_maploader_port
Port's TG's Maploader
2017-09-11 17:17:23 -04:00
Anewbe
21469325ac Merge pull request #3784 from ghost/woodcut
Adds sounds for chopping wood.
2017-09-11 14:11:46 -04:00
Anewbe
0f5f9b3bfc Merge pull request #3778 from ghost/crossaint
Adds croissants.
2017-09-10 20:54:13 -04:00
Anewbe
42e8bb6284 Merge pull request #3767 from Neerti/8/10/2017_make_xenobio_old_again
Make Xenobiology Old(ish) Again
2017-09-10 17:12:38 -04:00
Mechoid
2a5311e063 Fixes the Dartgun, makes a Research-Produceable variant. 2017-09-09 21:25:30 -07:00
Belsima
7359c6f7a6 Fixes up the PR. 2017-09-09 23:17:41 -04:00
Belsima
7e869591c3 more genders 2017-09-09 16:14:56 -04:00
Spades
72c249f0ef Weapon sound improvements from TG, take 2 (#3772)
* Sound Improvements

Ported some sounds from TG. I was getting sick of the current pistol
sound. Didn't sound meaty enough so I changed it.

I also didn't like the default gun firing sound so I changed that too.

I also brought in a couple more sound files from TG just in case those
ever get used. No use for them currently.

While I was at it, I fixed the incorrect naming of some sound files in
audible_deception.dm for Technomancers because I was editing the file
anyway and a separate PR would make conflicts.

* I forgot to press save on this one

I tend to do that a lot

* Laser sound too.

* Adds back commented out code because reasons
2017-09-09 15:40:26 -04:00
Anewbe
fa38d674c4 Merge pull request #3781 from Belsima/mouse
Adds a new death sound for mice.
2017-09-09 15:34:49 -04:00
Anewbe
440e7dd026 Merge pull request #3793 from Belsima/keycardfluff
Replaces two super not-lore-friendly messages with one stolen from Bay.
2017-09-09 15:27:42 -04:00
Anewbe
160f45721b Merge pull request #3801 from Belsima/spiderdesc
Makes giant spider descriptions respect their sprites.
2017-09-09 15:22:30 -04:00
Belsima
b10e5c2dee Makes giant spider descriptions respect their sprites. 2017-09-09 13:16:52 -04:00
Belsima
77c679b280 Adds a non-gendered biological option for prometheans. 2017-09-09 13:09:23 -04:00