cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-09 17:02:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,807 Commits 7 Branches 0 Tags
7f4eec0cf92cd724756f6a32fbbf00e731fac66a
Commit Graph

27967 Commits

Author SHA1 Message Date
kcin2001
7f4eec0cf9 adds harpy markings 2017-08-31 18:48:59 -07:00
kcin2001
6f4050cf77 gooey harpies 2017-08-21 14:27:44 -07:00
kcin2001
f7b7f28b5c adds harpies 2017-08-21 14:26:23 -07:00
kcin2001
5af3f4cc59 adds harpies to suits 2017-08-21 14:24:22 -07:00
kcin2001
9f7c777c9d i forgot a quote 2017-08-21 14:21:12 -07:00
kcin2001
a766cc8ed0 Starting to add harpies (first with hair) 
the first in many files and steps
 2017-08-21 14:20:25 -07:00
kcin2001
cde1be5676 actually makes the colorable ones colorable 2017-08-21 12:23:35 -07:00
kcin2001
e8ad23dd04 fixed the tabbing issues and i fucked up commenting out stuff 2017-08-20 17:06:22 -07:00
kcin2001
5262ed0855 uncomments out the colorable heads except for the sentinal 2017-08-20 17:02:43 -07:00
kcin2001
10a5785080 fixes the black ones to use the right state 2017-08-19 18:04:00 -07:00
kcin2001
942d869625 Adds in xeno heads 
need some assistance with colorable heads
 2017-08-17 22:08:23 -07: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