Commit Graph

1634 Commits

Author SHA1 Message Date
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
Eearslya Sleiarion
868413c880 Polaris Sync October 9th (#633) 2016-10-09 18:55:29 -04:00
Spades
05869b0d9b Zoo.dmm added, Vault updated, various bugfixes (#634)
* :(

* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.

Need this for a map I wanna do.

* need sleep

* Emergency meds added

Resolves https://github.com/VOREStation/VOREStation/issues/600

* Fixes Fax Machine showing Sif Government

* Updates Tajaran lore to match Polaris.

* Sleeping for tonight

* Fixes #623

* Added more to the map

* Fox sprites from Paradise added

* Vore bee added

* Technical stuff no one cares about.

* Another update

* Reverts Pull #508

https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.

* Sergaling are now Saru.

* Saru

* Zoo map update, near completion

* Zoo map finished, plus Station Vault updated

* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."

This reverts commit 59e2bb2117.

* Buzz off, Travis.

* Removed microwaves entirely so Travis stops bitching

* Travis stop being dumb

* Fix the zoo map once and for all..?

* Removes backup files.
2016-10-09 18:55:17 -04:00
JoanRisu
348ec23b40 Clothes edit 2016-10-02 18:08:11 -07:00
Eearslya Sleiarion
6a0c360c87 Fix micro vore spacing prey (#615) 2016-10-01 13:25:52 -04:00
Spades
406d30b2c3 Reverts digestion damage (#612)
To values prior to https://github.com/VOREStation/VOREStation/pull/508
2016-10-01 03:39:20 -04:00
Cameron653
56112df791 Adds tailmaw and feline taur half (#609) 2016-10-01 02:25:06 -04:00
Eearslya Sleiarion
50eb3cd6ac Mice can no longer eat non-players (or ghosted players) (#607) 2016-10-01 02:24:42 -04:00
Cameron653
900dde68a9 Adds in security wolf-taur suit and a custom item (#599)
* Adds in security wolf-taur suit and custom item

* Adds in helmet sprite
2016-09-27 01:08:31 -04:00
Eearslya Sleiarion
30c9cc8326 Animals can no longer eat people when dead (#594) 2016-09-25 18:44:39 -04:00
Eearslya Sleiarion
c5ac34ec55 release_all_contents now cancels if belly is empty (#592) 2016-09-25 18:44:20 -04:00
Eearslya Sleiarion
6708a5f6bd Fix nested digestion to move mobs/items up a belly when dead (#584) 2016-09-24 14:13:26 -04:00
Spades
92ff62c95c Moved files to a place they make sense (#575) 2016-09-20 18:46:17 -04:00
Spades
e8b112fdc1 Contraband Update (#564) 2016-09-18 23:17:55 -04:00
Eearslya Sleiarion
99367b38eb Cyborgs can no longer use OOC resize (#566) 2016-09-18 22:56:05 -04:00
JoanRisu
342a8d04c7 Adjusting some fluff items and adding in the security train for testing and further coding. (#560) 2016-09-17 23:38:45 -04:00
Screemonster
5da42df24c Adds Citadel's red panda tail, also a colourable version. Also adds Holly's ears and tail for hoodoo, Adds silvertalismen to the list of people who can use deathclaw accessories as per the recent app, and fixes some out-of-place pixels on the screesuit just as long as I'm messing with sprites. 2016-08-27 03:41:11 +01:00
Spades
e6f6a0258d Map sync, allows vore mobs to stun (#508)
* Map sync

Resolves #331

* Digestion change

Digestion now dumps nutrition on finishing digestion rather than during
digestion. This makes more sense and allows more flexibility for future
updates.

Vore mobs can now knock down people when attacking.

* Reduced mob swallowing time from 10 to 3.

* Changes Captain role in anticipation for future Polaris update I don't like.

Captain or Overseer. Not "Station Administrator." That's a tiresome
mouthful and confusing.

* Map fix
2016-08-23 02:14:14 -04:00
Screemonster
10dd1ef835 Fixes path for fluff hoscoats. 2016-08-21 13:15:15 +01:00
Screemonster
52e0af5255 Fixes the pompom so it actually lights up and has its hudbutton back. Also fixes a spelling error in the spacesuit. 2016-08-21 04:36:27 +01:00
killer653
d1afae6d06 Polaris Sync & bugfix
- Polaris Sync
- Fixes bug being unable to pick up micros
- Fixes all conflicts that came with sync
2016-08-17 22:02:05 -04:00
Cameron653
2bb1729c08 Update living_vr.dm 2016-08-17 17:53:01 -04:00
killer653
ad6c4fcddb Adds in unabsorb mode. 2016-08-15 11:15:06 -04:00
killer653
876ca6174a Fixes #469
Fixes  #469
2016-08-15 11:08:00 -04:00
Cameron653
7f88ef6b25 Multiple bugfixes (#477)
* Allows ID's to be worn in ears

* Fixes being unable to pick up micros

* Fixes a stomach problem

Examine text wasn't showing from 850 1199
2016-08-14 22:00:54 -04:00
Cameron653
b3b0ae6660 Xenochimera revamp & bugfixes (#465)
* Revamps xenochimeras, allows more than 1

* No hallucinations while lying down

* Edits

* Makes you lose hallucination faster

* Prevents infinite hallucinations

* Forgot to put in two = signs
2016-08-12 04:36:15 -04:00
killer653
4b13870f82 EVEN MORE TF RELATED BUGFIXES 2016-08-01 01:38:51 -04:00
Cameron653
4dad3d93ea Update bellymodes_vr.dm 2016-07-31 21:02:10 -04:00