cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-07 14:50:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,284 Commits 8 Branches 26 Tags
2f8a5ef259f5c9b4e4cd892c0ba8aed1cc00380e
Commit Graph

591 Commits

Author SHA1 Message Date
Spades
2f8a5ef259 Merge pull request #1928 from Cameron653/GAZER_EYES_ARE_SCARY 
Makes gazer eyestalks avaliable for all
 2017-07-31 21:39:30 -04:00
killer653
91ed3e8c02 Makes gazer eyestalks avaliable for all 2017-07-31 20:40:06 -04:00
Cyantime
ffb03e1568 Fixes always tasting, and sending taste message to wrong person 2017-07-28 20:01:16 -04:00
Spades
41b1b5def1 Merge pull request #1910 from Verkister/blehh2sparkbooger 
Slight sergal overhauls
 2017-07-27 14:38:40 -04:00
Spades
e173da0603 Merge pull request #1902 from DarkWolfInsanity/IvyIDFix 
Ivy Baladeva ID Fix
 2017-07-26 20:11:24 -04:00
Verkister
fc3f9ed71f reeee every single time 2017-07-27 02:28:09 +03:00
Verkister
2492e7dbf5 Merge remote-tracking branch 'remotes/origin/master' into blehh2sparkbooger 
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories_vr.dm
#	icons/mob/human_races/markings_vr.dmi
 2017-07-27 02:21:53 +03:00
Verkister
90c6c5f2e2 Slight sergal overhauls. 
-Apart from ears basically everything is new.
-Full body markings updated as well.
-Added a dual colorable sergal tail.
-Added a new full body markings set that's basically just some simple body shading to make up for coloring induced contrast loss.
 2017-07-27 02:15:36 +03:00
killer653
daaed5921d Fixes conflicts 
Fixes conflicts
 2017-07-26 00:02:14 -04:00
Spades
623f5eea19 Merge pull request #1905 from Verkister/blehh 
It's the char setup update. (Wouldn't let me reopen the original PR after some explosive shenanigans)
 2017-07-25 23:34:18 -04:00
Cyantime
71112430e9 Workaround for struggle transfers 2017-07-25 16:01:09 -04:00
Verkister
10e46d0b88 Merge commit '0a771ee5c1f52f467c1c07e6dc9f1b7404250efa' into blehh 
# Conflicts:
#	icons/mob/vore/tails_vr.dmi
 2017-07-25 22:05:13 +03:00
Cinder
57efcfe8dc Ivy ID Fix 
Forgot the bag. oops
 2017-07-25 10:21:25 -05:00
killer653
153641cabe Fixes conflict 
Fixes conflict
 2017-07-25 08:58:36 -04:00
Verkister
3aebfd9a92 Un-conflicts fennix tail. 2017-07-25 11:52:17 +03:00
Spades
b4e00bb5c4 Merge pull request #1896 from Cameron653/ROIZ_TEST 
Adds Roiz's custom dino coat.
 2017-07-25 02:34:35 -04:00
Spades
f2b131013e Merge pull request #1894 from Cameron653/NUMB_GURGLES 
Makes everyone have numbing gurgles by default.
 2017-07-25 02:34:22 -04:00
Cinder
5e6a8fb4a0 Fixes Ivy Baladeva's ID issues 
Instead of making a new ID that doesn't get her access rights, make a reprinter instead that just changes the icon and description
 2017-07-25 00:04:24 -05:00
Cameron653
cae3af822d Update sprite_accessories_vr.dm 2017-07-24 14:33:47 -04:00
Cameron653
a5d54f1bac Removes whitespace. 2017-07-23 19:11:56 -04:00
killer653
3a5da61430 Adds Roiz's custom coat 2017-07-23 16:23:32 -04:00
killer653
7f567cf15c Gives everyone numb digestion by default 
Because why not. Healbellies are default, so why not numb belly.
 2017-07-23 12:52:58 -04:00
Cameron653
a516a0d041 Adds L and R hand sprites 2017-07-23 10:47:26 -04:00
killer653
9acf4f0b6d Adds Ketrai's custom fennix tail 
https://forum.vore-station.net/viewtopic.php?f=26&t=956&p=6110&hilit=ketrai#p6110
 2017-07-23 10:37:43 -04:00
