Arokha Sieyes
15e0aa9131
You brought this on yourself.
...
You really did. There's nobody else to blame but you.
2017-01-30 13:57:31 -05:00
Arokha Sieyes
0008e89a5a
Merge pull request #881 from OrbisAnima/swimsuits2
...
Swimsuits for All! Fluff items for some
2017-01-30 12:38:52 -05:00
Arokha Sieyes
ef324b60a6
Merge pull request #882 from VOREStation/stasissleep
...
Makes stasis bags put people to sleep
2017-01-30 12:33:55 -05:00
Arokha Sieyes
c63897e640
Merge pull request #878 from VOREStation/digestdam
...
Fix digestion damage variable usage
2017-01-30 12:33:16 -05:00
Arokha Sieyes
814893cf9c
Merge pull request #876 from Dhaeleena/VendLogs
...
Lots of changes and Fluff fixes
2017-01-30 12:32:41 -05:00
Arokha Sieyes
b17e1d86ea
Makes stasis bags put people to sleep
...
They don't, right now. It's a little weird. People are just magically cured of their pain and can talk normally, forever, as long as they are in a stasis bag. No hunger/drug effects/bleeding/organ damage progression/toxin damage/oxygen damage, etc. AAAnd can talk normally while in "stasis"? Bags op pls nerf.
2017-01-30 12:14:07 -05:00
Neerti
9b9de138e6
Continues work on new Event System
...
Ports and adds some more events, including dust, meteors, carp, etc.
Tweaks meteors, now has a 10 minute warning beforehand and meteors only approach from one direction now.
2017-01-29 19:32:20 -05:00
OrbisAnima
65e8ac37ab
Fluff Swimsuit minor adjustment
...
Description of Xsdew item was the wrong one, sorry!
2017-01-29 12:20:44 -03:00
OrbisAnima
5cb92eb078
Swimsuits for all!
...
-Added swimsuits to be picked in the loadout, without replacing the
uniform (They spawn in a capsule, a limited box that can only hold one
swimsuit, and only a swimsuit, and cannot be turned into cardboard.)
-Added Xsdew departamental selection of Swimsuits (Security, Medbay,
Science and Engineering)
-Added Xsdew Fluff Swimsuit!
Fixes #874
2017-01-29 11:26:32 -03:00
OrbisAnima
16a44b75bd
Swimsuits for All! Fluff items for some
...
-Added swimsuits to be picked in the loadout, since I created a special
container for them, they wont replace the uniform you spawn with. They
can be found in uniforms and suits!
-Added Xsdew departamental selection of swimsuits! (Security, Medbay,
Science and Engineering)
-Added Xsdew Fluff swimsuit!
2017-01-29 11:10:00 -03: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
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
Arokha Sieyes
6165b686dc
Fix digestion damage variable usage
...
I was looking for who to blame for this being hardcoded and it's apparently me from a year ago??? Oops.
2017-01-28 15:48:31 -05: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
Dhaeleena
d02bb69119
Requested Tweaking done.
2017-01-26 16:02:05 -03:00
Dhaeleena
63bced3531
Properly Done the .357 flash rounds
2017-01-26 15:53:43 -03:00
Dhaeleena
2fef35d980
Lots of changes and Fluff fixes
2017-01-26 11:48:22 -03: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
Arokha Sieyes
8f6b66345c
Increase transfer rate of Xenobio injector
...
It was not coded correctly. This "transfer_amount" variable is never set anywhere. The "trans_to_mob" reagent transfer function defaults to 1 if you don't give it something, and this proc passes the null transfer_amount to it, which is basically that. So it always transfers 1. 5 is easier to live with.
2017-01-25 16:03:02 -05:00
Yoshax
8a5b09c539
Fixes slipping + lube
2017-01-25 20:33:11 +00:00
Arokha Sieyes
9711cf2b9d
Merge pull request #867 from Dhaeleena/FleshyBits
...
Flesh Turfs
2017-01-24 22:37:15 -05:00
Dhaeleena
3cdf56f4c3
Flesh Turfs
2017-01-24 23:48:50 -03:00
Arokha Sieyes
ab374a35fc
Disable away missions during unit testing because it never finishes aaaaaaaaaaaaa
2017-01-24 21:26:50 -05:00
Arokha Sieyes
cd3839a9cc
Merge pull request #862 from VOREStation/arofluff
...
Aronai fluffer
2017-01-24 15:38:09 -05:00
Arokha Sieyes
3abc27114c
Re-fix Verin?
2017-01-24 10:07:45 -05:00
Arokha Sieyes
45710ef8b3
Readds fed coat??
2017-01-24 10:06:06 -05:00
Arokha Sieyes
0af7ce8b5b
Icon, and removes old gun
2017-01-24 09:58:26 -05:00
Arokha Sieyes
860ce47074
All Aronai fluff change stuff except the icon
2017-01-24 09:58:18 -05:00
Arokha Sieyes
d9d4b338bd
New "MKII" Hypospray
...
Adds a new hypospray to the game that uses 30u vials as 'mags' rather than requiring syringing.
2017-01-24 01:23:05 -05:00
Spades
d6f1102715
Merge pull request #860 from JoanRisu/Fluff_Items_worshop
...
Modern Federation Coats and Officer Caps
2017-01-23 21:39:54 -05:00
Spades
20b9ac6f57
Merge pull request #854 from Screemonster/moreferaltweaks
...
More xenochimera tweaks
2017-01-23 21:39:45 -05:00
JoanRisu
8961a73ecb
Modern Federation Coats and Officer Caps
2017-01-24 01:13:41 +09:00
Anewbe
10248f7677
Syringe code cleanup
2017-01-22 23:11:54 -06:00
