Commit Graph

16690 Commits

Author SHA1 Message Date
Anewbe
cad668a72a Further tweaks to Vox and their toys 2017-02-01 21:43:21 -06:00
nachomeep
c81b18b40a adds fannypacks
To custom loadout as well.
2017-02-01 18:31:49 -05:00
Anewbe
fa18ec9909 Merge pull request #2974 from Neerti/1/31/2017_borg_typing
Fixes Borg Typing Indicator
2017-02-01 16:32:17 -06:00
Anewbe
4e824e0e2c Merge pull request #2971 from Neerti/1/28/2017_event_system_work
Continues work on new Event System
2017-02-01 16:21:03 -06:00
Cameron653
19c65d5bdd Makes vox breath nitrogen and makes phoron poison to them
This allows vox to walk around the station without keeling over and dying due to the oxygen, as nitrogen in the air.
Additionally, this makes it so instead of breathing phoron, phoron is a poison to them
2017-02-01 15:58:06 -05:00
Cameron653
2c765e91ee Whitelists vox 2017-02-01 15:47:57 -05:00
killer653
277071532b Item path fixes and edits
1. Oxygen tank has been changed from emergency_oxygen to
emergency/oxygen. Fixed this in custom clothings and the map

2. The vending_vr had some redundant things (repeating name, desc,
product ads, icon state, icon deny, contra.) and also the securivendor
code was causing problems since it's now been ported to polaris and is
accessable on all vending machines. Commented out the securivendor
vorestation logging.
2017-02-01 15:25:45 -05:00
killer653
7d9d970a2e For some reason this didn't get pushed 2017-02-01 15:11:06 -05:00
killer653
3f1e5c80f2 Polaris sync 2017-02-01 15:08:45 -05:00
Arokha Sieyes
4d79fe9a0e Fixes the pixels.
```
      ___           ___       ___           ___
     /  /\         /  /\     /  /\         /  /\
    /  /::|       /  /:/    /  /::\       /  /::|
   /  /:|:|      /  /:/    /  /:/\:\     /  /:|:|
  /  /:/|:|__   /  /:/    /  /::\ \:\   /  /:/|:|__
 /__/:/_|::::\ /__/:/    /__/:/\:\ \:\ /__/:/_|::::\
 \__\/  /~~/:/ \  \:\    \  \:\ \:\_\/ \__\/  /~~/:/
       /  /:/   \  \:\    \  \:\ \:\         /  /:/
      /  /:/     \  \:\    \  \:\_\/        /  /:/
     /__/:/       \  \:\    \  \:\         /__/:/
     \__\/         \__\/     \__\/         \__\/
```
2017-02-01 01:27:13 -05:00
Anewbe
fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Neerti
088ebc328e Fixes Borg Typing Indicator
Borgs that are typing will no longer lose the indicator a second later.
2017-01-31 16:28:41 -05:00
Anewbe
dd38e42dc5 Ahelp take button 2017-01-31 15:27:07 -06:00
Screemonster
f41ff655fc fixes scree's suit modkit 2017-01-31 05:57:50 +00:00
Anewbe
1b3b67b8ca Merge branch 'master' into heart_damage 2017-01-30 22:43:09 -06:00
Arokha Sieyes
ddd8fff460 Merge pull request #883 from VOREStation/mlem
Vorestation specific virus symptoms
2017-01-30 21:45:24 -05:00
Arokha Sieyes
49d5ce7052 Workaround for custom_item proc
It's incapable of spawning this belt, and apparently if I ready up before round start, it will spawn everyone who readies up in space for some reason? Orbis and I tested and aren't suuuper sure why. It's probably the belt though. So, easy solution is a box.
2017-01-30 16:47:31 -05:00
Arokha Sieyes
724af1b63f Vorestation specific virus symptoms
Mlem. They go in this file.
2017-01-30 14:00:47 -05:00
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
9818b9a06f Fixes a type 2017-01-26 21:45:10 -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