Commit Graph

27960 Commits

Author SHA1 Message Date
killer653
eb48f05509 Adds Xenneth custom ID 2017-08-20 21:28:16 -04:00
Cyantime
70a03f1155 No one saw that. 2017-08-16 19:20:57 -04:00
Cyantime
0df74e92fe Quik Fixes 2017-08-15 22:19:13 -04:00
Cyantime
499862bca6 Configurable mob spawners, re-implementation of trash mouse spawning. 2017-08-15 22:09:53 -04:00
Spades
0d5bc38ddf Merge pull request #2015 from Verkister/feedtheborgo
Enables vore organ borgo fueling.
2017-08-15 01:22:35 -04:00
Spades
595643a553 Merge pull request #2018 from VOREStation/revert-2003-mousespawn
Revert "Trash piles can now spawn mice"
2017-08-15 00:08:58 -04:00
Spades
35c6cbd8b5 Merge pull request #2017 from Cyantime/catbuff
Buffs cat mouse-catching capabilities.
2017-08-15 00:08:47 -04:00
Spades
60ead7642d Revert "Trash piles can now spawn mice" 2017-08-14 23:07:08 -04:00
Cyantime
9f268bca33 Buffs cat mouse-catching capabilities. 2017-08-14 21:36:31 -04:00
Verkister
fe6cf21850 Enables vore organ borgo fueling.
-Borgs now gain recharge juice from vore organ gurgles.
2017-08-15 00:19:06 +03:00
killer653
e59bb743c7 Fixes spider hair&markings 2017-08-14 16:32:55 -04:00
Spades
2dfe50bc1b Merge pull request #2008 from Cyantime/decontam
Contaminated items no longer deal damage if they are in a belly.
2017-08-14 04:16:45 -04:00
Spades
0a808a5cb4 Quick text hotfix 2017-08-14 04:04:51 -04:00
Cyantime
9a6b86cb9b Stop poisoning yourself 2017-08-14 02:22:42 -04:00
Cameron653
010dce2056 Merge pull request #2007 from Cameron653/SPIDER_RACE
Fixes a gamebreaking oversight related to spider and xenochimera age.
2017-08-14 02:02:10 -04:00
Cameron653
0ba9752202 Forgot to change these when I initally copy and pased them. 2017-08-14 01:13:40 -04:00
Spades
e0db8feb50 Merge pull request #1996 from Cameron653/SPIDER_RACE
Spider race & modifications!
2017-08-14 00:31:39 -04:00
Spades
0d24be30ea Merge pull request #2002 from Yoshax/1234
Fixes Promethean Humans looking really, really bad
2017-08-13 20:55:19 -04:00
Cyantime
8502ceaee6 Trash piles can spawn mice 2017-08-13 19:15:04 -04:00
Yoshax
b3c2cea59c Fixes Promethean Humans looking really, really bad 2017-08-13 21:48:41 +01:00
Cameron653
38a496cfb4 Update station_special_vr.dm 2017-08-13 10:42:15 -04:00
Verkister
5ff61bea4c Merge branch 'master' of https://github.com/VOREStation/VOREStation into spriteshit
# Conflicts:
#	code/game/dna/dna2.dm
#	code/game/dna/dna2_helpers.dm
2017-08-13 15:21:22 +03:00
Verkister
22e6bcb520 Enables dual coloring for ears.
-Ya know how a bunch of the ear options have that untouchable bright white inner part?
-You can touch it now :D
-Also renames the ear color vars for better compatibility and consistency.(red/g/b_ear > r/g/b_ears etc)
2017-08-13 15:20:11 +03:00
Spades
2e22e7fd08 Merge pull request #1994 from Cameron653/MEDICAL_SLEEVEMATE
Lets medical borgs scan people.
2017-08-13 05:17:10 -04:00
Spades
cf00011e73 Merge pull request #1987 from Verkister/spriteshit
Accessory blend mode overhauls and some synth taurs.
2017-08-13 05:17:01 -04:00
Spades
ab0f2cd176 Merge pull request #1995 from Cyantime/tfrefactor
TF refactor
2017-08-13 05:16:40 -04:00
Spades
7b47cbc5ad Update organizations_vr.dm 2017-08-13 04:01:20 -04:00
Spades
6a29a35063 " 2017-08-13 02:36:46 -04:00
Spades
9fada8c3dd Changing this while I'm at it. 2017-08-13 00:29:25 -04:00
killer653
2104cfde9a Blurb update 2017-08-12 23:54:10 -04:00
killer653
731bea5001 Small edit 2017-08-12 23:52:08 -04:00
killer653
63c496e79c FIXES 2017-08-12 23:49:24 -04:00
Cameron653
d1de17240c Updates their name 2017-08-12 23:43:57 -04:00
killer653
32ee9af282 Adds spider-eyes 2017-08-12 23:17:59 -04:00
killer653
34a0cd094e Allows spiderlegs to be chosen as a "wing" selection 2017-08-12 23:07:07 -04:00
killer653
dc828eaab0 Spiders! 2017-08-12 23:02:38 -04:00
Cyantime
9637c6a0eb TF refactor 2017-08-12 20:53:52 -04:00
Cameron653
94b50a1299 Lets medical borgs scan people. 2017-08-12 20:32:49 -04:00
Cameron653
0ffd4673e6 Merge pull request #1993 from Cameron653/SIZE_GUN_FIX
Size gun fix
2017-08-12 20:13:27 -04:00
Cameron653
585ea77260 Update designs_vr.dm 2017-08-12 19:49:12 -04:00
Cameron653
83017c8c98 Fixes sizegun examine size 2017-08-12 19:46:24 -04:00
Verkister
ba84cf66f5 Fixes vulp belly markings missing groin bits. 2017-08-12 23:12:48 +03:00
Spades
690bca044d Merge pull request #1986 from VOREStation/odst-hotfix
Hotfix for shitty held sprites by ODST armor
2017-08-12 13:43:21 -04:00
Verkister
1178f7dc38 reverts a redunant accident edit 2017-08-12 19:20:59 +03:00
Verkister
97c5cb924b A big accessory blend mode overhaul.
-Converted a buttload of markings, ears, and tails to use multiply blend mode instead of add.
-Enabled marking type dependent blend mode for markings code (was hard limited to add mode)

