Commit Graph
184 Commits
Author SHA1 Message Date
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
Kashargul a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +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 153c3abf2e Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update 2024-02-26 03:37:23 +01:00
BlackMajorandGitHub 723789a563 Small fix for planetary lighting (#15783) 2024-02-24 17:19:45 +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
Repede c3c5dd6a73 Fixes sun and open tiles on cryogaia 2024-01-15 20:20:54 -05:00
izac112 bbe6094ff5 Fixes some messed up paths again 2023-08-25 05:01:02 +02:00
izac112 8fd797dd34 Changes icon path to the right one 2023-08-24 18:27:39 +02:00
izac112 4088f40cc9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-08-24 18:27:07 +02:00
Heroman 1c9018eb6b Adds fake weather options to fake sun 2023-08-21 20:18:49 +10:00
izac112 2469825449 Makes it so the firework launcher actually can trigger confetti 2023-03-26 22:24:57 +02:00
izac112 4cc81d7c73 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-03-19 22:24:48 +01:00
Heroman f8f34e0d10 Removes stray line 2023-03-16 17:21:20 +10:00
Heroman fbf6bf41c2 Various weather and firework related cleanup and adjustments 2023-03-16 17:07:56 +10:00
Heroman3003andGitHub f11f77702c Update sif.dm 2023-03-15 07:17:30 +10:00
AtermoneraandVirgoBot 79f787d22f Adds fog as a weather. It's cold. 2023-02-19 00:13:56 -05:00
izac112 f61e9a6a39 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-29 21:52:44 +01:00
VerySoft 5a3d0aa09b This too 2023-01-03 17:01:55 -05:00
izac112 53f54d78e6 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2023-01-03 21:12:41 +01:00
Heroman cd0fe57693 Makes Virgo 4 extreme weathers dissipate 2022-12-30 16:43:31 +10:00
Heroman 64149a5d5b Adds fireworks and their launchers 2022-12-25 21:15:33 +10:00
AtermoneraandVirgoBot d950e35905 Greenjoe12345/xmas2022 2022-12-13 22:02:58 -05:00
izac112 0d57b37757 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-09-04 22:57:35 +02:00
Heroman b66ea11f79 Fixes edges of 3c wilds having wrong atmos in mineral walls 2022-09-03 14:36:53 +10:00
C.L b78c4cd693 Changes name 2022-08-31 01:39:55 -04:00
C.L d8c6953e55 Adds a 'safe' ash storm variant.
For admemes.
2022-08-30 23:16:07 -04:00
izac112 352c8c5323 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-08-03 18:09:45 +02:00
Heroman 5e2f25a83a Fixes two bugs 2022-07-25 07:53:07 +10:00
izac112 71d069887c Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-07-08 15:49:48 +02:00
Heroman e9ccfcd6ea Fixes blood moon transition breaking weather system 2022-07-02 06:02:24 +10:00
VerySoft 53f80e72b8 OH NO! 2022-06-30 16:52:36 -04:00
izac112 d841463eb5 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-27 16:11:36 +02:00
VerySoft f5e97ea3c1 GBWilds
Wild!
2022-04-23 20:25:19 -04:00
izac112 51bb507ac7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-15 14:20:32 +02:00
VerySoft cedc6348f7 More map tweaks!
Revamps the dorms and adds bathrooms

Also makes daytime longer than nighttime
2022-04-09 05:14:56 -04:00
izac112 235cd04931 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-09 10:50:28 +02:00
VerySoft 02c3565f46 T W E A K S 2022-04-07 16:58:27 -04:00
izac112 31b42f636a Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-07 16:59:48 +02:00
VerySoft 0817629e5d This too 2022-04-06 04:10:23 -04:00
VerySoft acf0c1e26a Yet more map tweaks 2022-04-04 00:19:34 -04:00
VerySoft 95ab2238b6 More maptweaks! 2022-04-03 16:37:09 -04:00
izac112 2a815d66d2 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-04-03 16:56:15 +02:00
CaseyandGitHub f7e62c3996 Merge pull request #12618 from Heroman3003/outdoor_lights
Fixes planet lights (hopefully not too hard)
2022-04-02 23:23:44 -04:00
Heroman d807544376 Fixes planet lights (hopefully not too hard) 2022-04-03 12:17:02 +10:00
VerySoft 58fc35ebca Further tweaks 2022-04-02 09:34:17 -04:00