Commit Graph

32996 Commits

Author SHA1 Message Date
Anewbe
ccfbd7c9ac Mining outpost camera console should work now 2017-01-29 15:25:53 -06:00
Anewbe
3a48d5dd8f Merge pull request #2968 from MagmaRam/changelog
Changelog updates
2017-01-29 12:51:19 -06:00
MagmaRam
5401dfe3bd Changelog updates 2017-01-28 21:37:18 -06:00
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
3ea1b65477 Merge pull request #2967 from Anewbe/mining_fun
Fixes some things that should make mining more interesting
2017-01-28 20:53:03 -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
Anewbe
88aa49943b Merge pull request #2961 from Anewbe/lockers
Gear additions
2017-01-27 20:44:33 -06:00
Anewbe
66da20a9fa Merge pull request #2962 from Neerti/1/27/2017_circuit_screen_fix
Fixes medium screen circuit bug
2017-01-27 16:52:41 -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
db41b99d17 Adds locker contents for HoS/Warden and a medical sunglasses for CMO 2017-01-27 00:26:52 -06: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
a783a4e642 Merge pull request #2958 from Anewbe/medical_sprint
Medical hardsuit sprint
2017-01-25 22:55:43 -06: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
Anewbe
90cfd75556 Merge pull request #2956 from Yoshax/slipping
Fixes slipping + lube
2017-01-25 20:41:49 -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
bc0d507999 Merge pull request #2953 from MagmaRam/changelog
Changelog update
2017-01-23 19:04:46 -06:00
MagmaRam
ea60c5144c Changelog update 2017-01-23 18:22:23 -06:00
Anewbe
f21d6f3845 Merge pull request #2950 from Cameron653/master
Fixes a stray pixel in the glasses sprite
2017-01-23 14:56:48 -06:00
Anewbe
b87738b4fe Merge pull request #2952 from Anewbe/drawblood
Syringe code cleanup
2017-01-23 00:46:09 -05:00
Anewbe
10248f7677 Syringe code cleanup 2017-01-22 23:11:54 -06:00
killer653
e50e14ab90 Fixes a stray pixel in the glasses sprite
There was a stray pixel on the N and S facing "glasses" sprite that was
the same color as the background.
2017-01-22 10:51:38 -05:00
Anewbe
8832fe647e Merge pull request #2948 from Anewbe/firedoor_access
More people can open firedoors
2017-01-21 22:38:33 -05: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
01afb9d170 More people can open firedoors 2017-01-21 21:19:52 -06: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
022ea9f15e Merge pull request #2942 from Anewbe/ribs
Broken bones work differently
2017-01-19 18:12:17 -05:00
Anewbe
eff6b15324 Merge pull request #2943 from Anewbe/lightbox
Light boxes should be able to hold 24 bulbs/tubes now
2017-01-19 17:52:10 -05:00
Anewbe
f1d37c241d Light boxes should be able to hold 24 bulbs/tubes now 2017-01-19 16:05:31 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00