Commit Graph

16034 Commits

Author SHA1 Message Date
Anewbe
fe925df8c2 Adds a bunch of Morpheus ship names, again. 2017-09-17 22:04:57 -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
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
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
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
Belsima
022eb8cf4c Standardizes spellings to wiki and adds more major corps and places to setup. 2017-09-09 12:20:08 -04:00
Belsima
542128a9b0 Replaces two super not-lore-friendly messages with one stolen from Bay. 2017-09-08 22:02:07 -04:00
Belsima
61e23886cb Adds sounds for chopping wood. 2017-09-08 17:15:48 -04:00
Belsima
07af33339c Adds a new death sound for mice. 2017-09-08 16:52:36 -04:00
Anewbe
84fa9cf785 Merge pull request #3770 from Mechoid/Xeno_Tyranny_Electric_Boogaloo
Xenomorph Tweaks/Buffs.
2017-09-08 16:19:22 -04:00
Anewbe
2a3af937ff Merge pull request #3774 from Woodratt/WR_972017_SCmapchanges
SC Map Changes 972017
2017-09-08 16:15:11 -04:00
Anewbe
e67d6f1099 Merge pull request #3773 from MisterLayne/pai_stuck_fix
pAI Stuck Fix
2017-09-08 16:12:12 -04:00
Belsima
84d0fd2347 Missed an M. I thought it was Nutrient. 2017-09-08 15:47:12 -04:00
Belsima
92da4a84ee Adds crossaints. 2017-09-08 15:35:51 -04:00
Neerti
1bc28c07c0 Port's TG's Maploader 2017-09-08 12:49:26 -04:00