cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 03:57:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
67,344 Commits 9 Branches 26 Tags
7c8bb85de3ea757ea54840c24638cc271969aaff
Commit Graph
67344 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 afbdd1d844.

* 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 de22ad375d.

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

* Try again
 2024-02-20 11:28:51 +01:00
CaseyandGitHub 3b61f677b3 Merge pull request #15775 from VOREStation/Map-swap 
Map swap
 2024-02-18 14:25:54 -05:00
CaseyandGitHub 1699f0f00c Map swap 2024-02-18 13:31:53 -05:00
Heroman3003andGitHub 01a117e2c3 Merge pull request #15773 from KillianKirilenko/kk-mini1 
PDA model names
 2024-02-18 16:58:12 +10:00
Killian 5efba60ed7 pda model names 2024-02-17 22:14:55 +00:00
KashargulandGitHub 75555bd53f hotfixing VV edit (#15772) 2024-02-17 01:58:31 +01:00
SelisandGitHub 76622ea3a3 yarn.lock update (#15769) 2024-02-16 19:44:05 +01:00
KashargulandGitHub bb1343e63d restrictedInput fix (#15768) 
* restrictedInput fix

* adds bundle
 2024-02-16 14:28:42 +01:00
KashargulandGitHub 59d751a9f9 Round value adjustments for react (#15764) 
* input adjustments

* .

* .
 2024-02-16 14:18:54 +01:00
KashargulandGitHub 04c57ff76a another form (#15766) 2024-02-16 12:09:18 +01:00
KashargulandGitHub c9c281f8d7 accidental resets (#15767) 2024-02-16 12:00:56 +01:00
KashargulandGitHub 856b62a292 porting the notification hiding from TG (#15763) 2024-02-13 16:39:19 +01:00
Heroman3003andGitHub dff69cbb17 Merge pull request #15759 from VOREStation/tgui_fix_2 
Some input updates
 2024-02-13 18:42:26 +10:00
Selis 9b1d05b887 CSS 2024-02-12 23:34:54 +01:00
Selis b8125f5bf1 Section update 2024-02-12 23:33:37 +01:00
Selis 157ff3df1f Number modal 2024-02-12 23:33:37 +01:00
Selis 2fdb69ab5c Some input updates 2024-02-12 23:33:37 +01:00
KashargulandGitHub b5570de419 defaults vchat color to white (#15758) 2024-02-12 20:52:45 +01:00
KashargulandGitHub fc91ae0f0b formatting tgui files (#15754) 
* formatting

* small chat setting adjustment
 2024-02-12 15:14:10 +01:00
SelisandGitHub 66d4b40e9d Fixed CharacterDirectory (#15757) 2024-02-12 14:17:31 +01:00
Heroman3003andGitHub cc7bf56ae5 Merge pull request #15744 from VOREStation/cleaned-defines 
Cleaning up some defines
 2024-02-12 06:12:25 +10:00
Heroman3003andGitHub 014a095fe4 Merge pull request #15753 from SatinIsle/random-sizechangers 
Size Toy Fun
 2024-02-12 06:12:02 +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
CaseyandGitHub 315406353d Merge pull request #15751 from VOREStation/Map-swap 
Map swap
 2024-02-11 14:38:00 -05:00
CaseyandGitHub 35492428c8 Map swap 2024-02-11 14:32:02 -05:00
KashargulandGitHub 16fd2d94a0 more filter and borg admin stuff (#15745) 
* more filter and borg admin stuff

* analyzer fix

* .

* vchatdark css fix
 2024-02-11 16:54:14 +01:00
Heroman3003andGitHub 2887d7f72d Merge pull request #15750 from Heroman3003/jokehammer 
Adds the Short Stacker
 2024-02-11 19:21:44 +10:00
Heroman 55fe8e1657 Adds the Short Stacker 2024-02-11 19:08:49 +10:00
Heroman3003andGitHub 011f8c10e9 Merge pull request #15742 from SatinIsle/It's-orca-to-be-different 
Fluff item for grallstonefist
 2024-02-11 04:01:39 +10:00
SelisandGitHub 96ba92c6cb Some Inferno state deprecation (#15743) 
* Deprecation of some of the old state hooks

* Component updates
 2024-02-10 18:11:00 +01:00
Selis d99321bfdf Cleaning up defines 2024-02-10 16:44:44 +01:00
KashargulandGitHub 3234f82ef6 TG-Chat log limits (#15731) 
* log limits

* logging filter

* bundle

* small style change
 2024-02-10 15:32:27 +01:00
SatinIsle 871d1ebe3f Fluff item for grallstonefist 
Approved here: https://forum.vore-station.net/viewtopic.php?f=27&t=2397
 2024-02-10 11:39:50 +00:00
Heroman3003andGitHub e77a652a92 Merge pull request #15738 from Runa-Dacino/PDAthing 
Adds a new tool for GMs to create props for events in form of fake PDA conversation logs
 2024-02-10 19:34:19 +10:00
KashargulandGitHub 269f2143fc Tgui hotfix + more borg handling (#15740) 
* style fix

* bundle + some borg handling

* borg stuff
 2024-02-10 02:09:17 +01:00
Runa DacinoandGitHub 5780dc85f2 Merge branch 'master' into PDAthing 2024-02-08 16:14:43 +01:00
Runa Dacino e3f3e416b8 adds: gm tool for creating prop pdas convo for events 
* Creates new proc in pda/messenger.dm to handle fake conversation creation
* Creates new eventkit datum and holder var on client for remembering identitities
* Creates new proc as eventkit R_FUN verb for managing prop identities
* Creates new proc on pda to create a fake event prop conversation in new eventkit
* Creates new topic in admin/view_variables/topic.dm and helper.dm to call new proc on pda
 2024-02-08 16:08:18 +01:00
SelisandGitHub 93f076a120 TGUI 5.0 Patch 2 ✨ (#15737) 2024-02-08 16:00:24 +01:00
SelisandGitHub c66f6e03d5 TGUI 5.0 Patch 1 (#15736) 
* Patch 1

* Updated Packages

* Eslint

* Linter fixes
 2024-02-08 14:44:59 +01:00
SelisandGitHub 23a3b53ca5 TGUI 5.0 (#15635) 
* Core

* Interfaces & Bundle

* Update
 2024-02-08 13:27:27 +01:00
Heroman3003andGitHub 82812ea2e6 Merge pull request #15733 from BonniePandora/Replikant 
Ports various clothing items, two sets of cyberlegs & some markings
 2024-02-08 03:56:39 +10:00
Heroman3003andGitHub d3fcaef5bb Merge pull request #15735 from PastelPrinceDan/spritestuff 
adds 18th century oufit, ports fox ears, fixes 2 hairs
 2024-02-08 03:56:19 +10:00
PastelPrinceDan 373bb64cc7 adds 1 outfit, port 1 pair of ears, fixes 2 hairs 2024-02-07 12:23:13 +00:00
BonniePandora d561f31319 Replikant stuff 
Items, robolimbs & markings
 2024-02-06 00:25:50 +00:00
Heroman3003andGitHub 6237d0a6a2 Merge pull request #15728 from Kashargul/spriteFix 
adv/debug cataloguer sprite fix
 2024-02-05 07:09:06 +10:00
CaseyandGitHub 6dd9b23b07 Merge pull request #15729 from VOREStation/Map-swap 
Map swap
 2024-02-04 16:03:57 -05:00
CaseyandGitHub 737a8bcde5 Map swap 2024-02-04 12:45:36 -05:00
KashargulandGitHub 33be231668 removing vr file 2024-02-04 15:07:08 +01:00
KashargulandGitHub 649415c4ad wrong icon location fix 2024-02-04 15:01:38 +01:00
Heroman3003andGitHub d61390a612 Merge pull request #15724 from Kashargul/borgjawRebalance 
borgjaw rebalance
 2024-02-04 09:18:46 +10:00