cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,830 Commits 8 Branches 26 Tags
2c234591c8d8a7059bcd35d00f63e39ecdc2fcbc
Commit Graph

33830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron653
2c234591c8 Clarification and fix 2016-12-12 18:31:42 -05:00
Cameron653
6b90cb2279 Prevents numbers like 999999999999 
Rounds then sanitizes them
 2016-12-12 17:03:41 -05:00
Cameron653
9f360a65c9 Hope this works 
Out of all the things to go wrong, it of course it would have to be this.
 2016-12-12 15:55:56 -05:00
Cameron653
a04e7faecf Adds stoamch special interactions 2016-12-12 15:36:35 -05:00
Cameron653
ceb3515fdb Adds vars, adds absorb/digest/escape chances and results. 2016-12-12 15:15:16 -05:00
Cameron653
76144c242d Update vorepanel_vr.dm 2016-12-12 14:40:13 -05:00
Cameron653
d93e15a3f4 Update vorepanel_vr.dm 2016-12-12 14:24:11 -05:00
killer653
2e47d44371 Should be the last thing needed to get this to work. 2016-12-11 22:11:36 -05:00
Cameron653
202fbe3889 Update vorepanel_vr.dm 2016-12-11 20:32:43 -05:00
Cameron653
1906cb4e1e Update vorepanel_vr.dm 2016-12-11 20:32:18 -05:00
Spades
d6dc578dd6 Merge pull request #753 from Cameron653/master 
Dress bugfix
 2016-12-11 19:22:52 -05:00
Cameron653
475f307753 Fixes dresses 
Ports over 301f97a2b3

Instead of syncing (Which would take longer) I'm just manually putting the bugfix in. This will cause a conflict with the next sync, but all that needs to be done is the comment I put in taken out (Along with the heading in github when a conflict occurs) and it'll work fine.

I'll solve the conflict next time we sync next month.
 2016-12-11 18:27:23 -05:00
Spades
43519bd446 Merge pull request #743 from VOREStation/Map-Sync 
Map sync
 2016-12-10 16:00:28 -05:00
