cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-26 09:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
51,946 Commits 8 Branches 0 Tags
fab4ecff1d56bc34b6a71ba767fa943ebbc8f8ab
Commit Graph

963 Commits

Author SHA1 Message Date
Razgriz
a7eabb558d IP Reputation Tracking 2020-01-16 02:57:03 -07:00
Razgriz
4dd7da18c0 Update .gitignore 2020-01-08 02:57:20 -07:00
Hawk_v3
c95a447b71 Merge remote-tracking branch 'upstream/master' 2019-10-27 17:58:34 +00:00
Verkister
cd739c49f0 Xenochimera whitelist update (MrSebbi) 
https://forum.vore-station.net/viewtopic.php?f=46&t=1605
 2019-10-25 18:06:25 +03:00
DameonOwen
22674b143a Fix cookie not deleting self. Add cookie to Amber Owen's loadout. 2019-10-19 15:25:31 -04:00
Hawk_v3
6e801b1e8e Map Updates. 2019-10-04 01:52:44 +01:00
timidvi
27492648da Adds timidvi to diona whitelist-order fix 
https://forum.vore-station.net/viewtopic.php?f=46&t=1580

Put name back in alphabetical order
 2019-10-01 22:39:26 -04:00
timidvi
ede6c1bc6d Adds timidvi to diona whitelist 
https://forum.vore-station.net/viewtopic.php?f=46&t=1580
 2019-10-01 22:35:33 -04:00
Verkister
33863c556f Update alienwhitelist.txt 2019-10-01 10:43:57 +03:00
Verkister
a779cdb8da Prottie whitelist update 
https://forum.vore-station.net/viewtopic.php?f=46&t=1583
 2019-10-01 10:39:46 +03:00
Hawk_v3
691a1239f4 Merge from Vorestation 2019-09-29 21:53:09 +01:00
Repede
70f3576ba2 Strix new headset 2019-09-29 14:08:07 -04:00
Heroman
55112d66d6 Fixes some missed capitalizations in alienwhitelists 2019-09-30 03:41:39 +10:00
KillerDragn
791f5639b5 Adds killerdragn to xenomorph whitelist 
https://forum.vore-station.net/viewtopic.php?f=46&t=1590
 2019-09-28 20:49:25 -07:00
izac112
97c0bdf692 Start of porting over the fluff items, to the new system. 2019-09-17 05:50:27 +02:00
Hawk_v3
a333c03a3c Merge remote-tracking branch 'upstream/release' 2019-09-14 17:10:36 +01:00
Screemonster
992dc2c089 fix a random alien's whitelist 2019-09-14 04:21:39 +01:00
DameonOwen
325fdd7e87 Adds the mysterious cookie fluff item. 2019-09-04 22:18:15 -04:00
Cyantime
eac30eb7e1 Gives Burrito their uniform back 2019-09-01 19:18:14 -04:00
Cyantime
b751e0e8bd Updates paths due to Polaris change 2019-09-01 18:24:35 -04:00
Hawk_v3
0f3c802427 Merge remote-tracking branch 'upstream/master' 2019-08-22 21:32:01 +01:00
Novacat
ef87f043ce Merge pull request #5667 from Mewchild/MC-Ryder 
Adds SgtRyder to mime whitelist
 2019-08-20 01:00:15 -04:00
Mewchild
a6992a7475 Adds SgtRyder to mime whitelist 2019-08-19 23:37:39 -05:00
CRTXBacon
7e66bf1c5c Update custom_items.txt 2019-08-20 00:12:38 +01:00
TheFurryFeline
6b7ee364ba Add A Random Alien's Xenochimera 
Might as well include https://forum.vore-station.net/viewtopic.php?f=46&t=1569 for this one.
 2019-08-18 11:20:16 -04:00
TheFurryFeline
3db3e1b705 Whitelists Hollifex For Diona 
PR for Hollifex's approved app https://forum.vore-station.net/viewtopic.php?f=46&t=1568
 2019-08-18 11:03:54 -04:00
Hawk_v3
96b8a7ab95 Merge remote-tracking branch 'upstream/master' 2019-08-17 21:06:48 +01:00
Mewchild
798e45cc1a Adds Westfire to Xenohybrid Whitelist 2019-08-13 23:03:49 -05:00
izac112
2d27200833 and done 2019-08-14 02:22:10 +02:00
izac112
e2570c5585 Vasharr fluff 2019-08-14 01:34:06 +02:00
Hawk_v3
0c85b3a4dd Merge remote-tracking branch 'upstream/master' 2019-08-09 21:35:04 +01:00
Screemonster
21d274b6b9 Rykka xenochimera whitelist 2019-08-02 10:13:47 +01:00
chaoko99
ca099753a4 adds chaoko99's custom item 2019-07-25 20:59:44 -07:00
Hawk_v3
c7b05c05fb Merge remote-tracking branch 'upstream/master' 2019-06-11 02:34:25 +01:00
Unknown
2b20e6081d Cleaning permabanned custom items 2019-06-10 13:09:23 -04:00
Heroman
bbe14f58db Updates whitelist too. 2019-06-09 18:21:12 +10:00
Heroman
dea577a951 Updates fluff item lists 2019-06-09 15:40:38 +10:00
Heroman
ba420b4ff6 Fixes Natje's custom item 2019-05-16 06:05:06 +10:00
Hawk_v3
27e73883fc Merge remote-tracking branch 'upstream/release' 2019-05-04 21:03:48 +01:00
Heroman
ff9e4f2e4a Makes Flavor Text properly required for joining 2019-05-02 14:40:13 +10:00
Novacat
589dbd69de Merge pull request #5135 from Novacat/nova-heterochromia 
Adds Subtle Teleporter
 2019-04-26 15:16:47 -04:00
Unknown
16e449ce1e Config-side expired permit purge 2019-04-26 14:58:49 -04:00
Novacat
ad3e9fc6bd Merge pull request #5101 from Heroman3003/timeclock-finishing 
Implements switching on/off duty midround via timeclock terminals
 2019-04-25 21:11:07 -04:00
Hawk_v3
50e2482613 Merge remote-tracking branch 'upstream/master' 2019-04-22 20:12:14 +01:00
Atermonera
6cb44efd10 Merge pull request #6114 from Neerti/gamemode_config 
Makes gamemode player requirements be able to be overridden in the config
 2019-04-22 14:33:38 -04:00
Neerti
40e5fda9ca Adds Config-Controlled Automated Solar Setup (#6107) 
* Fixes autostart solars, adds new config-controlled solars.

* Tweaks map to use config-controlled solar panels, and makes it work.

* If true, Neerti finishes comment.
 2019-04-21 03:34:25 -04:00
Heroman3003
1a9cdecb32 Finishes timeclock duty switching functionality 2019-04-19 10:28:38 +10:00
Hawk_v3
41f0bd9f6d Merge remote-tracking branch 'upstream/master' 2019-04-14 19:44:13 +01:00
Unknown
a5449b38dc Remind me not to code while sleepy 2019-04-10 15:02:56 -04:00
Unknown
4a0b4c32cb Whitelists Rapidvalj for Skrellian 
- Also allows Custom species to verbally speak Terminus, Skrellian, and High Skrellian
 2019-04-10 14:58:39 -04:00