cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-08 07:08:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
37,743 Commits 8 Branches 26 Tags
5ff61bea4c95c31a8f0b5ced07abb7b68f73b199
Commit Graph

17723 Commits

Author SHA1 Message Date
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
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
killer653
2164d34e83 The result of coding tired 2017-08-11 22:46:12 -04:00
Spades
f3dbef9f0c Merge pull request #1979 from VOREStation/solgov-lore-fixes 
Icon fixes for UNSC stuff
 2017-08-11 18:41:05 -04:00
Verkister
44d4a540e2 Some improved contrast on some markings plus a new ear option. 2017-08-11 21:16:47 +03:00
Spades
4af3ba0a34 One more thing 2017-08-11 01:21:38 -04:00
Spades
77a7dc1761 Fixes broken icons for some things 
dunno if I fixed the olive and tan suits tho
 2017-08-11 00:47:07 -04:00
Spades
c34c9888bd Merge pull request #1974 from Cameron653/METEOR_EXPLOSION 
Makes Meteors Less Powerful
 2017-08-10 23:23:40 -04:00
Cameron653
07ad3e9f81 Merge pull request #1973 from Cameron653/YOU_KEEP_GIVING_ME_RUNTIMES 
Removes redspace tech from sizegun
 2017-08-10 22:18:28 -04:00
killer653
2f18b90d04 Decreases the explosion of meteors by a lot. 
It put phoron in the entire fuckin station!
 2017-08-10 21:22:38 -04:00
killer653
e11cd75353 Fixes runtimes from sizegun tech 2017-08-10 20:29:40 -04:00
Spades
c8f16aa2b6 Merge pull request #1972 from VOREStation/solgov-lore-fixes 
Return of the UNSC
 2017-08-10 19:55:33 -04:00
Spades
836b00b4e1 Merge pull request #1971 from Cameron653/VERY_COMPLEX_WINGS_THAT_REQUIRE_LOTS_OF_TIME_AND_EFFORT_TO_GET_WORKING_WHY_ARE_YOU_STILL_READING_THIS_(EAT_JASMINE) 
Makes wings their own seperate entity on char setup
 2017-08-10 19:55:09 -04:00
Spades
67642e26d5 Merge pull request #1969 from Cameron653/DHAEL_CRUSH_CODE 
Micro Crush Adjustments
 2017-08-10 19:54:53 -04:00
killer653
5b28d69ca6 Invisible Spawn Bug Fix 2017-08-10 19:34:21 -04:00
killer653
0aaaa3139b Splits some fluff wings up. More adjustments. 2017-08-10 19:23:24 -04:00
Spades
31146ec22f inconsistent indentation fixed 2017-08-10 18:59:13 -04:00
Spades
42e3b650d2 oh right and we have a new superpower faction 2017-08-10 18:44:38 -04:00
killer653
f31c811c82 Adds Roiz's fat Lizard Tail 2017-08-10 18:27:38 -04:00
Spades
152d6f82ed travis it's commented out stop whining 2017-08-10 16:18:08 -04:00
Spades
fe7ba8036d Return of the UNSC 
- Overwrote SolGov lore.
- Removed mentions of SifGuard.
- Confederate is now just Central because Confederacy is a stupid type
of government for something with decent cohesion on the galactic stage.
- Stuff I'm not done with
- I'm fucking tired
- Zzzzzzzzzzzzzzzz
 2017-08-10 14:22:26 -04:00
killer653
a2f346df0f Makes wings their own seperate entity on char setup 2017-08-10 07:12:22 -04:00
Spades
6c3ce37a67 Merge pull request #1970 from Cameron653/SIZEGUN_DESC 
Sizegun desc update
 2017-08-10 05:38:06 -04:00
killer653
72740edb26 Sizegun description 
Updates sizegun description
 2017-08-09 22:19:45 -04:00
killer653
056d30fd83 HOLY FUCKING SHIT 
SOUND THE SIRENS
MASSIVE BUGFIX
 2017-08-09 21:09:55 -04:00
killer653
06975fca7a More micro step changes! 
- Increases max end damage by being stepped on
- Decreases low end damage by being stepped on
- Spreads damage across all body parts
- Gurantees damage will heal over time, provided they were only stepped
on one.
- Puts Dhael in a boot (wait, did this change really?)
 2017-08-09 20:46:54 -04:00
Spades
9a39219a55 Merge pull request #1967 from Cameron653/QUICK_NIF_FIX_ 
Gives admins with R_ADMIN their quicknif verb
 2017-08-09 18:40:24 -04:00
killer653
2e153d876a Gives admins with R_ADMIN their quicknif verb 2017-08-09 17:43:54 -04:00
Spades
6fcd1fb3ce Merge pull request #1962 from Cameron653/BORG_BELLIES 
Allows for borg/pai stomachs to be correctly examined.
 2017-08-09 15:17:13 -04:00
Spades
929cfa93cf Merge pull request #1963 from Cameron653/SIZEGUN_LASER 
Sizegun Tweak.
 2017-08-09 15:15:42 -04:00