Commit Graph
701 Commits
Author SHA1 Message Date
izac112 0d5f8f7d14 Merge branch 'master' into heatengine 2024-03-08 02:28:51 +01:00
izac112 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +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
izac112 3046cc4f23 Minor fixes unrelated to heat engine
Removes logging i forgot to remove from the webhook
CR-LF to LF .swcrc
.vscode/settings.json use the dmi editor instead of the image preview
2024-02-19 23:30:43 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01: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
NadyrandGitHub 9347a99f5b Ports QoL, upgrades, and a lot of bug fixes 2024-01-18 21:04:36 -05:00
izac112 a67eac3b3f Adds / Updates rolerequest webhook
Adds / Updates rolerequest webhook to use the nebula system
2023-11-29 05:15:35 +01:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Runa Dacino e30f35df8e add(fax): check to prompt renaming when sending to admin
Adds a check on sending fax to admin departments that prompts the user to either rename, cancel or continue as is when they try to send a fax using the initial() (compile time) value. Continuing works as it did, cancelling ceases the operation and renaming renames it.

Also adds a check for when using bundles to check if the bundle title matches either page 1 or page 2. We only check page 1/2 due to bundle naming logic on creation.

add(fax): Adds a buton to interface to rename fax message

Renames the bundle/paper. Also includes a tooltip to explain what it does and why you should do it.
2023-10-23 14:40:26 +02:00
Runa Dacino 0776b7d934 tweak(paper): Changes bundle naming logic to be general
Used to be bundles would get renamed based on hardcoded default values of "paper" or "photo". Using the Initial() procedure, we now check for defaults at compile time to be able to adapt to changes in paper/photo names.

This was done to enable checking if a bundle is using its default name or not.
2023-10-23 13:38:40 +02:00
Killian f468e50e68 Update paper.dm 2023-10-10 09:43:16 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian 92ca777c4e paper scooper ii: the reckoning 2023-09-16 11:01:40 +01:00
Killian b010bcf5b1 paper scooper 2023-09-02 01:15:22 +01:00
Runa DacinoandGitHub 5b590a9782 Tweak: Makes it possible to stand on same tile as fax machine
It is now possible to climb a table that has a fax machine on it.

Requested by PontifexMinimus
2023-08-30 17:53:35 +02:00
izac112 6cbcb19d7d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 21:41:26 +02:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Selis cbddfd39ef fix: Valid token 2023-08-24 17:28:31 +02:00
Heroman 871310778d A variety of fixes 2023-08-20 10:28:19 +10:00
Runa Dacino 6d2511c996 adds: ability to make automated staff request in fax TGUI
Adds a new jsx element to the login screen when using fax machines, a button in the top right corner which when pushed calls the request_roles() verb, and thus initiates the auto fax dialogue for the player.

This element has a tooltip to explain what it does when hovered.

Furthermore, for when EITHER the fax machine has an ID && logged in, BUT no paper is inserted OR paper is inserted && target destination is part of admin_departments (centcom, job board, supply) - it displays a blurb about automated staff requests with some semi-IC, semi-OOC text and the same button.

adds a new general functionality to LoginScreen.js

Adds a new JSX element to the LoginScreen file that takes machine type as its prop and returns a per-machine relevant element. This is needed for the fax functionality, and already has it defined.
2023-08-04 16:25:38 +02:00
Runa Dacino 86d5fa4299 add/fix(fax): Fixes inability to remove I.D
Adds a new verb to fax machines to retrieve the user's I.D card if the fax machine loses power suddenly, or TGUI acts up.
2023-08-04 10:52:28 +02:00
Runa Dacino 2ee55009d4 tweak(fax): merges faxmachine and faxmachine_vr files
As we are no longer downstream of polaris, and there is a general request to do so - I am merging them as it is fairly simple in this case.
2023-08-04 10:23:36 +02:00
izac112 ff7df50a7e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-06-21 19:03:35 +02:00
ItsSelis 10d2178516 More 515 Compatibility 2023-06-05 19:29:40 +02:00
CaseyandGitHub f6f5051d17 Revert "Runtime fixes" 2023-02-12 16:57:05 -05:00
Heroman 0129bcd422 Runtime fixes 2023-02-12 12:35:44 +10:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
Runa Dacino b07c9e3227 Time travel fix! 2023-01-24 14:45:08 +01:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
CaseyandGitHub 6ca04ed009 Merge pull request #14219 from Heroman3003/stellar-fixes-s
A few fixes
2022-12-23 11:23:13 -05:00
CaseyandGitHub 3aae1d7eba Merge pull request #14216 from TankTheBirb/holster-stuff
ticket printers and folders are now holsterable
2022-12-23 11:22:47 -05:00
Heroman b2f6f0d27e Replaces fix for folder to be better 2022-12-20 18:08:58 +10:00
Heroman b7a51d6281 A few fixes 2022-12-20 18:01:31 +10:00
TankTheBirb ebde941c7f ticket printers and folders are now holsterable
By god I will quick draw my bureaucratic weapons so fast you will wish it was a gun
2022-12-19 20:31:50 -05:00
ItsSelis 779b4db5c0 Added missing href tokens 2022-12-14 21:08:49 +01:00
izac112 dc36fe9b8f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-10-16 22:52:41 +02:00
Heroman cbe0765e12 Fixes a few bugs here and there 2022-10-09 06:24:56 +10:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892 d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
izac112 cf41cd724c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-18 18:57:14 +02:00
VerySoft 8bcf7a214c Small Staff Request addition
It tells you it worked if it reaches the end of the proc now
2022-08-16 17:06:01 -04:00
Heroman f52362de57 Restricts reasons to specific list 2022-08-16 17:48:06 +10:00
Heroman 32a6378a51 Experimental implementation of automated role pings 2022-08-14 15:20:55 +10:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
ItsSelis fe3ad3b6ab Chaplain, multiline stuff and decimals 2022-06-20 18:39:09 +02:00
ItsSelis af64bcf406 More Input Conversion 2022-06-19 12:21:51 +02:00
ItsSelis 2d7b081a55 Input Conversion Part 2 2022-06-19 03:40:24 +02:00
ItsSelis 06c9b26252 Input Conversion Part 1 2022-06-19 03:05:03 +02:00