Arokha Sieyes
a37e7067d1
Renames fluff vials
...
People were getting a little scared at "Aronai begins loading vial (poisoned) into the hypospray" when it was antitoxin. x3
2017-02-04 23:49:10 -05:00
Arokha Sieyes
94b621b310
Merge pull request #893 from Cameron653/master
...
Polaris Feburary Syncs
2017-02-02 23:06:13 -05:00
Arokha Sieyes
380eee789d
Merge pull request #899 from VOREStation/suitnerf
...
Nerf teleport rig
2017-02-02 22:59:29 -05:00
Arokha Sieyes
8228a4032b
Merge pull request #898 from VOREStation/spindrome
...
Adds more non-fatal symptoms
2017-02-02 22:59:21 -05:00
Arokha Sieyes
c71ab706a2
Merge pull request #896 from Screemonster/phazonsprite
...
adds recoloured phazon sprite for the scuttlebug
2017-02-02 22:59:13 -05:00
Cameron653
4a0913076c
Travis should compile now
2017-02-02 18:56:37 -05:00
Cameron653
0eed3f1c34
Update Chemistry-Reagents-Food-Drinks.dm
2017-02-02 18:49:51 -05:00
Arokha Sieyes
03b6697d04
Nerf teleport rig
...
Reduces the armor to less than that of the EMT suit, removes integrated O2 tank.
2017-02-02 18:38:58 -05:00
Arokha Sieyes
8aaa32348c
Adds more non-fatal symptoms
2017-02-02 18:35:03 -05:00
Cameron653
57fbde6ab0
Gives xenochimera a "sonar ping"
2017-02-02 14:39:17 -05:00
Cameron653
9cd1919fc6
Reverts vox change I made
2017-02-02 14:35:14 -05:00
Cameron653
e5f5a2e881
Removes edit I made to make vox breath nitrogen
2017-02-02 14:34:28 -05:00
Cameron653
c3fe93e59c
Coffee isn't toxic to taj now
2017-02-02 14:31:27 -05:00
Cameron653
f9fa4c71b3
Coffee isn't toxic to tajarans
2017-02-02 14:30:03 -05:00
Arokha Sieyes
b80ee6b463
Merge pull request #892 from VOREStation/pixels
...
Fixes the pixels.
2017-02-02 10:25:25 -05:00
Screemonster
f8c121cbb9
adds recoloured phazon sprite for the scuttlebug
2017-02-02 13:24:55 +00:00
Cameron653
82d021eb47
Makes vox tank spawn with nitrogen instead of phoron
2017-02-01 15:59:50 -05: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
867c0ba2f4
Merge pull request #2972 from Yoshax/vending
...
Vending machine logging
2017-01-31 20:48:26 -06:00
Screemonster
f41ff655fc
fixes scree's suit modkit
2017-01-31 05:57:50 +00:00
Arokha Sieyes
ddd8fff460
Merge pull request #883 from VOREStation/mlem
...
Vorestation specific virus symptoms
2017-01-30 21:45:24 -05:00
Yoshax
96912ab19c
more logging
2017-01-30 23:57:45 +00: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
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
Dhaeleena
7d4c47739b
I swear i wont do more commits to this. Un-nerfed the grenade cuz ace likes it and the attempts to make it more balanced were kinda shit anyways.
2017-01-28 18:59:45 -03: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
Dhaeleena
ab8d9f2af2
Nerfed the Tear Gas Granades to a more Balanced State
2017-01-28 16:45:37 -03:00
Anewbe
f924f5ef05
Diona can regrow limbs
2017-01-27 23:47:44 -06:00