ears
-squirrel
-bear
-wolf
-sergal
-otie
-cow
-jagged
-elven
-sleek

tails
-squirrel
-kitty up and down(w)
-tiger(w)
-stripey
-bear
-wolf
-ringtail
-dragon
-curltail(w)
-straight(w)
-tigertail(w)
-vulptail(w)
-otie
-jagged
-snaketail
-sergal

markings
-vulp set(belly,fullbelly,crest,nose,face,earsface,allhead)
-sergal full(f/m)
-monoeye
-nevrean beaks
-shaggy mane
-otie set(nose,face,belly,back,fingers,socks)
-cow full
-corvid set(belly,beak)
-jagged set(body,snout,mask)
-zorren set(belly,face,muzzle,socks,longsocks)
-tesh feathers
2017-08-12 19:08:23 +03:00
Verkister
bf0d9c1d15 Some dual-colorable synth taurs.
-Wolf, feline, horse, and lizard.
-Also trimmed off the empty directional slots from the taursuits file text note blanks.
2017-08-12 14:40:59 +03:00
Spades
ef76aaa0af Hotfix for shitty held sprites by ODST armor 2017-08-12 03:01:27 -04:00
Spades
4486927f01 Merge pull request #1984 from Cameron653/PAI_BORG_FIX
Pai & borg fix
2017-08-12 02:47:27 -04:00
killer653
0b78869f92 Nothing to see here 2017-08-11 23:32:51 -04:00
killer653
5cdd73e60b Merge remote-tracking branch 'refs/remotes/VOREStation/master' into PAI_BORG_FIX 2017-08-11 22:48:10 -04:00