killer653
b055158c0a
Gives the hypospray a name
2017-02-07 18:01:06 -05:00
killer653
43a11821c5
Adds Tempest's syringe correctly
...
Fixes #897 correctly
2017-02-07 17:26:41 -05:00
Screemonster
4d81b0b74b
Adjusts CE_SPEEDBOOST to not just return -3
2017-02-06 20:56:19 -05:00
Arokha Sieyes
cb752d8d94
Merge pull request #922 from VOREStation/syringe
...
Further ruin the game
2017-02-06 20:47:56 -05:00
Arokha Sieyes
b2499073d3
Remove adrenaline from vendor syringe
2017-02-06 19:59:03 -05:00
Arokha Sieyes
f7dec11bd9
Merge pull request #917 from VOREStation/promdirt
...
Remove promethean dirt eating
2017-02-06 16:05:12 -05:00
Arokha Sieyes
cadd04965a
Remove promethean dirt eating
...
Too crazy with our uncapped nutrition values and ingame effects of being thicc. Taking 10 steps will make them fat.
2017-02-05 03:10:37 -05:00
Spades
363a2e602e
Merge pull request #904 from Cameron653/master
...
Organizes prometheans and bugfix
2017-02-05 01:36:08 -05:00
Arokha Sieyes
02d6640824
Merge pull request #914 from VOREStation/renamefluff
...
Renames fluff vials
2017-02-05 01:33:46 -05:00
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
98d2468127
Merge pull request #913 from VOREStation/fix-stupid-punpun
...
Fix the annoying punpun runtime thrown on map load.
2017-02-04 22:52:02 -05:00
Leshana
0e912c6097
Add comments demarking the custom edit.
2017-02-04 22:43:36 -05:00
Arokha Sieyes
2cbc29b1b0
Merge pull request #908 from VOREStation/discord-ahelp
...
Implemented functionality of adminhelp's being relayed to discord via the chat webhook.
2017-02-04 22:30:43 -05:00
Cameron653
8146a3e3eb
Update station_vr.dm
2017-02-04 21:11:44 -05:00
Cameron653
011590aea6
Update prometheans_vr.dm
2017-02-04 21:11:21 -05:00
Leshana
457f5b3030
Fix the annoying punpun runtime thrown on map load.
2017-02-04 20:43:04 -05:00
Leshana
654a6bae03
Implemented adminhelp relay to discord.
...
* Adminhelp messages get sent to discord via the chat webhook.
2017-02-04 17:54:07 -05:00
Arokha Sieyes
3102d81e10
Fixes omnihud glasses
...
Code accidentally removed.
Fixes #905
2017-02-03 21:10:17 -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
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
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
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
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
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