izac112
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
Drathek and GitHub
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
376ce75686
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-01-09 21:28:33 +01:00
Repede
753627568f
Remove appendicitis
2024-01-05 16:53:12 -05:00
Repede
5ed2f51573
yw events ecks dee
2024-01-05 15:35:56 -05:00
Repede
9fcfa9497a
removing annoying events for lowpop, hopefully the ones left make things less dull but also not annoying to deal with each round.
2024-01-04 22:06:30 -05:00
Kashargul and GitHub
f6ab8061e1
ignore bellied in appendicitis events
2024-01-04 19:10:18 +01:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Selis and GitHub
7ccdbb258f
Revert "Revert "12/10/23 - Map swap update" ( #15593 )" ( #15594 )
...
This reverts commit f00d13da66
2023-12-11 00:22:42 +01:00
Selis and GitHub
f00d13da66
Revert "12/10/23 - Map swap update" ( #15593 )
2023-12-10 23:37:45 +01:00
Heroman3003 and GitHub
cfbde5f587
Disables debug messages for APC-less ships in electrical storms ( #15587 )
2023-12-10 00:30:00 +01:00
Kashargul and GitHub
ef99260164
radstorm changes and borg module fixes
2023-12-06 19:41:28 +01: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
Heroman
316e0fe451
Ian storm now respects rad/blue shielding
2023-08-23 15:41:58 +10:00
Heroman
328af43db9
A variety of smaller fixes
2023-08-15 15:12:32 +10:00
VerySoft
b5ad497ac0
538
2023-08-02 05:38:52 -04:00
Heroman
6496d393a1
Adds generic 'spacefish migration' event, replaces active fish events with it
2023-07-16 10:10:25 +10:00
izac112
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
Selis
271ff9408f
Spell Fixes
2023-06-18 12:47:36 +02:00
ItsSelis
10d2178516
More 515 Compatibility
2023-06-05 19:29:40 +02:00
izac112
5c0a04dad0
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-04-30 14:31:02 +02:00
Killian
f715fa769b
more space creature events
2023-03-31 06:37:36 +01:00
izac112
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
izac112
f61e9a6a39
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-29 21:52:44 +01:00
izac112
08ef77c424
Disables Spider Migration, Radiation Storm and Space Vines
2023-01-29 21:28:56 +01:00
Heroman
86f50667a5
Adjustments to wildlife event
2023-01-29 09:54:30 +10:00
Heroman
aa7004fde2
Quotation marks
2023-01-09 06:45:38 +10:00
Heroman
4db4d618e5
Removes aquatic spawns from wildlife event for now
2023-01-09 06:43:35 +10:00
izac112
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
Heroman
68981659fa
Replaces RP's carp and jellyfish events with new Roaming Wildlife event
2023-01-03 19:38:32 +10:00
Heroman
f8b38d8c90
Refactors borgs and adjusts events
2022-12-30 14:36:27 +10:00
ItsSelis
779b4db5c0
Added missing href tokens
2022-12-14 21:08:49 +01:00
izac112
f5e985b81c
Removes blob again
2022-10-25 20:17:36 +02:00
izac112
dc36fe9b8f
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-10-16 22:52:41 +02:00
Heroman
d6098a1abf
Gird check fixes
2022-10-06 17:48:49 +10:00
Heroman
6b525c8c6c
Fixes a few more runtimes.
2022-09-16 08:40:34 +10:00
izac112
71d069887c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-08 15:49:48 +02:00
Heroman
a522ab6193
Makes gateway-spawned solargrubs not tracked by solargrub event
2022-07-01 17:04:12 +10:00
Heroman
e1fe4846ef
Makes all things that check for dorms check for forbid events var
2022-07-01 06:49:55 +10: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
izac112
cd26d7770a
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-05-16 19:14:19 +02:00
ItsSelis
886de503f1
Disables PDA Spam event
2022-05-03 22:19:15 +02:00
izac112
068da2c612
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-22 20:15:54 +01:00
lm40 and GitHub
aadbddc8c0
Fixes typo
2022-03-21 22:05:52 -04:00
izac112
74ee064587
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-07 16:16:38 +01:00
Heroman
d51eb33b21
Adds minimum job requirements to certain events
2022-03-04 16:13:56 +10:00
izac112
22f21b51c3
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-02-23 16:31:33 +01:00
VerySoft
d8915a1d02
Allow morph event to fire more than once
...
More morphs, still more rare than maint preds, and maint preds get more than one spawn.
2022-02-21 19:01:27 -05:00
izac112