Commit Graph

1983 Commits

Author SHA1 Message Date
Razgriz
02421b075e Merge branch 'master' of https://github.com/Yawn-Wider/YWPolarisVore into July2020UpstreamPull 2020-07-12 16:14:45 -07:00
SplinterGP
d01a0d207a Merge remote-tracking branch 'Yawn-wider/master' into holdelta 2020-07-06 17:25:42 -03:00
SplinterGP
a056658ef6 Tesh fluffies 2020-07-06 16:58:15 -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
lukevale
4c9cd195e4 Adds in cyber dragon wings. 2020-07-05 02:40:55 -05:00
izac112
22880f526d Voreupdate 2020-07-02 15:39:00 +02:00
KasparoVy
44dbef245c Add a Couple Nevrean Tails, Remove Duplicate
Adds a couple dual-colour Nevrean tails.

Also WTF is up with the extremely colourful monkey tail
2020-06-19 02:54:55 -04:00
izac112
4864ad384d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-17 04:30:06 +02:00
Aronai Sieyes
652a0c5b1c Merge pull request #8284 from Novacat/nova-basicfixes
Reduces Default (and mob) digestion rate
2020-06-15 11:37:09 -04:00
Unknown
1b8409beda Reduces Default (and mob) digestion rate
from 2/2 to 0.5/0.5

Due to a discussion in exploration, and the preferences stated by a headmin.
2020-06-15 01:20:51 -04:00
knoxon1
2f15905e6e aaa 2020-06-14 22:55:02 -05:00
Repede
d0d7685e4f Removes all restrictions on tail / ears / etc selection, no ckey locks or species lock.
People should be able to play whatever they want.
2020-06-13 17:55:36 -04:00
izac112
7ad2832f14 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-08 21:49:14 +02:00
Natje0
982850cb71 Tentacles 2020-06-06 12:42:03 +02:00
izac112
79abbcbc2f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-06-03 18:30:13 +02:00
Heroman
5fd9552e8a Adds mermaid tails taur option 2020-06-02 06:42:38 +10:00
Natje0
c882cd57ca add tentacle 2020-05-31 01:43:17 +02:00
izac112
be538243c1 various fixes 2020-05-27 22:43:33 +02:00
izac112
e807b80281 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-05-27 20:10:55 +02:00
Aronai Sieyes
0ee3fae14d Merge pull request #8029 from KasparoVy/a-well-cooked-meal
Refactors Ore Eating to Allow the Consumption of Material Sheets
2020-05-22 16:27:15 -04:00
KasparoVy
fd665ed938 Amend Nomenclature for Clarity & Consistency
Opted to leave the trait datum type and name for the sake of reference & mild humour.
2020-05-22 12:12:32 -04:00
KasparoVy
1a5bdf4e98 Refactors Ore Eating to Allow the Consumption of Material Sheets
Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
2020-05-22 03:55:04 -04:00
Verkister
474455140f Fixes micro holder hug spam.
This is why we can't have nice things.
2020-05-22 03:44:02 +03:00
Aronai Sieyes
6cc7245329 Copy "general" flavortext from character setup to AI hologram 2020-05-21 15:19:02 -04:00
izac112
e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Razgriz
e4c54a5e4c Update living_ch.dm 2020-05-21 04:10:53 -07: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
4d254bb8fc Fix protean deaths 2020-05-20 13:54:55 -04:00
Aronai Sieyes
09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Repede
3f4f33bbd8 Merge branch 'release' of https://github.com/VOREStation/VOREStation into morevoreupdates
# Conflicts:
#	code/modules/mob/living/carbon/human/emote_vr.dm
2020-05-18 20:30:52 -04:00
Aronai Sieyes
48563200ce VS: Tweak some icon blending 2020-05-18 13:42:42 -04:00
izac112
a964a3a1bc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 23:26:52 +02:00
izac112
bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
KasparoVy
67ce8f383c Adds Equine Facial Markings & Ears
I was poring over the markings list as usual, inspired this time to draft a donkey but was woefully struck by a lack of equine markings. Neigh, this cannot be! So I took to resolving the issue post-haste.

The muzzle is flexible goes quite well with draconic designs too. Recommended to use with the Sergal bodytype for best results.
2020-05-16 02:35:06 -04:00
ShadowLarkens
f905cfc020 Ported /tg/ style screen alerts, replacing the hunger icon with them
This adds throw_alert() and /obj/screen/alert, a system that allows you
to do custom hud alerts for any variety of things from "You're too
cold!" to mecha status indicators for the pilot.

There's quite a few things that actually got replaced; the
fire/oxy/tox/co2 alerts are all now just alerts, as is nutrition. The
xenochimera feral indicator would probably be a good candidate for
conversion, but I didn't touch it in this PR. There's also a number of
new alerts, such as blindness, highness, legcuffed, buckled, handcuffed,
and probably some more I missed; read code/_onclick/hud/alert.dm and see
for yourself!

Additionally, a number of tweaks have been done to resisting code, to
make it so that there's an indicator when you're buckled or handcuffed,
and can just click the alert to start resisting. This includes a
refactor that combines the logic for lockers, holders, micros
escaping from shoes, and struggling in a gut all into one proc, called
container_resist(). This means that vore bellies actually no longer need
the resist override, but it's been left in place just in case someone
finds something else they want to use it for.

Also, the health and internals indicator got moved down one tile each.
Needed room for the alerts. If we add the oxygen tank action buttons
from /tg/ and remove the internals indicator, the health indicator can
go back where it was originally.
2020-05-13 19:36:01 -07:00
izac112
bba0a05f5f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-13 10:21:49 +02:00
Aronai Sieyes
0327a2d186 Reduce admin log spam 2020-05-12 17:08:41 -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
Aronai Sieyes
d1e7821b15 VS: Language issues
These issues don't prevent compiling, but are strange issues nonetheless.
2020-05-09 16:53:59 -04:00
Nepox
942054ad66 I dont want to do this anymore
Please
2020-05-07 23:27:48 +02:00
Nepox
3755762277 Fixes Rosey's pentatail
Attempt 2: Electric Bogaloo. This time hopefully without undoing newer changes. 

Tail is now colorable. I hope.
2020-05-07 22:40:58 +02: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
Aronai Sieyes
dd697a2375 Don't step on people who are riding you 2020-05-06 11:25:53 -04:00
Aronai Sieyes
3a587e34da Fixes vore panel reload cancel
Fixes https://github.com/VOREStation/VOREStation/issues/7665
2020-05-05 22:44:26 -04:00
Aronai Sieyes
3c66e23442 Merge pull request #7631 from VOREStation/aro-fix7601
Fixes #7601
2020-05-04 21:04:50 -04:00
Aronai Sieyes
ff5bf6569e Merge pull request #7552 from ShadowLarkens/vore_refactor_mk2
Vore refactor V2
2020-05-04 21:04:20 -04:00