Arokha Sieyes
3102d81e10
Fixes omnihud glasses
...
Code accidentally removed.
Fixes #905
2017-02-03 21:10:17 -05:00
Kelshark
3090452a97
Merge branch 'master' of https://github.com/Repede/YawnWiderStation
2017-02-03 21:03:04 -05:00
Kelshark
f9b6171106
Map edits and antimatter crate and stuff
2017-02-03 21:02:37 -05:00
Cameron653
b7f5b7789c
Update prometheans_vr.dm
2017-02-03 20:06:24 -05:00
Cameron653
8ba417b863
Update station_vr.dm
2017-02-03 20:05:36 -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
Hugo
8714fe132d
Mining reward stuff
2017-02-02 22:08:49 -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
nachomeep
c2ed062b3f
Fixes custom loadout and slot system.
2017-02-02 15:37:27 -05:00
Arokha Sieyes
2e6d423047
Fix chocolate milk
...
I am a man who can appreciate his chocolate milk. Unless his chocolate milk carton is always full of normal milk due to a faulty constructor inheritance scheme that fills it with first the wrong amount of milk, then tries to fill it with more wrong milk, then finally attempts to fill the soggy milk carton with chocolate milk.
2017-02-02 15:34:34 -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
Anewbe
587044275c
Merge pull request #2975 from Anewbe/spider_nerf
...
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
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
f16ffb890d
Merge pull request #2969 from Anewbe/mining_cameras
...
Mining outpost camera console should work now
2017-02-01 16:21:23 -06:00
Anewbe
5e0a51bb72
Merge pull request #2951 from Anewbe/antag_numbers
...
Heist/Merc number changes
2017-02-01 16:21:13 -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
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
fd1ade9982
Spiders inject fewer spiderlings
2017-01-31 21:57:39 -06:00
Anewbe
867c0ba2f4
Merge pull request #2972 from Yoshax/vending
...
Vending machine logging
2017-01-31 20:48:26 -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
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
