Commit Graph

2696 Commits

Author SHA1 Message Date
izac112 376ce75686 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-09 21:28:33 +01:00
Kashargul a1575f6141 keep var on mob 2024-01-01 06:41:44 +01:00
Kashargul d4af0f059b temp disable warnings 2024-01-01 06:30:55 +01:00
Repede b927dd1d83 Adds a bird taur sprite named Azrien, offered as public use by pinkkirby 2023-12-31 13:30:36 -05:00
izac112 2fdeac8c38 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-28 09:22:14 +01:00
Kashargul 4ce06ee440 fixes and filters (#15626)
* fixes and filters

* remove the missed closing spans

* bundle added

* we also store empty hihglighting

* change the blacklist handling

* fix custom links in examine

* regenerate bundle

* automatic URL parsing for OOC/LOOC
2023-12-21 00:30:12 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Selis 7ccdbb258f Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)
This reverts commit f00d13da66.
2023-12-11 00:22:42 +01:00
Selis f00d13da66 Revert "12/10/23 - Map swap update" (#15593) 2023-12-10 23:37:45 +01:00
Selis 74e5c1fe89 Contents of #15586 2023-12-10 00:27:29 +01:00
Kashargul 78ecb43a44 added all the new options to the reset as well. 2023-12-09 20:23:20 +01:00
Kashargul 4ce07703e3 a few fixes with misplaced ', a swapped string and we are regex replacing now to make linter happy. 2023-12-03 21:39:07 +01:00
Kashargul f6a9a87450 Vorepanel Escape/Struggle customization
VChat Vore Message Filter
2023-12-03 19:59:43 +01:00
izac112 5052f6f672 Merge branch 'release' of https://github.com/VOREStation/VOREStation; branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore into izac 2023-11-28 16:48:53 +01:00
DESKTOP-4BUBN9N\Mike ccc4752611 Makes absorbs escapable 2023-11-19 14:50:22 +00:00
Killian 8b69e10edb scaling center up-port 2023-11-13 21:23:41 +00:00
SatinIsle 1a74cf8e69 Respects fancy sounds 2023-11-03 10:41:22 +00:00
SatinIsle 105b8a2d1a Adds digestion sound to the process option
Added a digestion sound that plays when a predator uses the "process > digest" option on their prey.

Ported from: CHOMPStation2/CHOMPStation2#7158
2023-11-02 14:08:39 +00:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
VerySoft 8f04cb0228 VerySoft Fluff Item!
Adds big round glasses, and adjusts the entries for the ITG id fluff items so they aren't tied to a specific character, since I have the same thing on multiple characters.

As part of this I made it so that glasses can appear above hair and things if they have the appropriate var set. (Otherwise glasses sprites mostly get covered up by any hair that gets near your eyes). All the other glasses behave the old way, but this should allow people to make some glasses appear above hair and things if they want to in the future.
2023-10-24 14:48:25 -04:00
SatinIsle 88e24bcc31 Changes the conditions to be a single message instead.
I'm not sure if it's really any better, but I think it's more easily modified if people want to add more. Gets a little clunky if they're also sleeping, but that's a fringe case and just means a bit of a run on sentence.
2023-10-15 10:08:36 +01:00
SatinIsle 9d3c6e9258 Vore Panel Health Check
Added a new option to humanoid mobs in vore belly contents: Health Check.

Using this on a mob in your belly returns a very simple readout of their health as a percentage. It also gives notice when they are weakened, paralysed, blinded or sleeping, so that the pred can know whether or not they'll be able to emote/hear emotes.
2023-10-13 11:35:55 +01:00
Heroman3003 241a40af3d Merge pull request #15425 from ReoDaProtovali/Borg-belly-naming-change
Borg belly overlays can be supported by both sleepers and vore panel bellies
2023-10-03 05:06:48 +10:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
ReoDaProtovali 8e24048551 Vore panel adjustments and fixes
Adjusts the vore panel's contents to reflect the new system
2023-09-28 04:13:59 -05:00
Heroman3003 6e5c9c561d Merge pull request #15406 from Heroman3003/test-vore-setup
Attempts implementation of char setup vore panel
2023-09-24 15:54:33 +10:00
SatinIsle d8ef4a89be Moved size wand to combined file 2023-09-23 01:32:46 +01:00
SatinIsle 0c39b8b7d8 Fantasy redgate map
Added a new fantasy redgate map that consists of a fantasy town and a large dungeon beneath it.

Added a selection of fantasy props.

Added a variety of "magic" resprites of existing items. These are intended to be tech disguised as magic and have descriptions to hint at it, along with some papers on the map.

Added an alchemy system that creates potions in an alembic out of an ingredient and a base. If the ingredient and base match, an interesting potion is created, if they don't, a poor quality potion is created.

Added a new reagent that polymorphs the drinker into a random creature.

Added a chest version of crates.

Added wooden wall lockers.

Added random spawners for fantasy items, potions, ingredients and bases for mapping.

Added hedge and wooden fences.

Added an old fashioned resprite of the oven.

Added a cooking pot resprite of the microwave.

Added wall torches.

Added barrel version of water tanks, beer tanks, wine tanks, blood tanks and a kettle resprite of a coffee dispenser.

Added a wooden tub bath.

Added 19 new vore mobs: 2 Catslugs, 6 succubi, 1 cryptdrake, 4 vampires 5 peasants and a bat.
2023-09-22 21:44:22 +01:00
Heroman 2c5c0b3d6a Attempts implementation of char setup vore panel 2023-09-21 06:10:18 +10:00
VerySoft b4922aedc9 Remove all mention of nazis from code
Also removes some old lore references from the listening post
2023-09-14 17:43:57 -04:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman 71e124718e Adds food vore 2023-08-22 20:12:24 +10:00
Heroman3003 963f2e06aa Merge pull request #15272 from Very-Soft/oocnotes
Revise OOC notes panel
2023-08-18 06:27:15 +10:00
VerySoft 90981fa620 Revise OOC notes panel
Revises the OOC notes panel a bit, and removes the OOC notes panel from character setup, in favor of just adding buttons to set the likes and dislikes there, rather than maintaining two different versions of the panel.

Additionally, adds a 'print to chat' button to the panel, and to examine for the OOC notes.

Changes the way the window is sent to the client so that it behaves more like character setup. This should mitigate edge cases where the panel appears off screen when SS13 is not being displayed on the primary monitor. It SHOULD also remember its position between sessions. Either way it should stay on your screen now.

Also, for the print to chat, character directory, and any OOC notes panel that isn't yours, the LIKES and DISLIKES sections will show up conditionally depending on if they are actually set up. If there's nothing there, then they won't show up.

This is presently an imperfect revision, as it only allows you to have one OOC notes panel open at a time. I would like you to be able to have more than one at a time, while also having the features to allow it to always appear on the screen, however, that will take some extra development time.

Apart from that, this is fully functional.
2023-08-16 05:44:59 -04:00
Heroman3003 39e4da338e Merge pull request #15243 from Heroman3003/new-belly-fullscreens
Adds a few more belly fullscreens
2023-08-14 04:14:10 +10:00
Heroman efccfff71f Adds a few more belly fullscreens 2023-08-13 08:48:43 +10:00
Heroman 1ef8547f4d Minor fixes to belly fullscreens 2023-08-13 07:48:11 +10:00
VerySoft 4811dfbe6e Custom Link!
Allows one to set a custom link to show up in their examine text!

One thing people used the OOC notes for was to post image/flist links in the chat and get clickable links!

Since the OOC panel is a thing now, I thought it would be good to enshrine that function into something that's specifically for it.

This allows you to enter an extra 100 character string underneath your flavortext in your examine text, which can technically be anything, but it's intended to be space for links to show up and be clickable!
2023-08-11 05:04:33 -04:00
Casey 84d239d6ed Merge pull request #15229 from Very-Soft/oocnotes
OOC notes panel
2023-08-11 03:57:20 -04:00
VerySoft fdab4990ce OOC notes panel 2023-08-11 02:10:38 -04:00
Heroman 8316351409 More borg fixes post-testing 2023-08-10 14:16:49 +10:00
Heroman bd00a57b4c Merging modules - Surgery 2023-08-09 08:05:02 +10:00
Heroman3003 93082debc0 Merge branch 'master' into dogborg-end 2023-08-07 20:05:05 +10:00
Heroman 67b14352af Borg module consolidation - initial commit 2023-08-06 20:55:34 +10:00
VerySoft 482e03e664 648 2023-08-03 06:48:32 -04:00
VerySoft 79df8c2024 we need to think about peeb 2023-07-24 20:17:41 -04:00
SatinIsle 0f10805f0a Parriz fluff item and hair
Adds Parriz's fluff item, and also adds a longer version of the twin drill hair called Twin Drills Long, which anyone can use.
2023-07-19 15:58:25 +01:00
Heroman 3b40b37f9c Fluff updates 2023-07-18 15:10:43 +10:00
VerySoft 29b9c53028 Adjust bow!
Now if someone picks up dessa's bow it will use the normal sprite instead of dessa's special sprite
2023-07-15 15:46:47 -04:00
VerySoft ab74b5e5b5 Giant bow
It's a giant bow, you can equip it on your head or on your ear

I made this mostly as a fluff item for me, because of my character's ears, but I included a public version that anyone can use!
2023-07-15 14:43:02 -04:00