Commit Graph

945 Commits

Author SHA1 Message Date
Cadyn 07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Riley ec42a286d0 Clara's Vacuum Flask
Accepted Fluff Request: https://forum.vore-station.net/viewtopic.php?f=26&t=1831

Load out cost is one, the same as a standard vacuum flask, no freebies here!
Big thanks to everyone who put up with my confused screaming, especially Heroman :)
2020-09-29 18:01:07 -04:00
Heroman c9a019ee01 Adds Charles' Tophat 2020-09-28 04:54:23 +10:00
Razgriz 54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
ShadowLarkens bf73137818 Add Shadow Larkens laptop fluff item 2020-09-20 03:35:28 -07:00
Repede 1aed482d7d Fixes some M << to to_chat references. 2020-09-01 23:16:25 -04:00
Braiden eb40f1d483 adjustments and loadout addition 2020-08-29 16:31:04 -05:00
Braiden 3917de9579 kbrid outfit code fixed, now enabled 2020-08-28 16:18:34 -05:00
Braiden 8a7d1265df small adjustment
to my outfit's coverage
2020-08-27 05:32:46 -05:00
Braiden e933dceee8 kbraid outfit (disabled code state)
tried to add my outfit into the code but kept getting the error [code\modules\vore\fluffstuff\custom_clothes_yw.dm:1710:error: hoodtype: undefined var]

the code is in a disabled state so it should not interfere with the game proper.
i would greatly apreciate it if someone could help me troubleshoot.
2020-08-27 05:21:32 -05:00
izac112 48af4c881c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-22 20:07:45 +02:00
David Winters ea551f05f4 Yes 2020-08-17 13:28:54 -04:00
David Winters d97dd42464 Flintlock's jacket 2020-08-17 06:11:58 -04:00
izac112 81871a960e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-08-10 21:50:42 +02:00
Razgriz f00fdebbb9 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into August2020UpstreamPull
August2020UpstreamPull
2020-08-09 02:58:18 -07:00
Repede 74ee6f30f2 new white gearharness and redid yw xion sprites, added new gear harness to loadout for public use 2020-08-07 19:25:27 -04:00
Unknown 9e99e2893a compatibility fix 2020-08-06 15:20:33 -04:00
Unknown 3aae040622 Removes Reagent Implants
As per a decision by staff, all whitelists for Reagent Implants (both milk and egg) have been rescinded, these are to be replaced by a generic 'Feeder' neutral trait that is now available as per this PR.

If you have any questions, concerns, or comments about this PR, it would be far better (for both yourself and my sanity) to direct those to the Head Staff.
2020-08-06 14:52:49 -04:00
Razgriz 5931b867e6 Cybersuit renamed to VR Suit 2020-07-29 17:26:52 -07:00
Razgriz de09ff4e32 Cybersuit example 2020-07-28 17:13:27 -07:00
izac112 7a32077f7b Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2020-07-14 00:21:38 +02:00
izac112 1456af50f7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-07-14 00:21:02 +02:00
SplinterGP b516ac7cb2 K'braid aviation goggles 2020-07-12 22:25:09 -03:00
Razgriz 02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
Verkister 31b4bc1a6a Fixes vr monkeycube boxes getting extra monkeys
Fixes sobaka/saru/sparra/wolpin cube boxes spawning with bonus 4 regular monkeycubes
2020-07-10 11:54:36 +03:00
lukevale 8bebad0ead Jean's chocolate box
Time for her to money shot with dat girl scout chocolates
2020-07-05 09:22:21 -05:00
izac112 4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
knoxon1 2f15905e6e aaa 2020-06-14 22:55:02 -05:00
izac112 be538243c1 various fixes 2020-05-27 22:43:33 +02:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz 3dabdca3f3 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull2-2 2020-05-21 03:20:13 -07:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
Rykka 5c5ac378a4 Port of Hover Inventory and Body Zone Hover Indicators.
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) 
Body Selection parts.

![https://i.imgur.com/KbLqWKy.gif](https://i.imgur.com/KbLqWKy.gif) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Downstream port of https://github.com/VOREStation/VOREStation/pull/7748

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
2020-05-10 08:24:40 -04:00
Rykka dd187c900d Port over Hover Inventory and Body Zone Hover Indicator
The body zone selector now indicates which body part you are about to select when hovered over, and the hover inventory indicator basically shows where you are trying to put an item, and then shows an item ghost in red or green, giving visual feedback as to if that item will go in the slot or not.

Gifs of this in action:
![https://i.imgur.com/MTi7Kpn.gif](https://i.imgur.com/MTi7Kpn.gif) Body Selection parts.

![https://i.imgur.com/KbLqWKy.gifv](https://i.imgur.com/KbLqWKy.gifv) 
Inventory Icon Overlays!

Credit goes to @ShadowLarkens for original port to Paradise and assistance with port to Virgo. Sending to Polaris ASAP.

- A note on `code/game/objects/items/weapons/storage/internal.dm`, VSCode automatically corrected the line endings, hence the massive filediff. The only practical changes are the addition of `disable_warning = 0`
2020-05-10 07:29:53 -04:00
Razgriz 81ad690b89 Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into May2020UpstreamPull 2020-05-06 22:36:01 -07:00
izac112 46973f969a Fixes
Some fixes here and there to make the new vore updates not want to murder us
2020-05-06 22:39:38 +02:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Steven Storesund 868d412d19 Aurora's floof, I mean fluff item 2020-05-03 19:44:13 -05:00
serenekerosene 9394d6561b Update custom_items_vr.dm 2020-04-30 21:39:26 -04:00
serenekerosene b693f8e06c Scylla Fluff Item
I hope I did this right!!!!!!!! TY to Amaya for the guide

Fluff application was approved here: https://forum.vore-station.net/viewtopic.php?f=26&t=1744
2020-04-30 20:24:25 -04:00
Aronai Sieyes 351b3522bd Merge pull request #7534 from VOREStation/aro-moverework
Rewrite client/Move() for smoother movement ingame
2020-04-30 18:03:52 -04:00
Aronai Sieyes 1688e16d88 VS: Get your clicks out of my movement code 2020-04-30 15:41:26 -04:00
H0lySquirr3l 6691339d04 Add files via upload 2020-04-30 09:03:26 -05:00
Novacat 3eaa2ad9fa Lore Overhaul (#7493)
* Lore Overhaul

* Further Updates

* Changes the year

* Reverts unedited files adds Dragor's file

* Fixes compile error

* Spelling error

* Fixfix

* Comma fixes!

* Parenthesis fix

* Removes Virgov references

* Purges remnants of UC

* Recommended Change

* More consistent naming
2020-04-29 19:59:03 -04:00
Amaya 165931c96a aaaaaaaa 2020-04-29 17:10:07 +02:00
Amaya c04d919051 *scream 2020-04-29 17:02:12 +02:00
C.L 3fc0f548f4 Well that was embarrasing
Got rid of "desc =" from the description.
2020-04-26 14:11:35 -04:00
Cameron653 1e29d2a734 Fixes & Changes Silencedmp5a5's fluff items. 2020-04-26 13:59:58 -04:00
Aronai Sieyes efa4f6ca67 Merge pull request #7109 from KillianKirilenko/kk-convkit
Conversion Kit Overhaul
2020-04-19 23:12:32 -04:00