cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 15:06:39 +01:00
Code Issues Packages Projects Releases Wiki Activity
43,492 Commits 66 Branches 25 Tags
ReddeyfishVor-patch-8
Commit Graph
43492 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
ReddeyfishVorandGitHub eb6933d710 Restore chomp icon and name. 2018-05-31 01:53:15 -07:00
ReddeyfishVorandGitHub 87a74f8269 Merge pull request #149 from CHOMPstation/ReddeyfishVor-patch-12 
add radman to xenomorph hybrid whitelist
 2018-05-29 19:26:00 -07:00
ReddeyfishVorandGitHub a3be51065b Merge pull request #148 from Sharkmare/patch-3 
Toolbelt can now hold the circuit debugger
 2018-05-28 14:54:14 -07:00
ReddeyfishVorandGitHub da1b814f3a add radman to xenomorph hybrid whitelist 2018-05-28 14:49:14 -07:00
SharkmareandGitHub 6ec3003bbf Toolbelt can now hold the circuit debugger 
Finally.
 2018-05-28 23:40:51 +02:00
ReddeyfishVorandGitHub 5375c123b9 Merge pull request #147 from CHOMPstation/ReddeyfishVor-patch-11 
Disable Gormora from RD whitelist
 2018-05-28 01:08:52 -07:00
ReddeyfishVorandGitHub a39dfdc6ca Disable Gormora from RD whitelist 2018-05-28 00:40:42 -07:00
ReddeyfishVorandGitHub a18e9ff049 Merge pull request #146 from CHOMPstation/ReddeyfishVor-patch-10 
Add horizon to diona whitelist
 2018-05-28 00:37:16 -07:00
ReddeyfishVorandGitHub 0869d49858 Add nilsyn and Falshan128 to CE whitelist 2018-05-27 23:51:56 -07:00
ReddeyfishVorandGitHub 4469a5a17e Add horizon to diona whitelist 2018-05-27 23:50:20 -07:00
ReddeyfishVorandGitHub 6e3f8194fe Merge pull request #145 from CHOMPstation/Jakksergal-patch-1 
Actually whitelists HoP
 2018-05-24 17:08:08 -07:00
JakksergalandGitHub f67420d7b4 Actually whitelists HoP 
I am a dumb.
 2018-05-24 15:22:44 -07:00
ReddeyfishVorandGitHub 48829e980c Merge pull request #142 from CHOMPstation/ReddeyfishVor-patch-9 
add wickedtemp and fevix to whitelists
 2018-05-21 20:01:52 -07:00
ReddeyfishVorandGitHub f2cb0fbd6d Add kawkaw to the whitelist for CMO 2018-05-21 19:40:00 -07:00
ReddeyfishVorandGitHub 3556cacc81 Merge pull request #141 from AnonymousHybi/master 
Support for Discord Bots & Discord Verification System implementation
 2018-05-21 00:11:55 -07:00
ReddeyfishVorandGitHub febedc2302 Merge pull request #128 from ReddeyfishVor/slimeChange 
prevent slimes from spawning on top of players
 2018-05-21 00:11:37 -07:00
ReddeyfishVorandGitHub bfecc90304 add wickedtemp and fevix to whitelists 2018-05-21 00:08:45 -07:00
ReddeyfishVorandGitHub 26c0abaa95 Merge pull request #137 from MrMacint0sh/master 
Just adding in a shadekin sprite
 2018-05-21 00:06:41 -07:00
ReddeyfishVorandGitHub 285663d1b1 Merge pull request #134 from Suhayll/Vale's-Medibork-Loadout-Changes 
Medibork changes
 2018-05-21 00:05:59 -07:00
AnonymousHybi 00ea6baafb Minor adjustments 2018-05-20 12:31:47 +01:00
AnonymousHybi a384e78dd0 Merge branch 'master' of https://github.com/CHOMPstation/CHOMPstation 2018-05-20 01:32:22 +01:00
AnonymousHybi e7822eb506 Adds in the Discord Verification system and fixes the bot~ 2018-05-20 01:32:12 +01:00
ReddeyfishVorandGitHub 963d874993 Merge pull request #139 from ReddeyfishVor/virgoPull 
Virgo pull
 2018-05-19 17:30:45 -07:00
ReddeyfishVorandGitHub adf6257aca Merge branch 'master' into virgoPull 2018-05-19 17:19:47 -07:00
Reddeyfish 813d7bf643 Merge branch 'virgoMaster' into virgoPull 2018-05-19 17:16:17 -07:00
Aronai SieyesandGitHub 622a0dd1fa Merge pull request #3712 from VOREStation/aro-ssao-ex2 
Fixes #3711
 2018-05-18 22:14:20 -04:00
