Commit Graph

15079 Commits

Author SHA1 Message Date
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
701695ba07 Changes two taste descriptions 2017-01-28 20:57:54 -06:00
Anewbe
fa0096e6c0 Fixes some things that should make mining more interesting 2017-01-28 19:35:48 -06:00
Anewbe
9eb6851014 Merge pull request #2966 from Anewbe/vox_toy_fixes
Fixes some things with Vox toys
2017-01-28 16:19:55 -06:00
Anewbe
1973a5193a Fixes some things with Vox 2017-01-28 16:03:12 -06:00
Anewbe
43ca1c038a Merge pull request #2964 from Anewbe/regenerate
Diona can regrow limbs
2017-01-28 14:13:45 -06:00
Anewbe
1772c6f3a8 Merge pull request #2965 from Neerti/1/28/17_magnets_how_do_they_work
Fixes typo in research defines for a few things
2017-01-28 14:03:51 -06:00
Neerti
aa889d51db Fixes typo in research defines for a few things
Not sure how TECH_MAGNETS compiles if it doesn't exist but...
2017-01-28 14:52:02 -05:00
Anewbe
f924f5ef05 Diona can regrow limbs 2017-01-27 23:47:44 -06:00
Anewbe
b50190d762 Merge pull request #2934 from Anewbe/char_reset
Ports Bay's character resets
2017-01-27 20:44:54 -06:00
Neerti
49a00bc746 Fixes medium screen circuit bug
Medium screens should only show to the person holding the assembly now, instead of everyone seeing it.  That's what the large screen is for.
2017-01-27 02:23:06 -05:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe
61b2a7affd Merge pull request #2960 from Anewbe/aviators
Adds Medical and Meson Aviators
2017-01-26 22:33:42 -06:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
d8b905d30e Merge pull request #2957 from Neerti/1/19/2017_more_circuits
Electrical Revolution Circuit DLC
2017-01-26 21:46:44 -06:00
Anewbe
3d20774a41 Fixes a few more Vox Toy things 2017-01-26 16:25:28 -06:00
Anewbe
3aa9f70a77 Merge pull request #2959 from Neerti/1/25/2017_news_formatting
Improves Lobby News
2017-01-25 23:49:27 -06:00
Neerti
086551bfd9 Improves Lobby News
Adds ability to add most html formatting to lobby news without actual html.
2017-01-26 00:37:38 -05:00
Anewbe
1b294ed8a4 Medical hardsuit sprint 2017-01-25 22:43:53 -06:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00
Neerti
b6c170eadd Does tons of stuff, see PR for details. 2017-01-25 19:31:21 -05:00
Yoshax
8a5b09c539 Fixes slipping + lube 2017-01-25 20:33:11 +00:00
Anewbe
10248f7677 Syringe code cleanup 2017-01-22 23:11:54 -06:00
Anewbe
3be442e766 Merge pull request #2947 from Anewbe/surgery_things
Surgical tools will no longer cause damage on help intent
2017-01-21 22:38:25 -05:00
Anewbe
9283cbe052 Merge pull request #2946 from Anewbe/prosthetic_bits
Prosthetic organs have sprites and take emp damage properly
2017-01-21 22:38:18 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
a0343133dd Merge pull request #2941 from Mechoid/Multi-SpriteSet
Allows individuals to have multiple custom Borg Sprite-Sets.
2017-01-21 19:23:36 -05:00
Anewbe
d3607df788 Prosthetic organs have sprites and take emp damage properly 2017-01-21 16:04:43 -06:00
Anewbe
e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Anewbe
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00
Mechoid
1363fb49c3 Allows individuals to have multiple custom borg sprite-sets without using multiple ckeys.
Small modification of robot.dm to make both custom sprite set-ings compliant with one-another.
2017-01-19 01:35:33 -08:00
Anewbe
4de1db89bf Merge pull request #2940 from Anewbe/vox_helmets
Minor Vox fixes
2017-01-18 22:51:19 -05:00
Anewbe
4c2033bf52 Vox helmet light overlay removed 2017-01-18 21:41:34 -06:00
Anewbe
cacdd56366 Merge pull request #2938 from Anewbe/chaplain_hoodie
Hood tweaks
2017-01-18 21:40:10 -05:00
Anewbe
c71007fa58 Xenotaser should work now 2017-01-18 17:47:38 -06:00
Anewbe
fda82d4b17 Hood tweaks 2017-01-18 17:02:01 -06:00
Anewbe
9a451c826e Human mobs spawn in with a random amount of nutrition 2017-01-17 23:07:17 -06:00
Anewbe
81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
d9572c6998 Merge pull request #2932 from Anewbe/mask_action_button
Breath mask action button
2017-01-17 23:20:58 -05:00
Anewbe
6827f81b37 Merge pull request #2933 from Anewbe/robot_vomit
Tweaks some emotes
2017-01-17 23:20:45 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00
Neerti
14c67e0893 Two bugfixes
Ghosts should be able to hear things once more.
The big bold NEW NEWS notice should remember if one has already seen the news, as the hash was not actually being saved.  It's being saved now.
2017-01-17 04:11:57 -05:00
Anewbe
5b1fc48712 Ports Bay's character resets 2017-01-16 19:02:41 -06:00
Anewbe
e63176c2e6 Tweaks some emotes 2017-01-16 18:48:00 -06:00
Anewbe
c805befca6 Breath mask action button 2017-01-16 18:14:35 -06:00
Anewbe
9cbee4baf4 Ports taste 2017-01-16 17:07:41 -06:00
Anewbe
3b95575da6 Merge pull request #2924 from Anewbe/language_things
Bay Ports, mostly Languages
2017-01-15 18:53:54 -05:00
Anewbe
eefc096561 Merge pull request #2913 from Anewbe/plasmastun
Plasma Pulse Stunner
2017-01-15 18:53:44 -05:00
Anewbe
0f4fbab0be Merge pull request #2928 from Anewbe/slimebaton
Xenobio fixes
2017-01-15 18:53:26 -05:00