Commit Graph

25406 Commits

Author SHA1 Message Date
Arokha Sieyes
76dd877183 Merge pull request #934 from VOREStation/holiday
Add vore day to holidays
2017-02-08 16:23:04 -05:00
Arokha Sieyes
c266f8a9e4 Adds vore day 2017-02-08 16:06:39 -05:00
Arokha Sieyes
4b40405834 Teshari nudity permit fix
Fixes #420
2017-02-08 16:03:50 -05:00
Arokha Sieyes
c49158e5ba Merge pull request #918 from Screemonster/micromecha
Adds micro-only light mech/vehicle framework, plus equipment.
2017-02-08 10:33:34 -05:00
Arokha Sieyes
5ffd9fba4f Merge pull request #926 from VOREStation/wingcolor
Makes feathered wings colorable
2017-02-07 18:44:02 -05:00
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
Arokha Sieyes
715cd4dc7a Makes feathered wings colorable
Also makes them not hide your species tail, so if you're taj or unathi or whatever, your tail still shows up.

For #925
2017-02-07 14:23:14 -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
Screemonster
1d57e78c1f fixes copypasta'd comments 2017-02-07 01:42:35 +00:00
Arokha Sieyes
b2499073d3 Remove adrenaline from vendor syringe 2017-02-06 19:59:03 -05:00
Arokha Sieyes
fc4c6af080 Merge pull request #921 from VOREStation/geneticsfun
Literally ruins the game
2017-02-06 16:37:18 -05:00
Arokha Sieyes
8f18996133 This should be the other way around 2017-02-06 16:21:06 -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
935ff411a5 Adds cloneloss to DNA Injectors
Makes sense, doesn't it? Messing with your genes? Each one doubles your cloneloss, starting at 2.
2017-02-06 16:01:28 -05:00
Screemonster
2a9a4f657b Adds the gopher and equipment, better icon for weasel 2017-02-06 06:49:33 +00:00
Screemonster
931af36a2b Adds micro-only light mech/vehicle framework, plus equipment. 2017-02-05 09:04:37 +00: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
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