Commit Graph

1634 Commits

Author SHA1 Message Date
Spades
b0a98c173d Merge pull request #829 from VOREStation/verin
Verin Fluff Coat
2017-01-15 14:23:34 -05:00
killer653
6f66241fe5 Better fix proposed by Aronai 2017-01-13 20:32:23 -05:00
Arokha Sieyes
7bb0b8fc5f Verin Fluff Coat
Credit to Yosh for coding and providing the .diff for it. I just added a comment and put in the custom_items.txt change.
2017-01-13 19:53:40 -05:00
killer653
21cb9d3746 Changes it to Aronai's more efficient way 2017-01-13 19:31:24 -05:00
killer653
6728441d5c Prevents accidental stomach flavor text deletion 2017-01-13 19:12:04 -05:00
Cameron653
57469d748b Fixes typos 2017-01-11 13:54:11 -05:00
killer653
6f95e6e6d3 Fixes #813. Credit to Aronai
Fixes #813
2017-01-10 21:30:18 -05:00
BothNevarBackwards
9acfde3a18 Makes teshari use the macro micro pickup mechanic rather than their default sprite and slot use. 2017-01-06 22:56:41 -05:00
Screemonster
74a67c3010 Forgot to remove myself from the whitelist after testing 2017-01-06 10:57:19 +00:00
Screemonster
8733de2583 Adds Miria's ears and tails 2017-01-06 10:52:38 +00:00
Spades
ef8403ac48 Merge pull request #778 from Screemonster/tails
Adds Reika's tail, and a bunch of generics while I'm at it.
2016-12-27 14:37:58 -05:00
Screemonster
a0ccad74f6 Adds demon spadetail, bee wings, colourable variants of bat/succubus wings, and reika's beefox wing/tail combo. 2016-12-27 18:17:19 +00:00
killer653
3c0b93cbfa Fixes compile error 2016-12-27 09:16:46 -05:00
killer653
ff7786ede3 Fixes an accidental overwrite
Someone accidentally defined a custom cane as the normal cane path
2016-12-27 09:11:04 -05:00
Spades
3c0df7dbc0 Merge pull request #759 from JoanRisu/Fluff_Items_worshop
Fluff Items 13: Languages, PDAs, and The G44
2016-12-13 21:52:48 -05:00
killer653
1c3a6db0ef Adds warnings, since I can't figure out a fix. 2016-12-13 16:36:04 -05:00
killer653
652c70f044 One last fix until tomorrow 2016-12-12 22:34:27 -05:00
killer653
379abaa7dc Adds in prey transfer (and a bug)
Adds in prey transfer.

Has a bug in which if the pred deletes their tranfer location stomach,
then the prey will be able to be moved there, trapping them in limbo.

Shouldn't happen often if ever, but I still need to figure out how to
fix it.

Merging this in case anyone has a solution of how to do the sanity
check.

Lines 416-428 in belly_vr.dm
2016-12-12 22:16:33 -05:00
killer653
b02438e191 Solves digestion/absorption not working. 2016-12-12 19:28:02 -05:00
Cameron653
2c234591c8 Clarification and fix 2016-12-12 18:31:42 -05:00
Cameron653
6b90cb2279 Prevents numbers like 999999999999
Rounds then sanitizes them
2016-12-12 17:03:41 -05:00
JoanRisu
22b9c5ad15 Fix box 2016-12-13 06:57:36 +09:00
Cameron653
9f360a65c9 Hope this works
Out of all the things to go wrong, it of course it would have to be this.
2016-12-12 15:55:56 -05:00
Cameron653
a04e7faecf Adds stoamch special interactions 2016-12-12 15:36:35 -05:00
Cameron653
ceb3515fdb Adds vars, adds absorb/digest/escape chances and results. 2016-12-12 15:15:16 -05:00
Cameron653
76144c242d Update vorepanel_vr.dm 2016-12-12 14:40:13 -05:00
Cameron653
d93e15a3f4 Update vorepanel_vr.dm 2016-12-12 14:24:11 -05:00
JoanRisu
59fb1f2e7b Did some more custom PDA adjustments and fixed the g44 stuff. 2016-12-12 22:42:40 +09:00
JoanRisu
6347f2edec Adding the G44 and its energy variant. 2016-12-12 20:18:59 +09:00
JoanRisu
0ecd0a51be Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-12-12 18:37:33 +09:00
JoanRisu
2ca24521d9 fixing PDAs and adding squirrelkin language. 2016-12-12 18:36:12 +09:00
killer653
2e47d44371 Should be the last thing needed to get this to work. 2016-12-11 22:11:36 -05:00
Cameron653
202fbe3889 Update vorepanel_vr.dm 2016-12-11 20:32:43 -05:00
Cameron653
1906cb4e1e Update vorepanel_vr.dm 2016-12-11 20:32:18 -05:00
Spades
246f7eee6a Merge pull request #731 from DarkWolfInsanity/IvyHoloID
IvyMooMoo - HoloID
2016-12-10 01:33:35 -05:00
Cinder
6e72f73f99 Update custom_boxes_vr.dm 2016-12-04 19:25:13 -06:00
Spades
22006dc34f Merge pull request #733 from Screemonster/feralmonsterness
Xenochimera bugfix and feralness overhaul
2016-12-04 13:45:37 -05:00
killer653
f79da03905 Minor text fixes 2016-12-02 17:43:42 -05:00
killer653
81687384cf Makes it so mobs aren't given reagent lists.
Should fix #732

This time put on the correct account for testing
2016-12-02 16:34:15 -05:00
Screemonster
d6a0f858c0 Makes xenochimera go feral in response to pain 2016-12-01 23:28:42 +00:00
Cinder
d39e075610 Update custom_items_vr.dm 2016-11-30 19:05:35 -06:00
Cinder
6fa444c289 Added IvyMooMoo's HoloID / a kit so it spawns
Kit includes:
-Ivy's HoloID
-A Vanilla Cake
-A Box of Cigarettes
-A Box of Matches
-A White Beret
2016-11-30 02:36:13 -06:00
Spades
1c4a0cefc9 Merge pull request #715 from VOREStation/screepr
Fix Scree's fluff item issue
2016-11-09 15:19:56 -05:00
Arokha Sieyes
78014b957c Merge pull request #709 from Cameron653/master
Enables SilencedMP5A5's custom items. Taursuit bugfix.
2016-11-09 12:29:04 -05:00
Arokha Sieyes
8060a265da Fix Scree's fluff item issue
I couldn't update his PR so I did my own. It turns out that the if(..()) thing is how all the other can_mob_equip things handle their calls to ..() so we'll just do that too. Also I named my things backwards, derp.
2016-11-09 12:22:59 -05:00
Cameron653
371be00963 Update custom_items_vr.dm 2016-11-08 14:11:19 -05:00
Cameron653
cbec44928b Fixes all the problems. Hopefully ..() works
Going to test this real quick
2016-11-08 14:08:02 -05:00
Cameron653
f2bb3989d5 Adds 2016-11-07 20:35:04 -05:00
Screemonster
14f64dd876 Custom items for Jemli 2016-11-07 03:57:21 +00:00
Cameron653
76e798cddc Update custom_items_vr.dm 2016-11-06 21:29:58 -05:00