Commit Graph

2511 Commits

Author SHA1 Message Date
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
JoanRisu c4a0a306b1 Thanks, Travis 2016-11-05 07:26:19 -07:00
JoanRisu 25533ab015 Added a bunch of items.
+Adds Octavious suit, coat, cane, bowler hat, and mask
+Adds new .357 flash, rubber, stun ammunition.
~Changes Tasald's .38 SA to .357 SA because the SA code isn't broken anymore. Permit changed to reflect this. Also changes default ammo to rubber.
+Jacob Dragon's Earthen Breath items
~Added the following already in-game items to the spawn list:
+Serkii's bunny slippers
+Killjaden's character Lassara's Knife Harness
+SilverTalismen's character Tasy Ruffle's sexy clown stuff
+Viveret's character Silentio sexy mime stuff

+Added sprites for:
+Zaeperry99's character Lexi's Prayer mat
+Viveret's character We-B's holopen
2016-11-05 07:10:15 -07:00
Spades 18c759259b Merge pull request #680 from VOREStation/microtweak
Fix teshari spawn bug (and lack of dark overlay) and micros(?)
2016-10-23 18:25:03 -04:00
Arokha Sieyes b03ad5892e Try to fix microBgone bug
Hopefully people aren't randomly sent to space anymore?

Also cleaned up old debug code for a bug I fixed
2016-10-22 22:27:45 -04:00
Arokha Sieyes aed841a97d Adds for centcom jobs
... and me ;v
2016-10-22 18:35:13 -04:00
Arokha Sieyes 2dd7369080 Remove trailing slash, update suit name because I can't decide 2016-10-21 16:40:20 -04:00
Arokha Sieyes cfff650f29 More merge conflict fixing that didn't happen before, plus fix rolling down khi jumpsuits, and change my own spacesuit 2016-10-21 00:18:46 -04:00
Arokha Sieyes 7ff0d1e1e5 Merge pull request #668 from VOREStation/issuebreaker
Fix for several issues (455,443,239)
2016-10-20 20:59:29 -04:00
Arokha Sieyes 95a3c14925 This fixes a bunch of things so here's each file change and why:
global_lists_vr.dm - Removes generic 'suit' which included basically any outerwear, and the invisible magical storage/internal
storage/internal.dm - Don't name the storage inside suits the same as the suit. It causes weird name-alignment problems where if you delete the suit it might just delete the internal storage, or the other way around.
Dreaming.dm - Added some vorish stuff I made up.
belly_vr.dm - Fixes for digesting items and how that works, and how to prevent them from showing up on the HUD. Also fixes IDs falling onto the floor (among other things).
living_vr.dm - Just in case, adds null-entry cleanup to belly cleanup proc.
bellymodes_vr.dm - Removes previous null-item hotfix.
vorepanel_vr.dm - Adds zero-width space to make items in belly wrap and not look horrible.
skim.dmf - Adds Y hotkey for whisper, and 6 hotkey for subtle.

Closes #455
Closes #443
Closes #239
2016-10-20 16:34:34 -04:00
Arokha Sieyes 6d533df04f Merge pull request #663 from JoanRisu/Fluff_Items_worshop
Fluff items worshop....5? Sequels are hard.
2016-10-20 12:38:15 -04:00
Arokha Sieyes f4c0239ab5 Further tweak to tempest hud 2016-10-19 20:23:23 -04:00
JoanRisu ae797f1e85 quick hotfix 2016-10-19 17:05:53 -07:00
JoanRisu 1bc67f334b Lots changes. Mostly involves getting the charges for Aro's gun and my Dominator, attempts to fix Molener's items, little typos fixes here and there. Also changes some item sprites. 2016-10-19 17:02:14 -07:00
JoanRisu 60d3b937b9 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop 2016-10-19 14:07:51 -07:00
Arokha Sieyes 3acc33c3a5 Fed and KHI Uniforms/Suits
Adds Joan's Fed overcoats and my KHI uniforms as optional alternate uniforms for departments. Each requires you to be in that department to let you spawn with it.

(The Kitsuhana.dmi change is a change to my own synth sprite to fix a sprite error, unrelated)
(Also updates the sprite in custom_clothes_vr.dmi for an item for Tempest for her medhud)
2016-10-19 15:20:35 -04:00
Arokha Sieyes 285914f1e5 Merge pull request #651 from VOREStation/arofluff
Adds KH life crystal fluff/loadout item
2016-10-14 10:17:51 -04:00
Arokha Sieyes a11d4d202e Small tweak
Just optimized it so it wouldn't stay being processed if the user leaves via elevator/cryo or is admin-deleted.
2016-10-14 02:34:58 -04:00
Arokha Sieyes 00405946a4 Adds KH life crystal fluff/loadout item
It just exists as a fluff excuse as to how you get cloned offsite if you don't get cloned at CC, if you want an alternative. The little lore behind it is that it notifies an offsite agency if you die so you can get cloned by them. It has a little paper in the carrying case explaining that.

It's a uniform accessory, or you can just pocket it. They are unmarked, so finding a broken one shouldn't be very interesting evidence or influence much outside just the fluff idea of their existence.

(Also, it's a crystal, but no it's not magic. The manual goes into detail about the power source, transmitter, etc.)
2016-10-14 01:52:28 -04:00
Spades ab9c5fc67e Merge pull request #642 from Eearslya/fix306-blank-items-hotfix
Hotfix for blank items in bellies
2016-10-13 15:40:06 -04:00
Dhaeleena b9bded2132 Adds Synthetic Zeng-Hu brand Tajaran tail as a custom tail. 2016-10-11 15:28:48 -03:00
Eearslya 1d9954e3cf Prevent pseudo-item-duplication in bellies 2016-10-10 02:03:49 -07:00
Eearslya 0d4686bdbd Hotfix for blank belly items
Fixes #306 (sorta)
2016-10-10 02:03:37 -07:00
Spades 570c2474c3 Fixes w_class of items to be consistent with Polaris update (#636)
* Fixes w_class of items to be consistent with Polaris update

* Typo
2016-10-09 19:23:10 -04:00