Cameron653
02ce817c44 This almost passed me by. 2017-07-21 14:39:09 -04:00
killer653
016337ee4d Quick, small fix. 2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
killer653
4d45cc28c3 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NATJE_CUSTOM_FLUFF 2017-07-21 03:02:39 -04:00
Spades
849249a312 Merge pull request #1851 from Verkister/antinuke 
👌 (WOW!) ANTINUKE LOOTGURGLE UPDATE (HUGE!) 👌 (also finished)
 2017-07-20 21:47:08 -04:00
killer653
44a2619693 Adds their custom taur 2017-07-20 06:15:47 -04:00
Spades
bf34eaef5a Merge pull request #1869 from Cameron6531/master 
Micro step code changes.
 2017-07-20 00:45:13 -04:00
Spades
a04bca6da9 Merge pull request #1863 from Ketrai/patch-1 
Add approved fluff item: pink bear hat.
 2017-07-19 12:26:48 -04:00
Verkister
abcc7c3975 Eliminates another possible culprit for the ID bug :v 
-Gurgle drop now checks and dumps ID slot before dumping uniform pockets.
 2017-07-18 22:44:12 +03:00
Verkister
955d73d07b Should fix the double ID bug I think. 
-Seems like the code pulled an entry of the ID as the PDA's subitem.
-Moved the PDA handling part above the subitem part.
 2017-07-18 22:28:27 +03:00
Ketrai
55402f1c73 Update custom_clothes_vr.dm 2017-07-18 20:53:51 +02:00
Verkister
f33c48670c fixed digested fooditems showing flavor message on human types 2017-07-18 17:49:49 +03:00
Verkister
f2df2b531c not again lmao 2017-07-18 11:09:31 +03:00
Verkister
b936f72d9a Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh 
# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/tails_vr.dmi
 2017-07-18 11:05:33 +03:00
Verkister
d0f52905c1 the commits keep coming and they don't stop coming 
-Redirected zorren species code towards the new icon file.
-Added colourable elf ears.
 2017-07-18 10:46:29 +03:00
Spades
5d99c848f5 Merge pull request #1858 from killer653/master 
Adds more jackets to the loadout menu.
 2017-07-17 21:30:34 -04:00
Verkister
9e00488221 Prepared the file to not become a destructive conflict disaster against ShadowLarkens' Big snake tail. 2017-07-17 22:42:58 +03:00
ShadowLarkens
e702578eba Add new tail: Big snake tail 2017-07-17 11:08:51 -07:00
Verkister
7faf79cda3 WE NEED TO GO DEEPER 2017-07-17 19:40:20 +03:00
Verkister
780c548745 weakgurgle subitem shit 
-Since the initial drop no longer unpacks shit :v
 2017-07-17 19:35:53 +03:00
Verkister
3ca18843c4 MORE VORE 
-Added a strip digest mode, that only gurgles the prey's gear instead.
-Various fixes and tweaks to earlier commits.
-Item/subitem handling is now the gut's job. Dying to gurgles still makes the prey drop their outer gear.
- in other words the initial gurgle loot drop now only drops the worn gear, leaving the contents for gut subitem stuffs.
-Added another exclusion after noticing tesh abilities hud thingy in the gut :v
-I swear there was something more.
 2017-07-17 19:17:23 +03:00
Verkister
e7ae63b6bf Adds the item-friendly gurglemode. 
-This can be found in the belly hold mode selection.
-Also slightly reduces borgo trash nom sound volume.
 2017-07-17 09:44:42 +03:00
Cameron6531
9092c2c81c Update resize_vr.dm 2017-07-17 01:12:20 -04:00
Cameron6531
abd0f015ba Forgot a " 2017-07-16 23:21:42 -04:00
Cameron6531
82ead648a4 Update resize_vr.dm 2017-07-16 23:14:11 -04:00
Verkister
a69c18b7dc Snacks. 
-Normal itemgurglemode now also takes partial nutritional reagent contents from prey's snack stashes.
 2017-07-16 13:59:39 +03:00