# Conflicts:
# html/changelogs/.all_changelog.yml
# icons/mob/hud.dmi
# maps/polaris-1.dmm
Fake conflicts from a merge error previously. No real conflicts.
global_lists_vr.dm - Removes generic 'suit' which included basically any outerwear, and the invisible magical storage/internal
storage/internal.dm - Don't name the storage inside suits the same as the suit. It causes weird name-alignment problems where if you delete the suit it might just delete the internal storage, or the other way around.
Dreaming.dm - Added some vorish stuff I made up.
belly_vr.dm - Fixes for digesting items and how that works, and how to prevent them from showing up on the HUD. Also fixes IDs falling onto the floor (among other things).
living_vr.dm - Just in case, adds null-entry cleanup to belly cleanup proc.
bellymodes_vr.dm - Removes previous null-item hotfix.
vorepanel_vr.dm - Adds zero-width space to make items in belly wrap and not look horrible.
skim.dmf - Adds Y hotkey for whisper, and 6 hotkey for subtle.
Closes#455Closes#443Closes#239
* :(
* Ports https://github.com/PolarisSS13/Polaris/pull/2571 early.
Need this for a map I wanna do.
* need sleep
* Emergency meds added
Resolves https://github.com/VOREStation/VOREStation/issues/600
* Fixes Fax Machine showing Sif Government
* Updates Tajaran lore to match Polaris.
* Sleeping for tonight
* Fixes#623
* Added more to the map
* Fox sprites from Paradise added
* Vore bee added
* Technical stuff no one cares about.
* Another update
* Reverts Pull #508https://github.com/VOREStation/VOREStation/pull/508 messed up digesting
dead mobs and mice.
* Sergaling are now Saru.
* Saru
* Zoo map update, near completion
* Zoo map finished, plus Station Vault updated
* Revert "Ports https://github.com/PolarisSS13/Polaris/pull/2571 early."
This reverts commit 59e2bb211759604a95319ce6b1c74219a4b60800.
* Buzz off, Travis.
* Removed microwaves entirely so Travis stops bitching
* Travis stop being dumb
* Fix the zoo map once and for all..?
* Removes backup files.
Separates the 'count and assess everything' stuff to it's own datum, called the metric datum, which I plan to add on to in the future to make counting and metrics easier.
Makes decision process a bit more weight-based, will probably continue tweaking later.
Makes the admin debug UI have links to change settings easily.
Adds replacement for grid check event, which works similar to the old one, but is now based on a physical machine in the game world, that Engineering can hack to make the event end faster, if so desired. Note that the machine is not mapped in, and won't be mapped in until the event system is ready for launch.
Adds grid_check variables to SMESes and APCs to make them stop doing work without draining the battery.
Grid checks in the new system are caused by a "power spike" which originates from the engine and will cause bad things, should no grid checker machine be connected to the power-net. These power spikes occur when the GM decides that a grid check is a good event to have.
The grid checker can be built and deconstructed using the standard machine construction methods.
