Commit Graph
2657 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
5cf2f911f3 Tgui ui fix (#15778)
* AccountsTerminal.jsx

* Autolathe.jsx

* ExosuitFrabicator.jsx

* Biogenerator.jsx

* AirAlarm.jsx and borg control fx

* SuitCycler.jsx

* small typo

* 3 more UIs

* MiningVendor.jsx

* CameraConsole.jsx

* MessageMonitor.jsx

* Nif.jsx

* localState deprecation

* ResearchConsole.jsx

* DNAModifier.jsx

* oups...

* remove vv rounding

* mob sapwner

* lineendings

* Communicator.tsx not nice to look at, but works

* adding bundle

* small chat dropdown patch

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/AirAlarm.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/Biogenerator.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/CasinoPrizeDispenser.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

* Update tgui/packages/tgui/interfaces/MiningVendor.jsx

Co-authored-by: Selis <sirlionfur@hotmail.de>

---------

Co-authored-by: Selis <sirlionfur@hotmail.de>
2024-02-23 21:09:18 +01: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
KashargulandGitHub 75555bd53f hotfixing VV edit (#15772) 2024-02-17 01:58:31 +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
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
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
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
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +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
KashargulandGitHub 9d8cfd8b80 . 2024-01-31 09:33:16 +01:00
KashargulandGitHub e1604958cb right fix for real 2024-01-31 09:08:29 +01:00
KashargulandGitHub 954f06c466 . 2024-01-28 04:59:47 +01:00
KashargulandGitHub 0d6db943e0 oups... 2024-01-28 04:57:41 +01:00
KashargulandGitHub d3b0c1ebe6 robot upgrade overhaul 2024-01-27 13:29:19 +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
KashargulandGitHub d3f1869f1c right fixes... 2024-01-21 22:27:10 +01:00
Kashargul 1444a224a3 missed tags 2024-01-21 12:44:12 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
Heroman3003andGitHub 3d096869e4 Merge pull request #15673 from Heroman3003/minifixes
Two small fixes
2024-01-14 07:14:09 +10:00
Heroman 241ddee154 Two small fixes 2024-01-14 07:05:11 +10:00
Repede e27f8803fe oops 2024-01-07 20:28:44 -05:00
Repede bcb4a9e91c Fixes GLOB Edit for global view variables so it does not crash the server instantly - Code by @Willburd 2024-01-07 20:25:23 -05:00
izac112 eab7fba3fa Revert "fix(ahelp): Makes pressing "handle" actually use webhook"
This reverts commit cc6c813f6d.
2024-01-03 15:51:24 +01:00
izac112 eddb283c11 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2023-12-18 03:17:20 +01:00
Heroman3003andGitHub 7b32daf1d2 Merge pull request #15606 from VOREStation/selis-sound
Sound updates
2023-12-17 18:54:36 +10:00
izac112 33a733a205 Allows mods to also pm 2023-12-16 04:49:32 +01:00
KashargulandGitHub 7b3ce59f6a remove forgotten debug (#15612) 2023-12-16 01:56:42 +01:00
Selis 67409acd14 Stopsound verb 2023-12-12 23:39:07 +01:00
Selis a8b43cb28c Sound update 2023-12-12 23:31:03 +01:00
KashargulandGitHub bd90942c17 improved robot admin handling 2023-12-12 23:11:33 +01:00
Heroman3003andGitHub 325bb65e59 Merge pull request #15579 from Kashargul/robotUihandling
improved robot HUD handling
2023-12-10 05:54:39 +10:00
SelisandGitHub 57f7b9cd8c Chat types and colors (#15580)
* Some chat types

* ADMINLOG color readded

* Esay/Asay/Mentorsay/Msay colors
2023-12-09 18:24:17 +01:00
KashargulandGitHub ac7f72227d we also unequipp all on admin handling. 2023-12-09 15:44:08 +01:00
KashargulandGitHub a9d1598e6c improved robot HUD handling 2023-12-09 15:08:35 +01:00
izac112 9cb09b3cff Fixes notes for moderator 2023-12-08 23:51:57 +01:00
SelisandSelis 9af8ef0dc1 Filters & Colors 2023-12-08 17:26:05 +01:00
Repede 04861dc380 comment 2023-12-07 18:53:44 -05:00
Repede 15dc533eae Make area jump work even if not specifying a area name 2023-12-07 18:49:53 -05:00
izac112 0f82ef3735 Fixes player notes 2023-12-04 17:32:50 +01:00
izac112 83a0c0a1b6 Updates admin panel not to display some admin / mod actions in it. 2023-12-04 17:30:53 +01:00
KashargulandGitHub cea40f7a37 added more chat response alerts 2023-11-30 23:48:15 +01:00
KashargulandGitHub 48877faa05 adds safety check before resstet. 2023-11-30 22:40:05 +01:00
KashargulandGitHub c9ad9e2205 Adds full module reset to the options 2023-11-30 22:23:40 +01:00