f3e3905b41
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-11 20:18:19 +01:00
68e5bf9d42
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:21:21 +01:00
87ce13b27c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2
2024-12-04 15:17:00 +01:00
e9aafd2826
Merge remote-tracking branch 'upstream/master' into kk-spacetraffic
2024-12-02 06:08:55 +00:00
9d3a7986d8
traffic update
...
more khi cleanup
2024-12-01 18:37:08 +00:00
058f219cb9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-11-30 23:30:26 +01:00
90dc2821e9
Merge pull request #16649 from ShadowLarkens/microwave_improvemenets
...
Make the microwave preview what it'll (probably) create
2024-11-30 14:40:36 +10:00
938ab8af7c
Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects
2024-11-27 23:53:06 +01:00
da88e49778
Enables hud variant
2024-11-27 14:52:17 -05:00
49d0d773e5
Make the microwave preview what it'll (probably) create
2024-11-26 11:12:56 -08:00
65c640cd68
Janihud rework
...
From Outpost21
2024-11-26 10:46:05 -05:00
49d89c0059
usr to user up to player effects
2024-11-12 00:10:20 +01:00
7175a48c8d
Virology Patch 1 ( #16581 )
...
* Update
* Small oopsies
2024-11-09 01:18:07 +01:00
9077c940c4
Better Viro ( #16536 )
...
* Better Viro
* Quarantine ship
* Lazy...
* Roanoake prep
* Roanoake
* Verbs
* Verbs + Logging
* Virus breath check
2024-11-05 12:40:02 +01:00
242fa3a66b
Ports over configuration controller ( #16484 )
...
* Ports over configuration controller
* Fixes
* Manual path fix
* patch (#16490 )
* patch
* .
* SQL Fix
* Post-rebase fix
* Added missing examples
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-22 19:26:44 +02:00
c07027136e
Port tg statpanel ( #16463 )
...
* Port tg statpanel
* Add verb descriptions using the title attribute
* Fix a dreamchecker error
* Remove chomp edits
* Add mentor tickets to ticket panel
---------
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com >
2024-10-16 19:39:06 +02:00
7b5dfe54be
Merge pull request #16413 from Kashargul/span_rework
...
refactors most spans
2024-10-04 08:07:31 +10:00
c2a888f9b1
prevent blood overlays from stacking up
2024-10-03 23:17:10 +02:00
a2c673ab7a
refactors most spans
2024-10-02 21:10:31 +02:00
1862c0e11b
Deconf 2: Electric Boogaloo
2024-09-27 13:43:21 +02:00
6caaf9742f
prevents posters inheriting icon_state from map obj
2024-09-22 17:23:06 -04:00
409aaba802
Remove
2024-09-09 02:36:53 +02:00
42b345b3cc
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-08-28 20:22:38 +02:00
90720f8a67
Various fixes ( #16176 )
...
-Patches map-spawn random objects inside loot piles
-Adds counter-clockwise rotation to many objects
-Prevents borers from crashing VR
-Tweaks blood drying to not queue dry timers on mapload
-Prevents adding grabs to crates
-Fixes look up verb when outdoors
-Lets vehicles fall through open space
-Lets the cargo tug dangerously use stairs
-Fixes med/sec bot runtimes
-Fixes TECH_MAGNETS incorrect define
-Fixes damage/stumblevore procing every step when riding taurs/borgs while confused
2024-08-12 05:20:18 +10:00
04de351a1e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-07-17 16:14:16 +02:00
ab31632830
even more local defines ( #16033 )
2024-06-12 12:57:31 +10:00
8e1d6717b7
some GC things
2024-06-09 17:51:59 +02:00
e5b57b588a
fix jan HUD visibility ( #16031 )
2024-06-09 17:29:28 +10:00
186475ef6d
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-06-03 22:08:11 +02:00
bf490b78ac
Adds Contaminant Detector HUD ( #15970 )
2024-05-09 19:37:19 +10:00
153c3abf2e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-26 03:37:23 +01:00
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
19e46d19b2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2024-02-17 01:06:24 +01:00
d99321bfdf
Cleaning up defines
2024-02-10 16:44:44 +01:00
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
8f1979207a
Removes a few posters
2023-12-03 11:10:29 +10:00
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
9a94306585
Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one
2023-10-01 09:34:43 +10:00
4088f40cc9
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-08-24 18:27:07 +02:00
b422c9a5df
Fixes posters on lateload maps
2023-08-23 06:05:29 +10:00
ff7df50a7e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-21 19:03:35 +02:00
10d2178516
More 515 Compatibility
2023-06-05 19:29:40 +02:00
9cedb2ec47
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-06-03 19:53:45 +02:00
6a67c9c8f6
No spawning maws or asses.
2023-05-28 12:36:55 -04:00
4cc81d7c73
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-03-19 22:24:48 +01:00
458cf6a271
Update crayon.dm
2023-03-14 17:56:46 +10:00
f7669b64d0
Sheet storage has different caps per type.
2023-03-14 03:44:57 -04:00
f61e9a6a39
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-29 21:52:44 +01:00
b07c9e3227
Time travel fix!
2023-01-24 14:45:08 +01:00
5df1af5009
very nice dirt code
2023-01-17 15:02:28 +08:00
izac112