cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 23:00:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,616 Commits 8 Branches 26 Tags
9bbcf5c8c63897ce01a68fdaffd16aaa2fa5d7d7
Commit Graph

118 Commits

Author SHA1 Message Date
killer653
9bbcf5c8c6 Whoops! 2016-06-25 22:58:00 -04:00
killer653
6fd78fe69b This took 5 hours to fix 
...due to user error. It was a 5 minute fix that required 1 new line of
code.

Coding hurts.
 2016-06-25 22:31:58 -04:00
Spades
e56fc38403 Merge pull request #376 from viv-eret/master 
Adds tentacle taur sprites
 2016-06-24 18:49:40 -04:00
Spades
3b249abdf9 Merge pull request #350 from Cameron653/master 
Adds in Xenochimeras (Scree Whitelisted race)
 2016-06-22 16:55:21 -04:00
viv-eret
841db7077b Added tentacle sprite code 2016-06-21 19:15:57 -07:00
Spades
5d51bc48c4 Travis wake up. 2016-06-18 19:20:25 -04:00
Spades
c16257fd58 Travis wake up. 2016-06-18 19:19:29 -04:00
Cameron653
9b4c967b23 Fixes! 2016-06-18 14:50:47 -04:00
Cameron653
61d4aeced1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-15 14:30:40 -04:00
Arokha Sieyes
aea0af7f16 Exclusive list add for safety 2016-06-15 00:10:01 -04:00
Arokha Sieyes
6de29e6b9b More Elegant 2016-06-15 00:00:16 -04:00
Arokha Sieyes
fa366e4b08 Fixes Vore 
- Makes belly modes stop duplicating themselves
- Fixes 'owner' var on belly which is where prey is moved when eaten
 2016-06-14 23:49:27 -04:00
Arokha Sieyes
e591cadd7b Merge pull request #360 from VOREStation/gun-fetish 
PDW added
 2016-06-14 19:26:54 -04:00
Spades
f6871d2656 Almost forgot the AP rounds! 2016-06-14 17:41:47 -04:00
Spades
0433d9bf83 Derp. 2016-06-14 17:17:33 -04:00
Spades
1f48a98ba4 Official Vorestation SMG. *nodnod* 2016-06-14 17:16:29 -04:00
Spades
51be44fef0 PDW added 2016-06-14 17:11:57 -04:00
Cameron653
a30f688bc3 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-11 03:25:33 -04:00
Cameron653
4543b8c8f9 LOTS O FIXES 2016-06-11 02:30:36 -04:00
Arokha Sieyes
bb42f4e51d Fixes bellies overwritng each other 
Now you can have more than one slot. Fair warning, if you load another character then save bellies, it overwrites those. Like if you do that AFTER spawning. Like you're playing a mob from slot 1, you go into preferences > character set up, load slot 2, then open vore panel and click save, it will overwrite slot 2.

On the one hand, an easy way to copy bellies between characters! On the other, perhaps unexpected.

This prooooooooooobably doesn't delete everyone's bellies? Probably. Maybe you should copy the data folder, just in case. ;o Skip the logs.
 2016-06-10 21:02:01 -04:00
Cameron653
eba3e1bf27 Moth wings, non colorable. 2016-06-10 01:04:11 -04:00
Cameron653
91e247a75a Adds in a colorable moth wings. 
Sprited by Tk20634
 2016-06-10 01:02:51 -04:00
Spades
5694f545e0 Merge pull request #338 from VOREStation/Guns-Guns-Guns 
Fluff rifle casing icon fix
 2016-06-10 00:35:34 -04:00
Arokha Sieyes
b16d73d1da Merge pull request #341 from Cameron653/master 
Bugfixes and promethean nerf.
 2016-06-09 20:12:13 -04:00
Spades
3d8621dcd6 Fixes the BR casing 2016-06-09 04:22:31 -04:00
Cameron653
c99c1db0a1 TF clarification since not everyone 
does womb TF, and some people are against UB.
 2016-06-09 02:38:30 -04:00
