Commit Graph

7892 Commits

Author SHA1 Message Date
Spades
00ed0504fb Merge pull request #1886 from Cameron653/ROBOT_VORE
Allows borgs to use custom stomachs
2017-07-26 20:00:35 -04:00
killer653
daaed5921d Fixes conflicts
Fixes conflicts
2017-07-26 00:02:14 -04:00
killer653
4c4c85a742 Fixes Conflicts 2017-07-26 00:00:51 -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
Verkister
10e46d0b88 Merge commit '0a771ee5c1f52f467c1c07e6dc9f1b7404250efa' into blehh
# Conflicts:
#	icons/mob/vore/tails_vr.dmi
2017-07-25 22:05:13 +03:00
Verkister
6522105aa3 Some more stuff.
-Added framework for custom heads using custom eyes without messing the base code.
-Slightly tweaked sergal markings.
-Added new eyes for sergals with little more snout space inbetween.
-Added teshari feathers as markings after failing to fix them for custom species.
2017-07-25 19:27:27 +03:00
killer653
153641cabe Fixes conflict
Fixes conflict
2017-07-25 08:58:36 -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
2a798021dc ...This too 2017-07-21 14:39:56 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
Spades
0415781b54 Merge pull request #1885 from Cameron653/AUTOHISS_TRAITS
Adds autohiss traits.
2017-07-20 21:49:40 -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
e41b29660b proc -> verb 2017-07-20 11:12:47 -04:00
killer653
60e351fb8c Allows borgs to use custom stomachs
Since this is a popular request.
2017-07-20 10:47:53 -04:00
killer653
1c5d88f1fb Adds autohiss traits. 2017-07-20 10:31:39 -04:00
Cameron653
c33a287517 Teshari was duplicated twice here. 2017-07-20 05:04:18 -04:00
Cyantime
875ab81824 Adds object-specific effects for running into them while confused (#1879)
* Adds object-specific effects for running into them while confused.

* How do comments work, we just don't know

* WHAT EVEN ARE COMMENTS
2017-07-19 15:54:41 -04:00
Cyantime
3f48e8ae07 Attempted wilderness performance increase (#1841)
* Attempted wilderness performance increase

* might as well

* Edit comments

* Moves alien change out of polaris file
2017-07-19 15:30:22 -04:00
Spades
5c57eb503d Merge pull request #1856 from Cyantime/emotes
Fixes ghosts being unable to see any emotes
2017-07-19 12:22:54 -04: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
Verkister
8cf204e325 Code snippet part for the zorren markings. 2017-07-17 23:37:16 +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
Verkister
d68dc281b1 borgobrains.
-Borgo gurgles should now pull out posibrains from gurgled folks.
2017-07-16 14:28:18 +03: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
Spades
c49cb95e21 Merge pull request #1832 from Verkister/hunger
Adds a new neutral metabolism trait.
2017-07-14 13:01:12 -04:00
Verkister
7a7ab6484c Done with the tweaks and shit.
-Gurgled items no longer drop their invisible pocket space holder thingies while dumping their contents.
-IDs and probably some other special items shouldn't randomly vanish now.
-Transfering contents from gut to another now also transfers their preserved status and cleans up the list entries from source gut.
-Ejection, single and complete, now properly clears the lists from ejected stuff.
-Some other cleanups yadda yadda.
-Added a commented example part hinting that the system is pretty much ready for a trait based item-weak gurgle option.
-All should be well now unless you try to gurgle a synth expecting a preserved brain on borgo gut right now. I just remembered I forgot to steal the posibrain yankage bits from the voreorgan code. Oh well it's not like you could've done that with the old code either :v
2017-07-14 18:09:48 +03:00
Verkister
d290b849d7 borgo version
should prevent gear dropping off invisible pocket storage holders.
2017-07-14 13:03:02 +03:00
Seigaseiga
40d4e79e7c Fixes the tense of some mob attack text. 2017-07-14 05:19:41 +01:00
Verkister
2d90b73334 That saying about lazy people solving problems
Brb putting this change to voreorgan stuff as well.
Fug these changes are getting a bit too risky big to cram through without testing.
2017-07-14 02:06:31 +03:00
Seigaseiga
1a1ce79805 Update gaslamps to be more endo-vore forward. 2017-07-13 23:21:46 +01:00
Verkister
bad847a937 A slight addition.
Dogborg gurgles should now also dump your jacket/webbing/etc pockets upon gurgles like they do with other storage items.
(On-site edit because too tired for local branch fuckery. Travis can do the testing for now.)
2017-07-14 01:11:16 +03:00
Cyantime
44d7b0ad0f byond is a shit 2017-07-13 03:55:20 -04: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
Verkister
1b7a452625 another attempt 2017-07-11 17:46:36 +03:00
Verkister
8fd6c8ff03 Attempt to fix dogborgs eating their own modules. 2017-07-11 16:44:15 +03:00
Yoshax
ce5a959320 Fixes simple mobs spamming observers with emotes 2017-07-10 18:39:06 +01: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
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