Commit Graph
2725 Commits
Author SHA1 Message Date
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
izac112 578e38108f Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-25 19:31:25 +01:00
KashargulandGitHub 609f6c031a chat Timestamps for TG chat + some fixes (#15770)
* chat Timestamps

* add bundle

* some fixes

* bundle

* some context

* moving healthbar proc to 95%

* more context

* fix Process death type

* healthbar fix

* ye if we want to export it, we should expose it

* char directory follow up

* adds bundles
2024-02-21 17:32:43 +10:00
DrathekandGitHub 7c8bb85de3 Whitespace Standardization [MDB IGNORE] (#15748)
* Update settings

* Whitespace changes

* Comment out merger hooks in gitattributes

Corrupt maps would have to be resolved in repo before hooks could be updated

* Revert "Whitespace changes"

This reverts commit afbdd1d8442973f5d570c30920d9d865b5acd479.

* Whitespace again minus example

* Gitignore example changelog

* Restore changelog merge setting

* Keep older dmi hook attribute until hooks can be updated

* update vscode settings too

* Renormalize remaining

* Revert "Gitignore example changelog"

This reverts commit de22ad375d3ee4d5930c550da2fd23a29a86e616.

* Attempt to normalize example.yml (and another file I guess)

* Try again
2024-02-20 11:28:51 +01:00
izac112 19e46d19b2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-17 01:06:24 +01:00
KashargulandGitHub 59d751a9f9 Round value adjustments for react (#15764)
* input adjustments

* .

* .
2024-02-16 14:18:54 +01:00
Heroman3003andGitHub cc7bf56ae5 Merge pull request #15744 from VOREStation/cleaned-defines
Cleaning up some defines
2024-02-12 06:12:25 +10:00
SatinIsle 1a9a3cafdb Size Toy Fun
This PR adds three new functions to existing size toys:

Added a new variant of the size collar that is created by using a wrench to break the crystal. This prevents the user from changing the size manually, and triggering the collar with a signal flips the wearer back and forth between a random size and their original size.

Added a new verb "Spin Size Dial" to size guns to spin the dial to a random size. Found in the object tab or on right click.

Added an alt-click effect to gradual size guns that toggles a size-trading mode. With this active, when you shrink a target you grow at the same speed, and vice versa.
2024-02-11 19:58:37 +00:00
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
KashargulandGitHub 608c5368ba 4. step 2024-01-29 17:27:39 +01:00
KashargulandGitHub 9bb3608063 filter improvements and oldchat colours 2024-01-29 16:31:36 +01:00
Heroman3003andGitHub 3a0e5879d1 Merge pull request #15711 from Kashargul/typoFix
fixed a typo in the vorebelly strings
2024-01-29 15:25:57 +10:00
KashargulandGitHub c97818206c use the vorgan filter for tg-chat 2024-01-29 00:55:47 +01:00
KashargulandGitHub 691c3ca75f porting healthbars from RS + mat fixes 2024-01-29 00:00:25 +01:00
KashargulandGitHub 6107dfe689 fixed a typo 2024-01-28 14:47:01 +01:00
Heroman3003andGitHub 6d1acf98db Merge pull request #15695 from Kashargul/endOfStaticCol
remove static chat colour tags
2024-01-27 15:47:33 +10:00
izac112 1c2d4da6bd Merge branch 'release' of https://github.com/VOREStation/VOREStation into uppstream-update 2024-01-22 05:18:14 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Repede b3e5e0e544 Adds a neutral trait, the Hydra Trait from Skyrat, allowing someone with a name like Hello-Man-Hatan to show up as one of the 3 names, or reset back to that name. 2024-01-20 19:46:08 -05:00
C.L 17a0e2f3ce Actually why not do it all in one place 2024-01-20 01:45:40 -05:00
C.L 48a68245eb Trash Eater Edit.
Does two things:
1. Allows anyone that has their adminbus var toggled on to eat /everything/ that isn't prefbreaking.

2. Makes it so when trash eater is used, it shows a visible message instead of just showing a message  for a few things.

(The lack of visible messages seems to have been an oversight, as only about 1/4 of the things eatable showed the message and if spam was a concern, someone can just get a metric ton of toys and spam it that way.)
2024-01-20 01:40:46 -05:00
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
KashargulandGitHub 94ade300d3 TG-Chat visual limits and fixes (#15659)
* tg-chat visual limits and export verb

* typo

* fix emotesubtle colour for vchat themes

* optimized archiving, cleanup

* allows to reoder tabs

* export respects filter

* fixes the examine filtering issue

* italic

* dismiss connection warning

* style fix
2024-01-18 23:53:03 +01:00
Eli 92f49ad6c2 Var added to simplemob base 2024-01-10 19:35:27 +11:00
Eli a3626420af Revert "Var added to each simplemob"
This reverts commit 8058c51cef.
2024-01-10 19:34:25 +11:00
izac112 376ce75686 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-01-09 21:28:33 +01:00
Eli 8058c51cef Var added to each simplemob 2024-01-09 10:31:40 +11:00
Eli 9e1b466067 Bug fix + Mob escape default 2024-01-08 20:47:18 +11:00
Eli f72513c2a6 Default changed to 0 2024-01-08 17:28:09 +11:00
KashargulandGitHub a1575f6141 keep var on mob 2024-01-01 06:41:44 +01:00
KashargulandGitHub 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
KashargulandGitHub 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
SelisandGitHub 7ccdbb258f Revert "Revert "12/10/23 - Map swap update" (#15593)" (#15594)
This reverts commit f00d13da66.
2023-12-11 00:22:42 +01:00
SelisandGitHub 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
KashargulandGitHub 78ecb43a44 added all the new options to the reset as well. 2023-12-09 20:23:20 +01:00
KashargulandGitHub 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
KashargulandGitHub 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