Spades
030adfc39f Derp. 2016-06-08 21:09:36 -04:00
Spades
4c1dba268e Gun fixes. 
Brings all our guns up to date.

- Cresent Rose no longer uses redundant ammo type. It uses 5.56 ammo.
- Fixes names and descriptions.
- Fixes bad origin tech vars.
- Fixes missing allowed_magazines var.
- Fixes battle rifle ammo icon.
- Fixed missing STG ammo icon.
- Added some other missing icons for later.
 2016-06-08 20:01:20 -04:00
Arokha Sieyes
cef08710b2 Fix several fluff items 2016-06-08 16:58:43 -04:00
Arokha Sieyes
b3e0a7bc30 Merge branch 'master' of https://github.com/VOREStation/VOREStation into bagfix 2016-06-08 13:49:12 -04:00
Arokha Sieyes
c625a7515e Tweaks digestion code 
Makes synths digest more gracefully and actually preserves MMIs like intended
 2016-06-07 18:20:52 -04:00
Arokha Sieyes
0422a4bcd4 Updates my fluff bag. Less gun, more knife. 2016-06-06 21:49:25 -04:00
Arokha Sieyes
df4c821984 Merge pull request #312 from JoanRisu/Fluff_Items_worshop 
fluff adjustments
 2016-06-06 21:37:34 -04:00
JoanRisu
d2a2419e07 Minor additions 2016-06-06 16:54:38 -07:00
JoanRisu
4670997eea Federation Dress Shirt 2016-06-06 16:39:29 -07:00
Spades
36cdadbe09 Merge pull request #308 from VOREStation/idfix 
Fixes bellies with 'stuck' IDs
 2016-06-06 14:06:35 -04:00
JoanRisu
ee15d86e6a Assassin's kit 2016-06-06 10:31:25 -07:00
JoanRisu
cc2af62ee3 rolled back some stat inheritance changes. 2016-06-06 09:23:40 -07:00
JoanRisu
a550abf777 Added new ammo for Crescent Rose 2016-06-06 08:30:17 -07:00
Arokha Sieyes
eeffdd8594 Touch up fitness machine code 2016-06-06 02:06:02 -04:00
Arokha Sieyes
694e60fbf7 Fixes bellies with 'stuck' IDs 2016-06-06 01:32:22 -04:00
JoanRisu
180f5a3017 Added medals for these people: 
Dhaeleena:Dhaeleena M'iar
Vorrarkul:Lucina Dakarim
 2016-06-04 06:29:16 -07:00
JoanRisu
dabcd61aab SQUIRREL COMBAT SPACESUIT...along with the Bolt Action and M14. 2016-06-04 05:43:02 -07:00
Arokha Sieyes
f3a4cc0205 Merge pull request #295 from JoanRisu/Fluff_Items_worshop 
Fluff: Crescent Rose Revived!
 2016-06-03 23:40:28 -04:00
JoanRisu
e7ddc06368 Rebuilt the Crescent Rose code and edited the custom swords because they were inheriting the wrong stats. 2016-06-03 20:21:12 -07:00
Arokha Sieyes
e6d767d309 mend 2016-06-03 23:15:09 -04:00
JoanRisu
6c41a1aa7a Prototype code for Crestrose, added code for scisword, and moved some fluff around. 2016-06-03 11:06:31 -07:00
Spades
f2d38db655 Merge pull request #279 from JoanRisu/Fluff_Items_worshop 
Fluff Items Workshop
 2016-06-03 10:54:47 -04:00
JoanRisu
20cca897bc Quick syntax amendment because dream maker didn't catch it. 2016-06-02 15:50:25 -07:00
JoanRisu
f80f97e52f Code for new fluff items plus some sprite name amendments. 2016-06-02 15:37:16 -07:00