Commit Graph

27593 Commits

Author SHA1 Message Date
killer653
9a6a454a64 Unused 2017-07-28 06:45:33 -04:00
killer653
4fcbbe40f1 Size changes. 2017-07-28 06:43:44 -04:00
Spades
c4da9a69a1 Merge pull request #1908 from HawkerTheGreat/master
Vox Phoron Tank Sprites Additions
2017-07-26 20:12:04 -04:00
Spades
e173da0603 Merge pull request #1902 from DarkWolfInsanity/IvyIDFix
Ivy Baladeva ID Fix
2017-07-26 20:11:24 -04:00
Spades
bc669400b4 Merge pull request #1909 from Cameron653/DEBUG
Changes quick_nif proc from R_FUN to R_ADMIN
2017-07-26 20:00:55 -04:00
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
c7931e618d Changes QUICK_NIF required perms 2017-07-26 19:00:36 -04:00
HawkerTheGreat
7695e45e3a Path Fix
Last Issue, I swear to god, I will get sleep tonight.
2017-07-26 03:56:48 -05:00
HawkerTheGreat
a52af2947e Vox Phoron Tank Sprites Suddenly Missing 2017-07-26 03:33:02 -05: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
Cyantime
71112430e9 Workaround for struggle transfers 2017-07-25 16:01:09 -04:00
Verkister
3d7759ae7c Remade the file that got lost during the explosive github shenanigans.
-Also tweaked the sergal face marking ever so slightly idk.
2017-07-25 22:30:58 +03: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
Cinder
57efcfe8dc Ivy ID Fix
Forgot the bag. oops
2017-07-25 10:21:25 -05:00
killer653
153641cabe Fixes conflict
Fixes conflict
2017-07-25 08:58:36 -04:00
killer653
5b2f2f811c Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NATJE_CUSTOM_FLUFF 2017-07-25 08:51:43 -04:00
Verkister
3aebfd9a92 Un-conflicts fennix tail. 2017-07-25 11:52:17 +03:00
Spades
b4e00bb5c4 Merge pull request #1896 from Cameron653/ROIZ_TEST
Adds Roiz's custom dino coat.
2017-07-25 02:34:35 -04:00
Spades
f2b131013e Merge pull request #1894 from Cameron653/NUMB_GURGLES
Makes everyone have numbing gurgles by default.
2017-07-25 02:34:22 -04:00
Spades
0a771ee5c1 Merge pull request #1893 from Cameron653/KETRAI_TAIL
Add's fennix tail for everyone to use.
2017-07-25 02:34:11 -04:00
Cinder
5e6a8fb4a0 Fixes Ivy Baladeva's ID issues
Instead of making a new ID that doesn't get her access rights, make a reprinter instead that just changes the icon and description
2017-07-25 00:04:24 -05:00
Cyantime
969a10a5ba Removes hard z-level checks from camera consoles 2017-07-24 21:29:10 -04:00
Cameron653
cae3af822d Update sprite_accessories_vr.dm 2017-07-24 14:33:47 -04:00
Cameron653
a5d54f1bac Removes whitespace. 2017-07-23 19:11:56 -04:00
killer653
3a5da61430 Adds Roiz's custom coat 2017-07-23 16:23:32 -04:00
killer653
fba42884be Quick design datum fix 2017-07-23 14:53:47 -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
a516a0d041 Adds L and R hand sprites 2017-07-23 10:47:26 -04:00
killer653
9acf4f0b6d Adds Ketrai's custom fennix tail
https://forum.vore-station.net/viewtopic.php?f=26&t=956&p=6110&hilit=ketrai#p6110
2017-07-23 10:37:43 -04:00
Cameron653
2a798021dc ...This too 2017-07-21 14:39:56 -04:00
Cameron653
02ce817c44 This almost passed me by. 2017-07-21 14:39:09 -04:00
killer653
016337ee4d Quick, small fix. 2017-07-21 04:02:49 -04:00
killer653
8fbf7fc176 Adds Natje's fluff items 2017-07-21 03:02:52 -04:00
killer653
4d45cc28c3 Merge remote-tracking branch 'refs/remotes/VOREStation/master' into NATJE_CUSTOM_FLUFF 2017-07-21 03:02:39 -04:00
Leshana
ae38fb3c48 Disable all shell() exec prox for extra security.
We do not use python or nodejs scripts. Our discord bot makes HTTP
requests.  Therefore we can entirely disable this code.  Even if we ever
want to start using these procs for discord integration, we would pipe it
through our HTTP discord proxy, not use shell().
With all instances of shell() disabled, we can't be attacked by it.
2017-07-20 22:24:27 -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
killer653
44a2619693 Adds their custom taur 2017-07-20 06:15:47 -04:00
Cameron653
c33a287517 Teshari was duplicated twice here. 2017-07-20 05:04:18 -04:00
Spades
bf34eaef5a Merge pull request #1869 from Cameron6531/master
Micro step code changes.
2017-07-20 00:45:13 -04:00
Spades
079fe0a0fb Merge pull request #1878 from Verkister/patch-1
FIXES THE CATWALK INVENTORY BS
2017-07-20 00:44:26 -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
Cameron653
97e851f2e4 Adds in body snatcher device (#1822)
* Adds in body snatcher

* Modifies method the bodysnatcher works

* Fixes merge & compile error

* Update trash_pile.dm

* Update trash_pile.dm

* Gets transfer_to to work
2017-07-19 15:26:34 -04:00