Aronai SieyesandGitHub f5b068656a Merge pull request #3726 from VOREStation/aro-issue-3723 
Replace explorer suit with basically the same suit
 2018-05-18 22:14:10 -04:00
Aronai SieyesandGitHub 07c63fe802 Merge pull request #3718 from VOREStation/aro-issue-3697 
Mostly comment out advanced GPSes
 2018-05-18 22:13:45 -04:00
Aronai SieyesandGitHub c33cc261ad Merge pull request #3725 from VOREStation/aro-buttonzzz 
Set a fake ID on shelter buttons to avoid messing with every door
 2018-05-18 22:13:36 -04:00
Arokha Sieyes 51b591f095 Replace explorer suit with basically the same suit 
Except this one is wearable by all species, because there's no suit cycler that would work for the 'generic voidsuit'.
 2018-05-18 14:14:19 -04:00
Arokha Sieyes cb0f107526 Set a fake ID on shelter buttons to avoid messing with every door 2018-05-18 10:14:27 -04:00
MrMacint0shandGitHub 7d4dfc9ae7 Add files via upload 2018-05-17 21:55:41 -04:00
Arokha Sieyes 4a5498cfe3 Mostly comment out advanced GPSes 
Fixes #3697
 2018-05-17 15:38:07 -04:00
Aronai SieyesandGitHub 9deafc561a Merge pull request #3715 from ktccd/ktccd_workbranch 
Adds my approved Diona whitelist
 2018-05-17 09:43:10 -04:00
ktccd e42a251b16 Adds Whitelisted Player 
Added my own approved whitelist.
Link to approved application:
https://forum.vore-station.net/viewtopic.php?f=46&t=1321
 2018-05-17 12:15:45 +02:00
Aronai SieyesandGitHub c60f8ae600 Merge pull request #3713 from VOREStation/Cameron653-patch-1 
Makes KAI spawn with their item properly
 2018-05-17 01:30:25 -04:00
Aronai SieyesandGitHub d8f312c424 Merge pull request #3714 from SpaceManiac/patch/syntax 
Fix various syntactic problems
 2018-05-17 01:00:16 -04:00
Tad Hardesty 927050ce44 Fix various syntactic problems 2018-05-16 21:43:18 -07:00
ReddeyfishVorandGitHub 2e2626418d Merge pull request #136 from CHOMPstation/ReddeyfishVor-patch-8 
Add mac to protean whitelist
 2018-05-16 19:54:50 -07:00
Cameron653andGitHub 39592a2633 Adds spaces 2018-05-16 22:10:50 -04:00
Cameron653andGitHub 591077cbba Makes someone spawn with the item properrly 2018-05-16 22:01:08 -04:00
ReddeyfishVorandGitHub 316455816c Merge branch 'master' into ReddeyfishVor-patch-8 2018-05-16 19:00:05 -07:00
Arokha Sieyes ddfa11b80c Fixes #3711 2018-05-16 21:59:39 -04:00
LeshanaandGitHub d53f405fb0 Merge pull request #3709 from VOREStation/aro-sayreflect 
Message send failure reflection
 2018-05-16 20:46:19 -04:00
ReddeyfishVorandGitHub e13732fdb5 Merge pull request #131 from CHOMPstation/ReddeyfishVor-patch-6 
Add nadyr to gutter whitelist
 2018-05-16 17:23:35 -07:00
ReddeyfishVorandGitHub 0c2f0cb900 Add mac to protean whitelist 2018-05-16 17:23:15 -07:00
Aronai SieyesandGitHub bab82e9d01 Merge pull request #3688 from Heroman3003/no-riding-tents 
Tentacles can be ridden no more
 2018-05-16 18:44:48 -04:00
Aronai SieyesandGitHub 41a997d43e Merge pull request #3687 from VOREStation/aro-ssao-ex 
Exclude some things from SSAO
 2018-05-16 18:44:39 -04:00
Aronai SieyesandGitHub 2fe4e0eea8 Merge pull request #3692 from VOREStation/aro-issue-3690 
Fixes #3690
 2018-05-16 18:43:07 -04:00
Aronai SieyesandGitHub d52923b17c Merge pull request #3667 from Verkister/nifsleeve 
Fixes a bunch of NIF/resleeving related issues (and a tiny otherthing i discovered during tests)
 2018-05-16 18:41:01 -04:00