227 Commits
Author SHA1 Message Date
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
KashargulandGitHub 5474012311 tele patch (#16465) 2024-10-12 14:18:07 +02:00
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Guti 409aaba802 Remove 2024-09-09 02:36:53 +02:00
izac112 04de351a1e Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-07-17 16:14:16 +02:00
KashargulandGitHub 6cabe9f7e6 Undefines local defines and moves global to __define (#16028)
* first set of defines

* some more

* .

* final defines

* del local define
2024-06-09 17:29:20 +10:00
izac112 578e38108f Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-25 19:31:25 +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 59d751a9f9 Round value adjustments for react (#15764)
* input adjustments

* .

* .
2024-02-16 14:18:54 +01:00
izac112 9402b12322 Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-08 18:19:52 +01:00
Kashargul e4b62dfa35 remove static chat colour tags 2024-01-21 12:34:53 +01:00
izac112 a17d96cb92 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-10-30 11:24:00 +01:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
izac112 509325db9f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-09-17 22:18:49 +02:00
Heroman 348f184abb Fixes a pair more things 2022-09-07 17:12:37 +10:00
C.L a619121abe More light updates!
- Changes how lights function. Instead of lights being qdel'd when you take them in/out of light sockets, it now holds them _in_ the light socket! (Due to this change things have been thoroughly tested, numerous bugs squashed which arose due to this change, and then tested again.)
- Makes it so overlays update properly on lights
- Makes it so light colors persist, even if you turn an alarm off & on again (previously reset the light to normal)
- Made it so nightshift properly updates the overlays of lights.
- Updated the light replacer to swap lights in a more efficient way
- Makes it so light replacers can set the color of the lights being inserted. (This only affects the daytime lights. For more complex changes, a multitool is required.)
2022-09-05 15:47:46 -04:00
izac112 00994205e0 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-09-05 13:47:14 +02:00
CaseyandGitHub aa40f0411c Merge pull request #13660 from Cameron653/NO_CRASHING
Bugfix Palooza
2022-09-04 17:51:20 -04:00
C.L af3ead288c Allows light manipulation via multitool. 2022-09-03 23:01:50 -04:00
C.L cfa3869fd1 Fixes lights not properly becoming the right color w/ emergencies 2022-09-03 21:44:28 -04: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 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
VerySoft 865777bcbe That nice glow
Makes it so the lights have an overlay so the light part is bright even if the lighting around it is poor
2022-07-03 19:18:47 -04:00
Killian 91d39da943 new->init refactor 2022-02-20 19:32:23 +00:00
MistakeNot4892andVirgoBot 3f9af78f3a /atom New() => Initialize() [MDB IGNORE] 2021-11-14 03:09:51 -05:00
izac112 897cf4b57e Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-17 10:36:29 +02:00
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
izac112 dd8893112f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-08 09:40:23 +02:00
Aronai Sieyes b71c7e7271 Use material defines more 2021-07-03 18:18:05 -04:00
izac112 bcad22ac98 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-23 19:20:09 +02:00
Aronai Sieyes a8f228bc02 Maybe fixes heroman's complaint 2021-06-21 21:48:01 -04:00
izac112 ffc6a2a369 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-18 17:01:47 +02:00
Aronai Sieyes 05fc5d3758 Fix requested things 2021-06-17 23:52:39 -04:00
Aronai Sieyes db14882664 Port tg lighting system
Also converts planet lighting to a new system
Too hard to separate out from this PR
2021-06-17 00:18:09 -04:00
izac112 70e8ea4205 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-02 23:51:27 +02:00
Aronai Sieyes 89a2043edc Fix some sources of sounds in /New 2021-05-31 20:16:07 -04:00
izac112 4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Killian 5d7cff1f7d areas, closets, other miscellaneous adjustments 2020-07-21 17:29:34 +01:00
izac112 e684df5236 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-21 21:17:58 +02:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
izac112 bbb084a354 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-16 09:06:27 +02:00
Aronai Sieyes 132ace7ab5 Optimize lighting processing 2020-05-13 12:16:01 -04:00
izac112 2b3fc9a740 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate 2020-05-11 18:20:43 +02:00
izac112 e28994b7be Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac-voreupdate
All conflicts resolved

Signed-off-by: izac112 <izac10@live.com>
2020-05-06 21:53:03 +02:00
Aronai Sieyes a7f9557109 Increase nightmode brightness slightly 2020-05-06 10:35:25 -04:00
Aronai Sieyes aa6d22097b Port SSnightshift from Paradise
Makes the station have a night mode.
2020-05-03 17:51:05 -04:00