Commit Graph

17402 Commits

Author SHA1 Message Date
Verkister
3aebfd9a92 Un-conflicts fennix tail. 2017-07-25 11:52:17 +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
8cf204e325 Code snippet part for the zorren markings. 2017-07-17 23:37:16 +03: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
Spades
d37e482819 Merge pull request #1860 from SeigaSeiga/feelingtense
Makes some adjustments to prevent temporal distortion while engaging in combat.
2017-07-15 15:44:52 -04:00
Verkister
50449b4920 snip.
Removed a thing made obsolete by the ear color liberation.
2017-07-15 12:39:37 +03:00
Spades
c49cb95e21 Merge pull request #1832 from Verkister/hunger
Adds a new neutral metabolism trait.
2017-07-14 13:01:12 -04:00
Seigaseiga
40d4e79e7c Fixes the tense of some mob attack text. 2017-07-14 05:19:41 +01:00
Seigaseiga
1a1ce79805 Update gaslamps to be more endo-vore forward. 2017-07-13 23:21:46 +01:00
Cameron653
b7608f81e8 Fixes code up. 2017-07-13 17:12:46 -04:00
killer653
c736b6f824 Everything works except for the loadout spawn
Work on later.
2017-07-13 10:15:26 -04:00
Verkister
0c6cba9b49 stomp 2017-07-13 16:11:39 +03:00
Verkister
8a7246d86f More features!
-Made dual-color wagtails possible.
-Added extra color features to curltail(wag), vulptail(wag), stripeytail, tigertail(wag), ringtail, naga, lizardtaur, felinetaur.
-As with the wolftaur earlier, naga, lizard, and felinetaurs have dual-color versions as subtypes to prevent compatibility issues with custom taurs.
2017-07-13 16:02:02 +03:00
Spades
ddb369d3cd Merge pull request #1849 from kcin2001/master
Teshari cloaks and undersuits
2017-07-12 18:04:29 -04:00
Verkister
1987b57549 Figured out why the saddlebags weren't working on the new taur. 2017-07-13 00:28:54 +03:00
Verkister
7cfdaac3f2 Caught a blooper while checking the diffs. 2017-07-13 00:25:05 +03:00
Verkister
84b994b2d7 Slight charstomization overhauls.
-Lined up and un-overlapped the setup previews. Also taurs can now fit into the frame and not be cropped in half.
-Unlocked the hidden and forgotten feature for secondary tail/taur colors.
-Currently the only enabled things are the colorable wolf tail and a new dual color wolftaur. The framework for more is ready for use though!
-Liberated ear coloring from the oppression of hair color.
-Disabled drake and otie taurs since they lack all gear compatibility :v
2017-07-13 00:20:02 +03:00
Spades
a349e389c2 Update custom_clothes_vr.dm 2017-07-12 13:06:39 -04:00
kcin2001
97a5269bfd Update custom_clothes_vr.dm 2017-07-12 02:04:27 -07:00
Verkister
ea0578c547 More stuff.
-Added one pixel to every wolf taursuit to match them with the earlier body tweak that smoothed out the 90 degree tail snap angle.
-Added a few bootleg raccoon marking bits.
-Ported otie taur by request sure why not.
-Probably forgot to list something here but it's past 3 am and me no feel like braining no more.
2017-07-12 03:23:20 +03:00
Verkister
b1be362c22 A bunch of markings stuff.
-Added a bunch of markings from my older citadel ones.(otie, cow, corvid)
-Ported over the colorable otie wagtail.
-Added ears for otie and cow, colorable and plain versions.
-Ported over my old citadel drake taur.
-Added a fixed _vr version of ponytail 6.
2017-07-12 01:13:15 +03:00
Spades
6434fa862d Update custom_clothes_vr.dm 2017-07-10 22:58:15 -04:00
kcin2001
612b5b94c3 minor changes as requested 2017-07-10 18:56:28 -07:00
Yoshax
ce5a959320 Fixes simple mobs spamming observers with emotes 2017-07-10 18:39:06 +01:00
kcin2001
e706cd80f0 adds a description to the undercoat 2017-07-09 22:18:01 -07:00
kcin2001
5b912bc601 Update loadout_xeno_vr.dm 2017-07-09 22:01:44 -07:00
kcin2001
62ea1866f9 new tesh items - loadout edition 2017-07-09 21:59:47 -07:00
kcin2001
2b6e33df2e new tesh items - code edition 2017-07-09 21:58:04 -07:00
Spades
2b973147d4 Merge pull request #1838 from Verkister/blehh
More borgotool fixes and features.
2017-07-08 23:13:53 -04:00
Spades
b4ece8b5d1 Merge pull request #1843 from killer653/master
Fixes issue preventing cyborgs from being clicked
2017-07-08 23:13:07 -04:00
Cameron653
ee0a4fc58a Update dog_sleeper_vr.dm 2017-07-08 17:25:00 -04:00
Cameron653
00d53bed23 Replaces /red and /blue 2017-07-08 17:14:28 -04:00
killer653
342f426050 Update dog_sleeper_vr.dm 2017-07-08 16:25:25 -04:00
Verkister
024cc65175 irrelevant fluffstuff
-I just happened to feel so extra again and wanted to use my github dog logo somewhere, which happened to become a custom icon for eggnerd robolimb design disk.
2017-07-08 21:05:39 +03:00
Spades
3a3f21c169 Update gaslamp.dm 2017-07-08 11:06:49 -04:00
Verkister
899a081921 exclusions.
These weren't able to stack to begin with and you can no longer make that mistake :v
2017-07-08 17:48:56 +03:00
Verkister
80c12df37c better no caps than One in the middle 2017-07-08 17:42:42 +03:00
Verkister
b5aa8ce1c0 More borgogut features!
-Gurgled items now give charge based on their size/w_class.
-Gurgled storage items now drop their contents to be gurgled next instead of just vanishing with them.
-Gurgled people now drop their items to be gurgled as well.
-Gurgling IDs now gives them the classic gurgle treatment, ruining them instead of deleting.
2017-07-08 16:48:29 +03:00
Verkister
b5f198ba3e whoops pasted in the wrong part lmao 2017-07-08 14:26:51 +03:00
Verkister
d092850ec6 Minor borgotool tweaks.
-Increases lightbulb fabrication cost in janipup lightreplacer.
-Makes the bellymodules use their respective names in the "sleeper unoccupied" UI message.
-Fixes a bug I just found where refreshing via sleeper UI button made a passive trash filled belly disappear.
2017-07-08 14:23:59 +03:00
Spades
b5f86eece2 Merge remote-tracking branch 'refs/remotes/origin/master' into wilderness-additions
# Conflicts:
#	code/modules/mob/living/simple_animal/vore/otie.dm
2017-07-08 01:26:47 -04:00
Spades
19a6895e3c Fixes 2017-07-08 01:24:55 -04:00
Spades
c130fb913e Merge pull request #1834 from VOREStation/wilderness-additions
forgot this
2017-07-07 23:41:14 -04:00
Spades
e19bcef832 forgot this 2017-07-07 23:39:59 -04:00
Verkister
15fe4b7e6b I came up with another name I kinda liked better :v 2017-07-08 01:45:48 +03:00
Verkister
597e2de07c Adds a new neutral metabolism trait.
After consulting people who the hardly noticeable totally optional high-metabolism trait has made suffer, I've decided to add a new one instead for a noticeable arpee fluff one-uppance!
-It's double powerr!
-Gives pred characters an excuse to do their pred things.
-Aimed majorly for arpees as pred/macro/taur characters.
-Not recommended for efficient law-abiding workers or eco-aware NIF users.
-Saves exercise for Sportaflop!
2017-07-08 01:26:54 +03:00