Spades
ccfed7f5a4 Refactor 2016-12-10 15:43:59 -05:00
Spades
cc0cfba27b Map Sync, some Zoo and Vore Mob fixes 
- Polaris map synced with ours (Resolves #331)
- Nerfed pounce chance on most vore mobs. The default chance of being
eaten is now only 1:20 whereas previously it was 1:2 chance.
 2016-12-10 15:36:17 -05:00
Spades
f6b39cd5d9 Merge remote-tracking branch 'refs/remotes/origin/master' into Map-Sync 2016-12-10 14:31:54 -05:00
Spades
58009958a1 Merge pull request #742 from Cameron653/master 
Polaris December Sync
 2016-12-10 14:29:00 -05:00
Cameron653
6869e3c048 Removes is_skrell 2016-12-10 14:09:56 -05:00
killer653
0c73b9da2e Polaris December Sync 2016-12-10 09:51:11 -05:00
Spades
246f7eee6a Merge pull request #731 from DarkWolfInsanity/IvyHoloID 
IvyMooMoo - HoloID
 2016-12-10 01:33:35 -05:00
MagmaRam
f256342b09 Merge pull request #2850 from ForFoxSake/gunsarenttoys 
Corrects the Shotgun Sawing Procedure
 2016-12-09 22:53:40 -06:00
MagmaRam
7e1e710df5 Merge pull request #2847 from Woodratt/1.6.6_shoes_n_gloves 
1.6.6 shoes and gloves
 2016-12-09 22:53:32 -06:00
MagmaRam
675479283d Merge pull request #2844 from Anewbe/eva_gloves 
EVA hardsuit gets insulated gauntlets
 2016-12-09 22:51:37 -06:00
MagmaRam
e38a0bf06e Merge pull request #2848 from ForFoxSake/pestcontrol 
Fixes Runtime in SMES
 2016-12-09 22:51:18 -06:00
MagmaRam
7a2f3b2c29 Merge pull request #2849 from ForFoxSake/soundsofthesynths 
Fixes Runtime in Prosthetics Fabricator
 2016-12-09 22:50:59 -06:00
Anewbe
39137348e4 Merge pull request #2851 from ForFoxSake/pullupyourpants 
Adds Vital Underwear Icon File Overriding
 2016-12-09 21:34:33 -06:00
Spades
75c1e7bc7c Merge pull request #738 from Cameron653/master 
Adds shrink/growth mushrooms back to vendors.
 2016-12-09 14:27:35 -05:00
ForFoxSake
451f48e621 Enable overriding of the underwear icon file. 2016-12-09 13:30:38 +00:00
ForFoxSake
3e0af860e9 Makes the shotgun go off if it's modified while loaded. 2016-12-09 13:22:04 +00:00
ForFoxSake
a5d5c8e4e0 Fixes Runtime in Prosthetics Fabricator 2016-12-09 13:13:25 +00:00
ForFoxSake
89d4e3b824 Fixes SMES power window from throwing runtimes while in construction. 2016-12-09 13:05:57 +00:00
woodratt
ad92bc899b 1.6.6 shoes and gloves 
Adds shoes and gloves from Bay.

Forensic gloves added to the loadout, detective only.
Work gloves added to the loadout.
Tactical gloves added, not to loadout.
Cowboy boots added (existing sprite, loadout)
Jungle boots and Duty boots added, (loadout).
Dress shoes added white and black, (loadout).
Fixed pathing issue with purple beret.
 2016-12-08 20:59:04 -08:00
MagmaRam
8f74526064 Merge pull request #2842 from ForFoxSake/takemybreathaway 
A Few Atmospherics Tweaks (Valves, Vents and Layout)
 2016-12-07 21:43:46 -06:00
Anewbe
bf9c76ee3c Merge pull request #2839 from MagmaRam/EAL_implant 
Adds an implant that allows humans to speak EAL.
 2016-12-07 21:39:45 -06:00
Anewbe
bcc6ac03e3 EVA hardsuit gets insulated gauntlets 2016-12-07 17:41:42 -06:00
Anewbe
85b147296a Merge pull request #2841 from ForFoxSake/butnotadroptodrink 
Fixes water-coolers.
 2016-12-07 16:34:51 -06:00
ForFoxSake
802b70ba5b De-cluttered Atmospherics, enabled air vent direction switching, and added digital valve un-wrenching. 2016-12-07 21:50:26 +00:00
Cinder
aed5ab186f Update custom_items.txt 
Added silencedmp5a5's spawn to avoid conflict with master branch
 2016-12-07 11:39:54 -06:00
MagmaRam
95aa0d152d Finally got around to implementing Zuhayr's suggestion. 2016-12-06 20:16:42 -06:00
ForFoxSake
716c89b8cd Fixes water-cooler runtime. 2016-12-06 22:38:52 +00:00
killer653
fa5df25a60 Adds mega/shrink shrooms to vendors 2016-12-04 21:07:53 -05:00
Cameron653
2ebe97dd38 Makes seeds obtainable via vendors 2016-12-04 20:25:51 -05:00
Cinder
6e72f73f99 Update custom_boxes_vr.dm 2016-12-04 19:25:13 -06:00
Cameron653
8a12de6ed2 Create seed_pacets_vr.dm 2016-12-04 20:01:31 -05:00
Spades
8c9c0803fe Merge pull request #727 from Cameron653/master 
Modifies ERT dogborg disabler & minor bugfixes
 2016-12-04 13:46:16 -05:00
Spades
22006dc34f Merge pull request #733 from Screemonster/feralmonsterness 
Xenochimera bugfix and feralness overhaul
 2016-12-04 13:45:37 -05:00
Spades
fbc9282aa2 Merge pull request #737 from killer653/master 
Makes SilencedMP5A5/Serdykov Antoz spawn with their custom item
 2016-12-04 13:45:29 -05:00
killer653
61140130f2 Makes SilencedMP5A5/Serdykov Antoz spawn with their custom item 2016-12-04 02:16:03 -05:00
Cameron653
c7baf51b35 Merge pull request #735 from killer653/master 
Prevents runtimes from occuring when a mob absorbs a player
 2016-12-04 02:12:37 -05:00
killer653
f79da03905 Minor text fixes 2016-12-02 17:43:42 -05:00