Skip to content

Attempts to fix issues with Timer SS #6180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 4 commits into from
May 28, 2019
Merged

Attempts to fix issues with Timer SS #6180

merged 4 commits into from
May 28, 2019

Conversation

Novacat
Copy link
Contributor

@Novacat Novacat commented May 27, 2019

I have no clue how to code or debug subsystems, this is just my desperate attempt to fix the constant timer subsystem crashes on Virgo.

@Novacat
Replaces Timer SS with Bay Port
ccd4ac3 
I have no clue how to code or debug subsystems, this is just my desperate attempt to fix the constant timer subsystem crashes on Virgo.
Novacat added a commit to Novacat/VOREStation that referenced this pull request May 27, 2019
@Novacat
Critical Fixes
d13e8ee 
- Fixes HREF Exploit
- Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
- Port of PolarisSS13/Polaris#6180 and PolarisSS13/Polaris#6178
- Fixes VOREStation#5272
@Novacat Novacat mentioned this pull request May 27, 2019
Merged
@Novacat Novacat changed the title Replaces Timer SS with Bay Port Attempts to fix issues with Timer SS May 27, 2019
DameonOwen added a commit to DameonOwen/ARFS4 that referenced this pull request May 28, 2019
@DameonOwen
Squashed commit of the following:
5bb95cc 
commit 8cb81959d0b6bda3ca182ef29ee74ee2688acebf
Merge: 402fb8418b 2071f9273e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 13:42:48 2019 -0400

    Merge pull request #5278 from Novacat/nova-heterochromia

    New Modular Computer Sprites

commit 2071f9273eecc9741c2603c972b71a865031b1fd
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:15:51 2019 -0400

    Allows Benches/Racks to support laptops

commit 34547c328251fa0571c6362d91dd530b58ba244a
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:09:31 2019 -0400

    Adds some differences for rugged laptops

commit 7515df6187d982bbf37226582542c7965d18211b
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:01:00 2019 -0400

    Another new sprite

commit 63fff025bbd0ea863c0be3beb2399ba244fe8929
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 11:22:33 2019 -0400

    New Modular Computer Sprites

    - New laptop sprite, currently only used for the elite model
    - New console sprite that matches pre-existing consoles

    Also fixes a bug with Pathfinder spawning

commit 402fb8418be06e36e6bb953b374e44ad54b43f35
Merge: 50debef580 04341df092
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 01:12:00 2019 -0400

    Merge pull request #5275 from Novacat/nova-basicfixes

    Timer SS Fix Part two

commit 04341df092e6f344547b9802417ea69a749e0846
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 01:02:39 2019 -0400

    Timer SS Fix Part two

    Update of Polaris PR

commit 50debef580710ec407d953a205ab596912be78dd
Merge: 9f1d75cdd0 d13e8ee784
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 00:08:24 2019 -0400

    Merge pull request #5274 from Novacat/nova-basicfixes

    Critical Fixes

commit d13e8ee78418d42b18a6ed8cbe291d0089ee31d3
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun May 26 23:58:56 2019 -0400

    Critical Fixes

    - Fixes HREF Exploit
    - Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
    - Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
    - Fixes #5272

commit 9f1d75cdd054f381759c2bd7762e49e1bcd30fb2
Merge: 2878a8873d 10a1f2f0ed
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 24 02:12:59 2019 -0400

    Merge pull request #5268 from VOREStation/upstream-merge-6084

    [MIRROR] Borers TLC 1

commit 10a1f2f0ed252edec3e066ad70f816c7e4363eab
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 24 02:04:10 2019 -0400

    Update borer.dm

commit 38e657c83f343c981949930e695288abcd2a2276
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 23 23:01:21 2019 -0700

    Borers TLC 1

commit 2878a8873ddb527384d2a33414ce78ab39bdc86d
Merge: 529c0381bb de395726ad
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:52:24 2019 -0400

    Merge pull request #5265 from VOREStation/upstream-merge-6170

    [MIRROR] Big Bugfix Bonanza

commit de395726ad3a855f2a53b24ec672f1ddf27720e3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:38:01 2019 -0400

    Grumble grumble code standards grumble grumble

commit 64690a85404391dcf76bea7ea4be438512a3636d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:29:49 2019 -0400

    Update medical.dm

commit 42cc20278e0f77cd62f49ae5005ef800856aa92f
Author: mistyLuminescence <32139558+mistyLuminescence@users.noreply.github.com>
Date:   Thu May 23 17:58:29 2019 +0100

    Big Bugfix Bonanza

commit 529c0381bb9f06ecea01e8634d6a211b1b959e29
Merge: f5fae59be0 649cc9b355
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 21 20:44:12 2019 -0400

    Merge pull request #5263 from VOREStation/upstream-merge-6038

    [MIRROR] Sif Animal Expansion 1

commit 649cc9b355d0caf07206bcd18136c308dcba3328
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 21 20:32:31 2019 -0400

    Update vorestation.dme

commit 7a35723d8550df7803549caf951118144dd66a21
Author: Mechoid <Mechoid@users.noreply.github.com>
Date:   Tue May 21 16:57:34 2019 -0700

    Sif Animal Expansion 1

commit f5fae59be0dab234ee72f2e72fc9edd40e7ec98f
Merge: 49a11c302b 64d6a63f60
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 20 20:04:48 2019 -0400

    Merge pull request #5254 from VOREStation/upstream-merge-6166

    [MIRROR] Lets sec people carry holoprojectors in their belts

commit 64d6a63f607d38261287ba8290dbf637c1ce5b04
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 20 18:43:52 2019 -0400

    Lets sec people carry holoprojectors in their belts

commit 5ed3916de364af9e9bafb79ab7f2762faf9e68a7
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 20 18:43:11 2019 -0400

    Merge pull request #6166 from Sebbe9123/fixholoprojectors

    Lets sec people carry holoprojectors in their belts

commit 49a11c302b64f8bd1621dcc975bdcd6699476912
Merge: f57ab4695a 081e3f608f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 19 18:03:29 2019 -0400

    Merge pull request #5245 from VOREStation/upstream-merge-6167

    [MIRROR] Fixes some bugs with laptop

commit 081e3f608f6d689acddb43ceb994027b01db6544
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 19 17:24:10 2019 -0400

    Fixes some bugs with laptop

commit 3e1555c4f8c62fdbf95ae0ef0c5b759e51c8dc24
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 19 17:23:08 2019 -0400

    Merge pull request #6167 from Heroman3003/laptop-bugfixes

    Fixes some bugs with laptop

commit f57ab4695a88cce5ed9bfc2a3db24c64460e072a
Merge: 790c403f80 ed8cdf33dc
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 19 16:48:19 2019 -0400

    Merge pull request #5244 from Heroman3003/addition

    Fixes copypaste mistake

commit ed8cdf33dca2fb2d66471a5fd2a7f92566171322
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 20 05:59:14 2019 +1000

    fixes copypaste mistake

commit 790c403f80dbf052dbb84b084c3199400cc889d8
Merge: 6cbbadc35c 31b00729e9
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Fri May 17 06:43:40 2019 -0400

    Merge pull request #5238 from Heroman3003/Orefixes

    Adds new ores to Virgo 3b and 2

commit 31b00729e95d38b247f6c40efb93aa9100bc637f
Author: Heroman <alesha3000@list.ru>
Date:   Fri May 17 17:43:31 2019 +1000

    Adds new ores to Virgo 3b and 2

commit 6cbbadc35c15e425a40f8726583390e8f9935329
Merge: 1768e1a2fa 153a7f26f2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 16 02:48:47 2019 -0400

    Merge pull request #5235 from Heroman3003/timefix

    Adds facial checking to timeclock

commit 153a7f26f2e49c3c52f130766302c17270f8236e
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:37:28 2019 +1000

    Adds mind role change

commit 1768e1a2fa959101b6374de7d5df837fdd511461
Merge: 110d0a721a da0762221e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 16 02:34:15 2019 -0400

    Merge pull request #5234 from Heroman3003/alarmfix

    Fixes excess alarm under a door

commit 8ab2abe1510bf060bf4767dcea6f62a7d524c56d
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:29:07 2019 +1000

    Adds favial checking to timeclock

commit da0762221e9a9947aaca817dbae06ed16907bdb5
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:07:24 2019 +1000

    Fixes excess alarm under a door

commit 110d0a721af2c055684a341ec40b854e22fbed21
Merge: 6a8ce254df ba420b4ff6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 15 18:44:57 2019 -0400

    Merge pull request #5231 from Heroman3003/awoofix

    Fixes Natje's custom item

commit ba420b4ff60798c1da4c1681f06c78c00728d6bc
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 06:05:06 2019 +1000

    Fixes Natje's custom item

commit 6a8ce254df511e4ed11627decb1b7b1d3f5c2375
Merge: 4cb0f34bbf 7b3e62e571
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 15 15:53:00 2019 -0400

    Merge pull request #5230 from InterroLouis/smooth-tail

    Smooth Tail Port

commit 7b3e62e571a71ff7ec5c3e1b12679dd5ef466279
Author: InterroLouis <sielertd@gmail.com>
Date:   Wed May 15 13:26:33 2019 -0400

    Add files via upload

commit 07878d01c41de8a7e45654372cb3c9ef3838e0e9
Author: InterroLouis <sielertd@gmail.com>
Date:   Wed May 15 13:24:29 2019 -0400

    Add files via upload

commit 4cb0f34bbf743ce922f7a7be04e892532ae9d40c
Merge: 9b291fa5b2 53cc4c91e5
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:34 2019 -0400

    Merge pull request #5227 from VOREStation/upstream-merge-6072

    [MIRROR] [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit 9b291fa5b2b7e3537d2b204645729edb42f7ca41
Merge: f39068dd19 91a132234f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:14 2019 -0400

    Merge pull request #5226 from VOREStation/upstream-merge-6160

    [MIRROR] Fixes access restrictions for com&com MC program

commit f39068dd1994748565814ab031bc41c1bc6e0f7b
Merge: 61561e722c 09dedeb6c9
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:06 2019 -0400

    Merge pull request #5225 from VOREStation/upstream-merge-6152

    [MIRROR] Restricts alarm monitor MC program access to engineering

commit 61561e722ca0023443d0b2b80bd5fdaeb759ddf9
Merge: 8b49495789 ad5fa6c7e3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 23:13:21 2019 -0400

    Merge pull request #5224 from VOREStation/upstream-merge-6153

    [MIRROR] Restricts camera access on MC

commit 8b494957891b9be3c0ba5c6b62fde920fa8928cf
Merge: 53cba90f97 7086803485
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 23:04:35 2019 -0400

    Merge pull request #5223 from VOREStation/upstream-merge-6165

    [MIRROR] Fixes error with #6164

commit 09dedeb6c9d64c55999a809a91f2fc41effd471f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:57:31 2019 -0400

    Update alarm_monitor.dm

commit 53cc4c91e5e5954267006da062b5ef64df626bf1
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 13 22:57:23 2019 -0400

    [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit f830985d386075216075ac7c11e98876366028e9
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:56:04 2019 -0400

    Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

    [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit 91a132234fd73da288f87ad922991dc0a0f40351
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 13 22:57:13 2019 -0400

    Fixes access restrictions for com&com MC program

commit fb5a2f1904063c64f67140d6e1e0afbe30ae5fbf
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:56:31 2019 -0400

    Merge pull request #6160 from Heroman3003/commod-fix

    Fixes access restrictions for com&com MC program

commit ad5fa6c7e386f5526d43a76b96242413cc2bedba
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:57:06 2019 -0400

    Update camera.dm

commit d95b7fda42b708280e051c84149ce28273d86bf2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:56:41 2019 -0400

    Update camera.dm

commit 53cba90f975d8f40e7c3416466e0d3856192e686
Merge: 84d3652869 69d1e97d2e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:56:01 2019 -0400

    Merge pull request #5222 from VOREStation/upstream-merge-6164

    [MIRROR] Ports character setup subsystem from Bay.

commit 74aa8184bf7af8918aa86c7da31f21d444b8f3ac
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:55:10 2019 -0400

    Restricts alarm monitor MC program access to engineering

commit 31174cee2dfcbd11b3eda04b3e3539acbae3d42c
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:55:18 2019 -0400

    Restricts camera access on MC

commit 7086803485ca24d0aee07ac70e32c3599ba00bde
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:54:18 2019 -0400

    Fixes error with #6164

commit 69d1e97d2ebe90ae6c8d907ecf9f7b609cb5e75d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:43:00 2019 -0400

    Update character_setup.dm

commit 842f3a63ae9d7b7a0b31eefa6ab14b7af82b5bb2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:42:45 2019 -0400

    Update vorestation.dme

commit 318a2f3d0988f115fc712d7c834ac87bd2d203dc
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:38:41 2019 -0400

    Ports character setup subsystem from Bay.

commit 84d36528697ba974000d96e65aa713be4fd69466
Merge: 4a50930008 6f80f45eed
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:36:21 2019 -0400

    Merge pull request #5221 from Heroman3003/charsetup

    Ports character setup subsystem from Bay

commit 6f80f45eed48a0d478cc63682605243502a31a10
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 14 11:48:34 2019 +1000

    Ports character setup subsystem

commit 4a509300081474e7bf67e7241e412b1fa1cc53ce
Merge: 7f6e124502 b99afcd201
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 20:11:25 2019 -0400

    Merge pull request #5220 from Heroman3003/turretfix

    Fixes turrets in ai core

commit b99afcd201d3a8d9b0b6877da76b3673be6d9662
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 14 09:57:16 2019 +1000

    Fixes turrets in ai core

commit 7f6e12450246c9a5a256806d8bdf21c546820c84
Merge: e6a7027d96 87f9c19fd6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 17:12:24 2019 -0400

    Merge pull request #5218 from Heroman3003/jobslotsareamess

    Changes timeclock jobslot filling

commit 87f9c19fd69d1ac7052d52c23250f57d58a6928e
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 13 07:01:19 2019 +1000

    Changes timeclock jobslot filling

commit e6a7027d967b7cb33ad5fa4634b642d9c93fe137
Merge: c1f9a97767 a3fbc7c710
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 15:27:20 2019 -0400

    Merge pull request #5217 from VOREStation/upstream-merge-6161

    [MIRROR] Fixes access restriction for MC atmos control

commit a3fbc7c7107a1012ddffe71ff1669a4489128203
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 12 13:57:34 2019 -0400

    Fixes access restriction for MC atmos control

commit d1c953fb0e91dd139a4ae245dfdd4c598a2350f1
Author: Anewbe <matthwledder@gmail.com>
Date:   Sun May 12 12:56:22 2019 -0500

    Merge pull request #6161 from Heroman3003/atmosaccessfix

    Fixes access restriction for MC atmos control

commit c1f9a977673a03a1df917b04d0f8dcf14065fd41
Merge: 08243a95df 8d24173567
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 10:45:26 2019 -0400

    Merge pull request #5209 from Ketrai/master

    Overhauls Fennix Tail.

commit 8d24173567f6eba5732a97e545b6d0048b3f3550
Author: Ketrai <zottielolly@gmail.com>
Date:   Sun May 12 10:28:43 2019 +0200

    updates tails_vr to make sure there's no xeno tail fuckery.

commit 08243a95df3907a8218988a05a412430d1f31ea5
Merge: 7322cbf7fb 4fa1c7e51b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 18:00:04 2019 -0400

    Merge pull request #5214 from Novacat/nova-heterochromia

    Enables Pilot Blue Voidsuits

commit 7322cbf7fb7717ec289897874145a47b1b822b93
Merge: 1c19844bc0 25585908b3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:59:16 2019 -0400

    Merge pull request #4906 from Sebbe9123/Disbot

    Adds new robit, to discourage facetanking.

commit 1c19844bc06911431f6f3a89661871c0338297f2
Merge: 9805cfb3a8 1e662f11d3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:54:28 2019 -0400

    Merge pull request #5216 from Heroman3003/accessfix

    Fixes access on research windoor

commit 25585908b356d1e7ffe5aa3d5d1cdf7c59775f36
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:49:24 2019 -0400

    Switches to Expired Medicine

commit 1e662f11d33bd3b489b115b3ca943c5ef8aa7b0d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 12 07:43:14 2019 +1000

    Fixes access on research windoor

commit 9805cfb3a8396fd4dc98d91e7d2d3ef75e051134
Merge: 65093ca49e 1050d422c7
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:37:02 2019 -0400

    Merge pull request #5215 from VOREStation/upstream-merge-6162

    [MIRROR] Fixes smasher recipies being microwave ones

commit 1050d422c7263b07c315fbe07f6e25cfeaa8a35a
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sat May 11 16:04:54 2019 -0400

    Fixes smasher recipies being microwave ones

commit 994e12e1d20ea841c6ed035b9710d2a4f113908a
Author: Atermonera <atermonera@gmail.com>
Date:   Sat May 11 12:04:20 2019 -0800

    Merge pull request #6162 from Heroman3003/smashing

    Fixes smasher recipies being microwave ones

commit 4fa1c7e51b4d995a4804db3293ef20edd64f87c8
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sat May 11 14:06:09 2019 -0400

    Enables Pilot Blue Voidsuits

    Can be found in Pilot Suit Cycler

commit 65093ca49e6ac93cfd815630363401054916b757
Merge: 928bbbbee7 362f55f27f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 00:44:57 2019 -0400

    Merge pull request #5212 from Heroman3003/fixforrobo

    Fixes missing stuff in robotics

commit 362f55f27f73e841e33223c3a8339519f509265f
Author: Heroman <alesha3000@list.ru>
Date:   Sat May 11 14:34:03 2019 +1000

    Fixes missing stuff in robotics

commit 6166207bd60329efed8344cfbb7e4a0ad0a46654
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 11:29:40 2019 +0200

    Fixes three pixels to make back sprite work with boots

commit 83c3c607981b03024d0d530d3173a280b3ea2d04
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 10:50:35 2019 +0200

    Adds the new tail to selection.

commit d488bb59c0da24e6536ee78d3b5ed227ae56f1db
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 10:45:58 2019 +0200

    Re-adds old tail, remove swish, speed up.

commit 928bbbbee7763927b79032957326c06354492076
Merge: 6cceb5a3fc 6de8eab14b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 16:51:51 2019 -0400

    Merge pull request #5210 from VOREStation/upstream-merge-6159

    [MIRROR] Allows objects to be made uncatchable

commit 6de8eab14bf558fe5d47210ccff53603bfd4ddda
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu May 9 16:40:23 2019 -0400

    Allows objects to be made uncatchable

commit abd1b97d1097c76f4d448de077ca1fbe03cf1a8e
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu May 9 16:39:19 2019 -0400

    Merge pull request #6159 from Heroman3003/youcantcatchme

    Allows objects to be made uncatchable

commit 3ca15cccc744cf43d5d70fa045515c2a36563df8
Author: Ketrai <zottielolly@gmail.com>
Date:   Thu May 9 22:21:36 2019 +0200

    Updates middle sprite

commit 0cb2e5a44a462c92e582db4399623fb3721ee8b5
Author: Ketrai <zottielolly@gmail.com>
Date:   Thu May 9 22:04:25 2019 +0200

    Add files via upload

commit 6cceb5a3fcda199c3af6e629bcdb299913548925
Merge: b13068670d a64b6b9ffd
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 16:00:19 2019 -0400

    Merge pull request #5203 from Heroman3003/astolfo

    Adds Astolfo hairstyle

commit a64b6b9ffd89cb830a7fd691bae211a0dcbd0506
Author: Heroman <alesha3000@list.ru>
Date:   Fri May 10 05:42:13 2019 +1000

    Fixes pixel misalignment

commit b13068670d5d7fe3f2294b1d49120cfd459419f8
Merge: a174fdb084 8dd3039217
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:54:26 2019 -0400

    Merge pull request #5208 from VOREStation/upstream-merge-6158

    [MIRROR] Fixes bug with custom laptops/tablets

commit 8dd30392171b92a299bf78a80817529c0b7e8e7c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:43:15 2019 -0400

    Update loadout_utility.dm

commit 0b8648a0b1c9ece6a4ec6415d1b4182a6aaf711e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:42:09 2019 -0400

    delet conflicts

commit 445923d6993c018b28dca0769831221cfdd8317b
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 9 09:04:46 2019 -0800

    Fixes bug with custom laptops/tablets

commit a174fdb084ec3302cbde7c39c95d4fc37e3aaddf
Merge: 7a5efc3fcf 02ad80db1f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 07:02:31 2019 -0400

    Merge pull request #5207 from Heroman3003/mapfixes2

    Fixes some map bugs

commit 02ad80db1ff1925b960cacc6a9dfc0f41942338c
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 18:40:12 2019 +1000

    Fixes more bugs

commit 743af76d697b3642536ca878f8c9733e038e23c1
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 18:09:20 2019 +1000

    Fixes some map bugs

commit 1a9cfe3be65cf0c0bc48fda5647e7faed965c03f
Author: Sebbe <sebbeblind@gmail.com>
Date:   Thu May 9 09:43:36 2019 +0200

    fixes complaints after bored hiatus

commit 7a5efc3fcf54200a2586e6c276072a148531751e
Merge: 785a610b09 512a898b70
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 00:55:37 2019 -0400

    Merge pull request #5206 from Heroman3003/decalening

    Fixes some missing decals

commit 512a898b706368310b0c6e02cccff972f4fe76ef
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 14:35:54 2019 +1000

    Fixes decals near chem lab.

commit adfd70e04e7a811964be6a32d8af3e5274cf944a
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 14:30:49 2019 +1000

    Fixes some missing decals

commit 785a610b093432a68f9d639d7ff1736a9a5303d3
Merge: a2c9f29648 12ef6cd3d9
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 8 18:51:12 2019 -0400

    Merge pull request #5205 from Heroman3003/smesfix-2

    Fixes SMES outputting (again)

commit 12ef6cd3d986868c02dee4d49621f97306204fcb
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 08:22:39 2019 +1000

    Fixes outputting again

commit ad21685c864f15a7e1edbdba95e508fc7fe0def0
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 07:47:32 2019 +1000

    Adds astolfo hairstyle

commit a2c9f296481d1a741ca0058a12570158ac66d6a2
Merge: d9ea21c156 f8cf1be42f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 7 18:10:42 2019 -0400

    Merge pull request #5202 from VOREStation/upstream-merge-6156

    [MIRROR] changelog

commit d9ea21c1565cc5a38e8a4b265dcaa85cd2731f4d
Merge: 857c84e9a4 ec107e005e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 7 18:10:33 2019 -0400

    Merge pull request #5201 from VOREStation/upstream-merge-6157

    [MIRROR] Makes roundstart spawn spots choose random one

commit f8cf1be42fe7a579ebd26752e6bcb9e3662d851e
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 7 17:07:09 2019 -0400

    changelog

commit 1d7564523ec4d313b817b73331f20fe72ffe1238
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 7 17:06:05 2019 -0400

    Merge pull request #6156 from Atermonera/changelog

    changelog

commit ec107e005e797db7934006876389b35f0ce9c32c
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 7 17:06:55 2019 -0400

    Makes roundstart spawn spots choose random one

commit d9cd96810728a6abc9d428587cc65245ac981f3b
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 7 17:06:36 2019 -0400

    Merge pull request #6157 from Heroman3003/landmarkening

    Makes roundstart spawn spots choose random one

commit 857c84e9a476c80e83991bd8bf7438f7e0fbea94
Merge: a81595e3b0 79c44fd68c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 18:22:31 2019 -0400

    Merge pull request #5197 from Heroman3003/landmarkening-3

    Fixes some landmarks in medical

commit 79c44fd68ccaff55d37bf77e5831af06d4f49f40
Author: Heroman <alesha3000@list.ru>
Date:   Tue May 7 06:46:18 2019 +1000

    Fixes some landmarks in medical

commit a81595e3b04fa083fb87cda18506c6fee9131e88
Merge: 3ec181dace 31d7663bf1
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:47:49 2019 -0400

    Merge pull request #5196 from VOREStation/upstream-merge-6113

    [MIRROR] Fishing!

commit 31d7663bf1b7a556b15cd261b36e2bf4552a13db
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 6 14:32:18 2019 -0400

    Conflict Resolution

commit b4b5ca1eafc46051ef963f91de782290a933683c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:24:40 2019 -0400

    Update equipment_vendor.dm

commit b7761ee3efd36a6164281b3713cf288223400ef8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:18:39 2019 -0400

    Update Chemistry-Recipes.dm

commit 90ee680dd540029489bf31b835dfd740e71df90e
Author: Atermonera <atermonera@gmail.com>
Date:   Mon May 6 10:15:23 2019 -0800

    Fishing!

commit 3ec181dace52095349771e3d2136e886792bc0d6
Merge: 272c90f94f 5ee5142e32
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 01:10:49 2019 -0400

    Merge pull request #5194 from Heroman3003/landmarkening-2

    Adds more roundstart spawn landmarks

commit 5ee5142e324f17ed6b1703afb0138dcb19e4cfec
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 6 14:52:29 2019 +1000

    Adds more roundstart spawn landmarks

commit 272c90f94f02e1e8faab2f03cc493959d47d2a4d
Merge: f71bfd4bf2 2283c1051d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 22:13:54 2019 -0400

    Merge pull request #5193 from VOREStation/upstream-merge-6146

    [MIRROR] Ports SEV Torch Accessories

commit 2283c1051dcc6069d71b43caaecdef06e8f30577
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 5 21:41:07 2019 -0400

    Ports SEV Torch Accessories

commit 66e0532e97f8734bb50f4be44d2d8affeb6c4c16
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 21:40:01 2019 -0400

    Merge pull request #6146 from Novacat/nova-alerts

    Ports SEV Torch Accessories

commit f71bfd4bf28f73a4fad9789f25537ab977aa7cb2
Merge: a8bfa80298 e7d492852c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:32:04 2019 -0400

    Merge pull request #5190 from Heroman3003/mc-opening-table

    Makes laptops require table to be opened

commit a8bfa80298731690b27ca231cdbfbdddafc5a80d
Merge: b7e5bb4461 c1263a31e8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:34 2019 -0400

    Merge pull request #5189 from Heroman3003/mc-camera-access

    Restricts access on camera program

commit b7e5bb4461507d15a79cc87daeb460e73b8bc941
Merge: aa17e3211c 6c3b174b4a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:16 2019 -0400

    Merge pull request #5188 from Heroman3003/mc-alarm-access

    Restricts alarm program to engineering

commit aa17e3211c8dd45dbc38d693d6cf6422a945aea0
Merge: 494c11cf8c f87db8cb0f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:05 2019 -0400

    Merge pull request #5191 from VOREStation/upstream-merge-6150

    [MIRROR] Fixes nullspace clothes with accessories being deleted causing runtimes

commit 494c11cf8cbe52ba89d1e22f785a3fbdbc5a045d
Merge: d25fedee67 10637ec48b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:30:58 2019 -0400

    Merge pull request #5192 from VOREStation/upstream-merge-6149

    [MIRROR] Buffs adminordrazine

commit 10637ec48bc3ba4f74e1b115c5625c5035785182
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 20:06:47 2019 -0400

    Buffs adminordrazine

commit f87db8cb0f39f2c35ad4bed6538f07270f5e415b
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 20:06:57 2019 -0400

    Fixes nullspace clothes with accessories being deleted causing runtimes

commit d25fedee6776dfca3e59ee866c42424605eac653
Merge: 015c3c82b1 e73c436f0c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:06:52 2019 -0400

    Merge pull request #5187 from VOREStation/upstream-merge-6140

    [MIRROR] Bay Accessory Hiding Code

commit e7d492852c64389451b8d9230f1da6bf7fea98fc
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:59:49 2019 +1000

    Makes laptops require table to be opened

commit c1263a31e88697d4ef915df06aa61b22fe6ff1cb
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:55:58 2019 +1000

    Restricts access on camera program

commit e73c436f0c9eb815da653f09d7ff5e13c981a59d
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 19:53:56 2019 -0400

    Bay Accessory Hiding Code

commit 6c3b174b4ab4016328ac1112a6054c394d7935dc
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:51:30 2019 +1000

    Restricts alarm program to engineering

commit 015c3c82b1651cd8bf2ed157e00e48f2154ec480
Merge: ea5dca3a45 f5ce8b6e0a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 18:30:33 2019 -0400

    Merge pull request #5186 from Heroman3003/empty-vendor

    Fixes empty vendomat in research storage

commit f5ce8b6e0a7c01693d54d9a4d4c1f04f847e9d9c
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 6 06:12:57 2019 +1000

    Fixes empty vendomat in research storage

commit ea5dca3a45dbe09c4e4634e65a473b9f1cab6c79
Merge: 45e8f5e5b8 048760f2ea
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:32:00 2019 -0400

    Merge pull request #5185 from VOREStation/upstream-merge-6151

    [MIRROR] Ports #6039 with Virgo Fixes

commit 048760f2ea5ca8f3ec8985839291ab32e10105d2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:17:53 2019 -0400

    Update Chemistry-Holder.dm

commit 909a44ff4c2a008fc27650abdb8b861f2943e03c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:17:36 2019 -0400

    Update nanoui.dm

commit 1757c3007522a87dc7d7be737fc9a04a694d39c7
Author: Atermonera <atermonera@gmail.com>
Date:   Sun May 5 10:14:25 2019 -0800

    Ports #6039 with Virgo Fixes

commit 45e8f5e5b8162fde6f4ff893831b78afe5bfea63
Merge: 32f7057a4a 44c71b2768
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 19:52:30 2019 -0400

    Merge pull request #5184 from Heroman3003/pfofficefix

    Allows Pathfinder to reach all their stuff

commit 44c71b2768785218a8db419340003536bc44b6a9
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 09:41:33 2019 +1000

    Allows Pathfinder to reach all their stuff

commit 32f7057a4a7865f6539a27a219ad3f98bf386ff6
Merge: 4508d913f3 6d0f0fa77b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 18:36:16 2019 -0400

    Merge pull request #5183 from Novacat/nova-heterochromia

    Fixes a MC oversight

commit 4508d913f3c061f51ff08f0796ee2bfe17467c16
Merge: 5826005ad1 ed55a2f6cd
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 18:33:19 2019 -0400

    Merge pull request #5182 from Heroman3003/boxfix

    Fixes Off-duty engineers and explorers spawning without survival boxes

commit 6d0f0fa77b3c8b499ace8a18c4d44e03f621015d
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sat May 4 18:27:25 2019 -0400

    Fixes a MC oversight

commit ed55a2f6cdd2c07c65a15d2ea3754ac5f0dc9e97
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 08:17:51 2019 +1000

    Fixes Offduty engi and explorers spawning without survival boxes

commit 5826005ad120887dfeca43ab62c517c8ce9b4126
Merge: bc442d3886 05964dda04
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Sat May 4 15:57:49 2019 -0400

    Merge pull request #5180 from Heroman3003/maintfix

    Fixes some minor issues with new map changes

commit 05964dda044fe205313b71137663de0bdf974e9d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 04:04:25 2019 +1000

    Fixes invisible mimic

commit c287be168a5a717d4239be61743a42629e3e7bf7
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 03:51:29 2019 +1000

    Fixes some more new maint issues

commit 668c552cd54147a18c9d6a30133e6a70e89e133d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 03:44:13 2019 +1000

    Fixes some wires and alarms in maint

commit bc442d388633f8dd181d1836a6be8f276b074345
Merge: 3de7d4dbfa 96bdb05ee3
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Sat May 4 12:44:08 2019 -0400

    Merge pull request #5167 from Heroman3003/research-re-do-twoaparently

    Research floor 2 and 3 redesign

commit 3de7d4dbfa056cd15e9ad442279e1931e3ee0271
Merge: 4bb7073630 dd2b696ca2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 23:18:12 2019 -0400

    Merge pull request #5178 from VOREStation/upstream-merge-6148

    [MIRROR] Removes melee damage from snacks.

commit dd2b696ca21f64b406f9a7b45ac5df31cd6b5306
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Fri May 3 21:56:22 2019 -0400

    Removes melee damage from snacks.

commit ea2860eeb34a810087429f8a2b1b3cc0256636ba
Author: Atermonera <atermonera@gmail.com>
Date:   Fri May 3 17:56:01 2019 -0800

    Merge pull request #6148 from Verkister/patch-22

    Removes melee damage from snacks.

commit 4bb707363091f977baa1bc175add320379027d2e
Merge: 4f9531d517 07b866b2f8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 18:15:37 2019 -0400

    Merge pull request #5177 from Novacat/nova-heterochromia

    Last Second Tweaks

commit 07b866b2f8ce5d8af6e15b8b2c670c59d0b06c62
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 16:32:21 2019 -0400

    Last Second Tweaks

    - Swaps trash pile money breifcase with something more balanced.
    - Adds emergency softsuit box to luxury capsules.

commit 4f9531d5179cce1e983340d31ae2aa49a33d9829
Merge: fd66d1b5f8 e191542337
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 04:11:02 2019 -0400

    Merge pull request #5174 from Novacat/nova-heterochromia

    Adminbus Stuff/Trash Pile Additions

commit e191542337794ead2386dc81937e5ef1f455971f
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 04:01:38 2019 -0400

    EXPLORATION VENDOR SPRITE

commit 043b15ed58a9485c20440cb093891c39d9dbd496
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 03:15:42 2019 -0400

    Removes mini translocator

commit 27565f4da99fed5a814593f647fb59b4375c7f93
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 03:06:00 2019 -0400

    Boxed emergency suits

commit 764486174299f4db2524b0e147b3e657e27d3436
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 02:34:08 2019 -0400

    ...Eh, this ended up being too strong

commit 42c5f0eaa7fb845b6b88522a913780df30720208
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 01:10:49 2019 -0400

    Tweaks Trash Pile Loot

commit fd66d1b5f85335897eade1f136cb4d771a03e1ce
Merge: 09b8cbba7c 7467509672
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 21:01:28 2019 -0400

    Merge pull request #5175 from VOREStation/upstream-merge-6147

    [MIRROR] Fixes emergency pods not working

commit 5dd8153c196c6904d4759a98f689ff4136a7c9b6
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 21:01:07 2019 -0400

    Ports Polaris PR

commit 7467509672b325734f73cede245a723ab519fe0f
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 2 16:35:05 2019 -0800

    Fixes emergency pods not working

commit eeb198d3a43f369173672d8ad15724a8c22d4d19
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 19:41:17 2019 -0400

    Metabolism effects

commit fcb2830fe5f838e860f1d8e4cbd56ccc82d7fb4e
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 19:34:35 2019 -0400

    Changes adminordrazine pill

commit 68649aeb7101f559372853ddc58d12020747de44
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:38:26 2019 -0400

    Recommended changes

commit bd08ef98aa8808de018afd37981353abb09dba88
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:27:07 2019 -0400

    Buffs adminordrazine

commit 1b1489d8cc69ea04a417920ee54b496056da0635
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:08:39 2019 -0400

    Adds medicíne pills/bottles for adminbus

commit 09b8cbba7cc52790fd5dbf63e872a6e2a42174da
Merge: faa007bddf 92f5e3b525
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:51:27 2019 -0400

    Merge pull request #5159 from Heroman3003/filling-up-the-underdark

    Adds a bunch of new points of interest to Underdark

commit faa007bddfb6b2c6ae5031ab3b413812b0062518
Merge: 8ccc91e03d 9717bdd8f8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:51:04 2019 -0400

    Merge pull request #5136 from Heroman3003/solargrubs-return-bring-the-hate-in

    Solargrub hibernation season is over

commit 8ccc91e03da4e810c33d2d777d23633b77ad7a32
Merge: d852bb30b2 00acf3a5f2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:50:43 2019 -0400

    Merge pull request #5152 from Heroman3003/exploratory-rewards

    Exploration reward vendor + minor map fixes

commit d852bb30b2b65236f30ca5c59e17b6ac91df8795
Merge: e14cbd5aa5 281cf5ab9a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:48:54 2019 -0400

    Merge pull request #5173 from VOREStation/upstream-merge-6121

    [MIRROR] Ports Citadel Voidsuit Sprites

commit 00acf3a5f28256e37275217aaa0ef2905a5d1419
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 18:32:37 2019 +1000

    Maps vendor in, fixes some map bugs

commit 281cf5ab9a85a60a4ceafbc7ea3aaf15601c0b6a
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu May 2 04:31:29 2019 -0400

    Ports Citadel Voidsuit Sprites

commit 3e1e4fba2a48902d0b5033a193576e30d039aa2e
Merge: f279faf2fd e14cbd5aa5
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 18:27:37 2019 +1000

    Merge branch 'master' into exploratory-rewards

commit e14cbd5aa5b58e26f4081e6bef909675aeebd3a5
Merge: 8b81a3ef63 d22f668012
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 03:56:26 2019 -0400

    Merge pull request #5161 from Novacat/nova-heterochromia

    Miscellaneous Fixes

commit 8b81a3ef637f06b03118851b71c8bcb52ff5de46
Merge: d852713f7e d85efce19a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 03:48:37 2019 -0400

    Merge pull request #5171 from Heroman3003/pumpfix

    Fixes wrong direction of pump in security EVA

commit d22f66801218dc2f196f6644b5a8224fc307422c
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 03:47:11 2019 -0400

    Fixes Part Two

commit d852713f7e03751bc270e6eb509e305ed5323a86
Merge: 44be2d7c35 ff9e4f2e4a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 01:00:17 2019 -0400

    Merge pull request #5170 from Heroman3003/ooc-note-flavor-text-properization

    Makes Flavor Text properly required for joining

commit d85efce19ae7b19985dbd5dd4c3873a211046495
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:57:43 2019 +1000

    Fixes wrong direction of pump in security EVA

commit ff9e4f2e4a48b2eae68b64c3ffbd5c0cbcd50cf4
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:40:13 2019 +1000

    Makes Flavor Text properly required for joining

commit 96bdb05ee342f94e153cc4251c125b40f23d1b25
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:05:18 2019 +1000

    Adds blast doors to robotics-mechbay passage

commit c50b5f5596e310d6bad1719a77f7896d7e0bb427
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 21:32:17 2019 -0400

    Fixes Part One

commit 34457953cbd8f3eef8da0c76da60139543f25beb
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:55:25 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6147

commit de5f932d6e020d90a2492e759c53bb7ab9ff6b97
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:51:53 2019 -0400

    Uncomments valid code

commit 808e64c3bbdc998a1e844d7e0ad88495f34ce362
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:50:31 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6146

commit 36ec23b3774fa78255c3f3142d10f31925c28f9e
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:47:03 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6140

commit 71eff3a22937b234dd5abdecb2b37248de753a87
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:40:43 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6121

commit 8d5fd87b4b9c235fd29ed7e2a54db4fdc5ce0374
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 19:09:20 2019 -0400

    More Shadekin AI

commit 20a827cde8329fbfb9ec6de481ef432e7fc536bc
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 19:06:45 2019 -0400

    Adds AI for all the other shadekin types

commit 0bc49795807457637720a1bf12699a93a6518558
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 17:39:14 2019 -0400

    adds holopads to exploration

commit c7dce7e6fc06fc27f67de641fa01b57f2e3386d6
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 07:26:58 2019 +1000

    Fixed firedoor directions in hallway

commit 8262f161b4cff6bd6dc304d1a7a3741a02d31f4c
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 07:18:48 2019 +1000

    Some missed things in RD office and mapmerge

commit e49edb5046d299613d24291e1f06d5639cc88097
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 06:52:32 2019 +1000

    Wiring fix

commit e618e6b7c098cd29c75ff6a26b87b0ddc5790446
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 06:37:24 2019 +1000

    pre-test-finish

commit 92f5e3b525a2c590c4112b0b66ae82b6873ca35f
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 05:25:19 2019 +1000

    Adjusts mecha-equipment loot table

commit 97b7a806c95f4420cd7ea7fbf094012d4a6c33d9
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 05:17:14 2019 +1000

    Adds a beaker

commit 44be2d7c354fd6adcfa126833d5499d35949df3c
Merge: 72e931cdbc 51dc091cd5
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 1 14:49:18 2019 -0400

    Merge pull request #5166 from VOREStation/upstream-merge-6142

    [MIRROR] Adds Holowarrant Projectors

commit 51dc091cd587c5eb2b4e2ccdd5e7b3347fa9ff35
Author: Atermonera <atermonera@gmail.com>
Date:   Wed May 1 10:37:18 2019 -0800

    Adds Holowarrant Projectors

commit 72e931cdbcc39ce04726790e49f0f5c590398145
Merge: e4367a8e31 dbc8a08dba
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 1 14:20:23 2019 -0400

    Merge pull request #5165 from VOREStation/upstream-merge-6133

    [MIRROR] Minor PDA cartridge tweaks

commit dbc8a08dbaaf16e32532b020762858cdb8ace859
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Wed May 1 14:08:33 2019 -0400

    Minor PDA cartridge tweaks

commit 8e724ad32c1ca668d67ded9b44be0ccc6ec8ecf8
Author: Atermonera <atermonera@gmail.com>
Date:   Wed May 1 10:07:25 2019 -0800

    Merge pull request #6133 from Heroman3003/cart-tweek

    Minor PDA cartridge tweaks

commit a6df82af0d8d030b024862344172be639bff19df
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 20:39:20 2019 +1000

    Minor additions

commit d24f43bd48cf60b0d45e2f035db5d82dcbded954
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 20:32:22 2019 +1000

    Surface 3 done

commit 395bf2c868645cc0903c4fed0c7284852d1af819
Merge: c4813bf118 e4367a8e31
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 17:59:11 2019 +1000

    Merge branch 'master' into filling-up-the-underdark

commit c4813bf118f3f1f64b471355f95d77f474f4cb25
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 17:58:26 2019 +1000

    Removed redundant ketchup definition

commit d7fcd6b96ab77816512996c064f2091cf131130e
Merge: cea9baad63 79dda0f265
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 17:56:28 2019 +1000

    Merge branch 'master' into filling-up-the-underdark

commit 5a060d3135cdca8b6586d359c23785f71e60d5f1
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 17:54:19 2019 +1000

    Level 2 work

commit e4367a8e31267eeb169f9ad5ec99a5f47633e226
Merge: 39cd5e860e 5c72bdad41
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 1 03:51:44 2019 -0400

    Merge pull request #5164 from VOREStation/upstream-merge-6143

    [MIRROR] Adds some premade full condiment bottles

commit 5c72bdad416f70d7817c52f9ae86d9157f89064c
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Wed May 1 03:40:29 2019 -0400

    Adds some premade full condiment bottles

commit 8f9cc9a41ed3e23419fcee2a468e338c9f779b73
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Wed May 1 03:40:04 2019 -0400

    Merge pull request #6143 from Heroman3003/condiment-presets

    Adds some premade full condiment bottles

commit 39cd5e860e140de0190c5f80418ecea85fda75ad
Merge: 037be98a90 11d123ca3b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 1 01:03:07 2019 -0400

    Merge pull request #5163 from Heroman3003/forgotten-terminal

    Fixes missing Storage Console in Cyborg Station

commit 969924e1cb0892b27adecb47f75122a24cbaae42
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 00:52:36 2019 -0400

    Fixes Meatpizza Slice missing icon

commit 11d123ca3bd0a97c0335dd5c1a10ee3eb9062e0c
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 14:45:41 2019 +1000

    Fixes missing Storage Console in Cyborg Station

commit deef672e31ae9f1d1eaa6cd340e21d147b295766
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 14:41:50 2019 +1000

    robotics and rnd

commit 44d0a89b2fe0e51159dbc4d88bbfd9985f6e8e6e
Author: Unknown <RedKerensky@Gmail.com>
Date:   Tue Apr 30 23:15:48 2019 -0400

    Shuttle Renaming

commit 037be98a9017958bef0fa13ba65fa0620fd10349
Merge: 79dda0f265 00a851f867
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Apr 30 22:52:43 2019 -0400

    Merge pull request #5162 from Heroman3003/southern-cross-update

    Updates Southern Cross maps

commit 00a851f867ddfddf83e988c92ea37527bbac126b
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 12:41:34 2019 +1000

    Updates Southern Cross maps

commit cea9baad639c2c3cc5a6194640deba4a66d0e451
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 12:38:36 2019 +1000

    Remove unused backup maps

commit 9c32846fc4949c3523cf322a366ecd4455ae07cf
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 12:35:55 2019 +1000

    Runs mapmerge on Underdark PoIs

commit b4e55e882081f6a349daeaa17828945bfc973bac
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 12:33:13 2019 +1000

    Layout finalized

commit 9717bdd8f8a11bfd66feed5228bb983afc99f179
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 10:54:37 2019 +1000

    Reduced likelyhood of solargrub events

commit 28da7ef5cda42399bf9608e1c7e6fb7634bca62a
Author: Heroman <alesha3000@list.ru>
Date:   Wed May 1 10:43:22 2019 +1000

    Initial commit

commit 2586271ba0e2e243cffafdfa628d97d49e4bbb22
Author: Unknown <RedKerensky@Gmail.com>
Date:   Tue Apr 30 19:33:36 2019 -0400

    Swaps out goggles for gas masks

commit 4dd8948f8333d193e1a6d89a4cf50c54434202c6
Author: Unknown <RedKerensky@Gmail.com>
Date:   Tue Apr 30 19:15:38 2019 -0400

    Fixes the Escape Pod

commit d405c50c315c68957bbdf382d41221c3c7827323
Author: Unknown <RedKerensky@Gmail.com>
Date:   Tue Apr 30 18:26:19 2019 -0400

    Miscellaneous Fixes

    - Replaces the Virus dishes in virology with actual virus samples
    - Fixes V4 Submaps, again

commit 79dda0f265c3925f91b91dafd9b49daff2741c13
Merge: 974946f1e7 a598649a5c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Apr 30 16:45:36 2019 -0400

    Merge pull request #5125 from Heroman3003/repositioning

    Rework of expedition areas

commit 974946f1e73c9b065194819bfa2e3c1df3c8c467
Merge: 8decf68867 2ae08bb543
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Apr 30 05:16:10 2019 -0400

    Merge pull request #5160 from Heroman3003/restrictions-timeclocks

    Changes way timeclock going on-duty restritctions work slightly

commit 2ae08bb5431533fc42f34248f105b1993506d326
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 19:00:30 2019 +1000

    Changes way timeclock going on-duty restritctions work slightly

commit 4c7c020b6f1daf28f15ba71810972c43c7cfe66f
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue Apr 30 12:28:56 2019 +1000

    Fixes mimics not being vore active

commit 1af4c59528991ce52a84e75c5dc1e170ce82c9b4
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 08:30:35 2019 +1000

    Slight adjustements to Testsite

commit 9d234f39ad65e19b57c52775a03d939035f40a96
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 08:20:42 2019 +1000

    Adds a bunch new PoIs to Underdark

commit a598649a5cf8153bc7d87db47f343b9c233370c8
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 05:50:38 2019 +1000

    Fixes some airlock colors

commit f279faf2fd95468c19ac58ddfdfbdeb1c0fbd7dc
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 05:42:14 2019 +1000

    Fixes point card worth

commit 1b87b38c4aa7207d24ea72c67a266c1cc278bd42
Author: Heroman <alesha3000@list.ru>
Date:   Tue Apr 30 05:39:42 2019 +1000

    More PoIs

commit 8decf6886734d3c49c2882d01e0fa23f7f0757eb
Merge: 8bb5ec6300 1380a27c31
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Apr 29 06:35:08 2019 -0400

    Merge pull request #5157 from Heroman3003/purple-flakes

    Fixes outdoors tiles having phoron flaking on them

commit 8bb5ec6300fab7351498b49c8c6eb8519061b589
Merge: 9b5888160c 02710f62ce
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Apr 29 06:34:37 2019 -0400

    Merge pull request #5158 from Heroman3003/cooler-cooler

    Fixes mining outpost's cooler being empty

commit 80cb2de7b720637533f361a489ede09674ff53ac
Author: Sebbe <sebbeblind@gmail.com>
Date:   Mon Apr 29 08:21:28 2019 +0200

    spellcheck

commit 02710f62cef7b2782566c37c7210e9da22a96a76
Author: Heroman <alesha3000@list.ru>
Date:   Mon Apr 29 16:09:51 2019 +1000

    Fixed mining outpost's uncool cooler

commit 1380a27c31b77fa734fff99fb702a0742d0b9929
Author: Heroman <alesha3000@list.ru>
Date:   Mon Apr 29 16:01:29 2019 +1000

    Fixes outdoors tiles having phoron flaking on them

commit 9b5888160c17fa2c631bbce6b9b09c5cc0de8462
Merge: 7943c60676 6864027709
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Apr 29 00:22:55 2019 -0400

    Merge pull request #5156 from VOREStation/upstream-merge-6136

    [MIRROR] Shortwave and Relay Tweaks

commit 6864027709bdbb90ac0e737212eefc22ba9c8377
Merge: 9770d675c2 c12fd7b793
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon Apr 29 00:12:05 2019 -0400

    Merge branch 'nova-heterochromia' into upstream-merge-6136

commit c12fd7b79360234afacf57f10d9a75d7bd6cc6df
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon Apr 29 00:11:51 2019 -0400

    Fixes Missing Sprite

commit 9770d675c243549300aa68a72a78cb5122e1c65f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Apr 29 00:10:51 2019 -0400

    Update radio.dm

commit e01db9b517968b69cfd472b62d58d621f10b0c96
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Apr 29 00:10:13 2019 -0400

    Update telecomunications.dm

commit 0d76e09b7c87f01eead1f0a2586f80e288b0c586
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon Apr 29 00:01:07 2019 -0400

    Shortwave and Relay Tweaks

commit 7943c606768d75f4b342ffa49e0072b5b24bfe49
Merge: 797f9dee59 32ae85e423
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 23:38:01 2019 -0400

    Merge pull request #5155 from Novacat/nova-heterochromia

    Fixes oversights with last PRs

commit 32ae85e423be0dd21580a6a8707a9a106cc6f939
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 23:28:19 2019 -0400

    Fixes oversights with last PRs

commit 797f9dee59299d90d352501b2b76338ad6412132
Merge: fb52ec08c6 7d63917579
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:57:41 2019 -0400

    Merge pull request #5115 from InterroLouis/Webbing-Cost

    Changes Webbing Cost

commit fb52ec08c6f21cf8b809989825bb30e335f4479d
Merge: fe4185735b 62295136f3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:57:13 2019 -0400

    Merge pull request #5114 from Novacat/nova-weapons

    Expedition Sub-department

commit fe4185735bb10bd404c92f1238b26f80af76cf0c
Merge: 30a6e8c2db a1bb30ddf8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:56:10 2019 -0400

    Merge pull request #5150 from Novacat/nova-heterochromia

    POI Generation Fixes/Updates

commit 30a6e8c2db7e354ca02ff47531f2e492a74f0e90
Merge: 96669c91f0 1b7bab5810
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:53:25 2019 -0400

    Merge pull request #5154 from VOREStation/upstream-merge-6031

    [MIRROR] [REVIEW] Ports Modular Computers from Baystation

commit 1b7bab5810b72ca79b37ced4eafd168a1abca312
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 22:37:49 2019 -0400

    Conflict Resolution Four

commit 3933eb4dbb97b430f8dd9e78d6fa6fbf54bd7a68
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon Apr 29 12:26:08 2019 +1000

    Lowers prices to more reasonable

commit 7b9c155511de8179426bae84b7903684be086976
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 22:19:44 2019 -0400

    Conflict Resolution Part Three

commit 4c340138560f64eb058c7694f28ef80d7f476195
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:15:58 2019 -0400

    Conflict Resolution Part Two

commit 1f9eb878492227f3bed5cd1e81757e65544e73f6
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 22:14:31 2019 -0400

    Conflict Resolution Part One

commit 3c48a14f02f35b9a4f4b483da040e496397bcad7
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 22:13:31 2019 -0400

    Update Rockybase.dmm

commit 16b3b5825907e4ee4e8f38b3f230676b6296f028
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun Apr 28 22:06:27 2019 -0400

    [REVIEW] Ports Modular Computers from Baystation

commit 66dfa403f586b44fedfc4a2b68c2a88b49bd74b9
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon Apr 29 11:35:41 2019 +1000

    sans work

commit 96669c91f0dd03efa9943b0e2a329054ba9da859
Merge: b9a1fa29d6 9c5e0c0caa
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Apr 28 20:25:48 2019 -0400

    Merge pull request #5153 from VOREStation/upstream-merge-6139

    [MIRROR] Fixes Access Code Transmission Device oversight.

commit 9c5e0c0caa385cfa13aa787de238d6ff5982a757
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun Apr 28 20:12:14 2019 -0400

    Fixes Access Code Transmission Device oversight.

commit cf1588441fa2b61f8a3aca4559a2da40dcfa0bb1
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun Apr 28 20:11:08 2019 -0400

    Merge pull request #6139 from Mechoid/FixACTDStuff

    Fixes Access Code Transmission Device oversight.

commit b692c1899a36fd954a35902187429ce3b386f52a
Merge: c7a56ff982 b9a1fa29d6
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon Apr 29 09:06:56 2019 +1000

    Merge branch 'master' into filling-up-the-underdark

commit 61b4c4694e97ca608bfd7642a28a279ac17e5cd2
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon Apr 29 08:59:34 2019 +1000

    Adds exploration equipment vendor

commit a1bb30ddf86e9e65cccfadf19ddb14f9518cddf3
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 15:24:34 2019 -0400

    Seriously?

commit fb6c78317af28aebdff1b3fc49ea937c95c5c8d5
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 15:19:59 2019 -0400

    Gives V2 Surface more points

    More POIs, more Points.

commit f8f64834698ddbc57aaa9e36e9f93d6071c12b84
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 15:12:51 2019 -0400

    Updates V2 POIs

commit 44094f2634e1b44fefb6662a96efa0f1f876646d
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun Apr 28 14:04:43 2019 -0400

    V4 POI Generation Fixes

    POIs can only generate on half the map right now, and, not a particularly large half. This prevents the generation of larger POIs, and basically squishes all the POIs towards the cave entrance.

commit b9a1fa29d6309f7ef94a21802d6bb3ff4475fa62
Merge: 76bf550299 727ecd39a8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:49:53 2019 -0400

    Merge pull request #5111 from Heroman3003/people-cant-have-nice-things

    Removes glucose autoinjectors from vendomats, makes Zaddat spawn with a bunch

commit 76bf550299aa44a1d5f51239196449b7c375b650
Merge: cda7fc3156 73b3b4c7b0
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:49:20 2019 -0400

    Merge pull request #5146 from VOREStation/upstream-merge-6129

    [MIRROR] Allows liquidfoods to be eaten through protective gear

commit cda7fc31563c9e5f12e2400adafae4b3b59ef990
Merge: 958a5b6645 2f4c8a8ce1
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:45:06 2019 -0400

    Merge pull request #5148 from VOREStation/upstream-merge-6137

    [MIRROR] Removes Resident from the Southern Cross

commit 958a5b6645b67ad63d7ccdd3dfed4fb47c9cff4d
Merge: c80b6146eb 53c297895a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:42:42 2019 -0400

    Merge pull request #5142 from VOREStation/upstream-merge-6058

    [MIRROR] Removes umbrella permastuns. Adds wind mechanics.

commit 73b3b4c7b0acfd28e95c34a7fa00b14dfa8556e0
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:37:49 2019 -0400

    Update snacks.dm

commit 2f4c8a8ce1d7fb3917aa76c6adfb77f7f8954163
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:35:05 2019 -0400

    Update assistant.dm

commit 536d209e295d9874bd3aab188fe1624b2894d52c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:33:06 2019 -0400

    Update civilian.dm

commit 53c297895a720dd92d49ff6f86690427e1299146
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sat Apr 27 22:32:05 2019 -0400

    Updates Virgo 3B Weather

commit a9aaebe465c67cf9024bd1c165084cd4053dd7d3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 22:23:20 2019 -0400

    Conflict Resolution 2

commit 2672e10dc4dc8ea262f91b61b84b6620fa5f2c15
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 21:28:06 2019 -0400

    Conflict Resolution

commit c80b6146eb6cc7cd09aaa09e96b5ee6851762833
Merge: 822e0f48d6 71d9669913
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat Apr 27 21:16:01 2019 -0400

    Merge pull request #5147 from VOREStation/upstream-merge-6138

    [MIRROR] changelog

commit 13ccd7533f224f7f9b60a9954ebffc48d4ac87bd
Author: Anewbe <matthwledder@gmail.com>
Date:   Sat Apr 27 20:04:03 2019 -0500

    Removes Resident from the Southern Cross

commit 71d96699134743b832638e392b0172fdc193fdc1
Author: Anewbe <matthwledder@gmail.com>
Date:   Sat Apr 27 20:03:27 2019 -0500

    changelog

commit 8f3f8ad80f66576361e3778eb257da7ac5b43403
Author: Atermonera <atermonera@gmail.com>
Date:   Sat Apr 27 15:53:37 2019 -0800

    Allows liquidfoods to be eaten through protective gear

commit 822e0f48d66cea68568f6663afaf914b81b26be6
Merge: 589dbd69de db5dd0ccc1
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri Apr 26 20:00:59 2019 -0400

    Merge pull request #5143 from VOREStation/upstream-merge-6068

    [MIRROR] Re-adds the Space Worm.

commit db5dd0ccc112634eb5c4b63c780f58fdcd4bfcf4
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Fri Apr 26 19:33:43 2019 -0400

    Re-adds the Space Worm.

commit 31a79f0c28f12a3b8f16387abc26472623356340
Author: Atermonera <atermonera@gmail.com>
Date:   Fri Apr 26 15:32:46 2019 -0800

    Merge pull request #6068 from Mechoid/WhatWasWillBe

    Re-adds the Space Worm.

commit 0fe71c0b59d2a40eb026cd94efc0a06545771c04
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Fri Apr 26 19:32:29 2019 -0400

    Removes umbrella permastuns. Adds wind mechanics.

commit 9ea820fd7fb2016450f6b124648191457b7484e7
Author: Atermonera <atermonera@gmail.com>
Date:   Fri Apr 26 15:31:56 2019 -0800

    Merge pull request #6058 from Neerti/permastuns_are_bad

    Removes umbrella permastuns. Adds wind mechanics.

commit 589dbd69deb58c1f8a1d14f1a8d749675194986a
Merge: cd1958779c 16e449ce1e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri Apr 26 15:16:47 2019 -0400

    Merge pull request #5135 from Novacat/nova-heterochromia

    Adds Subtle Teleporter

commit 16e449ce1e2d3cd3aa718c5bc3a7629ec2c2c50a
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri Apr 26 14:58:49 2019 -0400

    Config-side expired permit purge

commit cd1958779ca033131b202fa5b91c9a696f91d2ee
Merge: ad3e9fc6bd d9ec13eaf8
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Fri Apr 26 00:17:07 2019 -0400

    Merge pull request #5141 from Novacat/nova-survival

    Purges expired permits

commit d9ec13eaf8a0eab9307191c79d19a14926b80080
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri Apr 26 00:08:01 2019 -0400

    Purges expired permits

commit ad3e9fc6bdf86226612989c92948b0fe39ae4cd7
Merge: 18c63cfab6 33b1d7b5a8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Apr 25 21:11:07 2019 -0400

    Merge pull request #5101 from Heroman3003/timeclock-finishing

    Implements switching on/off duty midround via timeclock terminals

commit 18c63cfab62708f01bf46544476abfe062db6804
Merge: 13321379b4 a5df38c370
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Apr 25 21:10:46 2019 -0400

    Merge pull request #5100 from Novacat/nova-survival

    Tether Wilderness Adjustments

commit 62295136f3b2afba844732b3e1bac9fe14607ebd
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu Apr 25 20:09:09 2019 -0400

    Changes Engineering to LHS

commit 729b1fc66254ed01aa27d6d535d460fc294cebc7
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu Apr 25 19:56:47 2019 -0400

    Changes off Duty ID Aesthetics

commit c7a56ff9827e08c545226ee85682f5440f5c5d10
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Fri Apr 26 08:39:07 2019 +1000

    Initial commit

commit 13321379b45f5af492efed09ddcc9fa78abdb877
Merge: a2507d900d f0b61889bb
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Apr 25 17:15:10 2019 -0400

    Merge pull request #5140 from VOREStation/upstream-merge-6118

    [MIRROR] Ports Baystation's SS Debugging

commit a2507d900d552f4578ea6423a3f5b450057d8657
Merge: a3d9935aec fcf22f8e1f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Apr 25 17:12:39 2019 -0400

    Merge pull request #5139 from VOREStation/upstream-merge-6131

    [MIRROR] Fixes a typo in nurse spider ai code

commit a3d9935aec6d992c81fe252c8f9970a52e4f6dfc
Merge: c8f104bc2d b6ceb46b50
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Apr 25 17:11:15 2019 -0400

    Merge pull request #5138 from VOREStation/upstream-merge-6132

    [MIRROR] Fixes ai priority targeting

commit f0b61889bb82c3131ff727c265bb355dbc763ef8
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu Apr 25 17:03:43 2019 -0400

    Ports Baystation's SS Debugging

commit 9c6886395a7fb27f1a263110676f55f5c7250540
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu Apr 25 17:02:46 2019 -0400

    Merge pull request #6118 from Novacat/nova-alerts

    Ports Baystation's SS Debugging

commit fcf22f8e1f0392cebce53d37e0d07015d0072bb2
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu Apr 25 17:02:30 2019 -0400

    Fixes a typo in nurse spider ai code

commit ad51d6053194e9b84990baa2c30fe39609210313
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu Apr 25 17:01:43 2019 -0400

    Merge pull request #6131 from Heroman3003/nurse-two

    Fixes a typo in nurse spider ai code

commit b6ceb46b509d42eb2d5fbe164b03b7f4a03d19ca
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu Apr 25 17:01:13 2019 -0400

    Fixes ai priority targeting

commit d3be46f6695942d1ecbd19d4d9cf1513621230f5
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu Apr 25 17:00:18 2019 -0400

    Merge pull request #6132 from Heroman3003/fix-ai-target-priority

    Fixes ai priority targeting

commit 3e33e7c1fc8c11673568d4eb9eac9fd87c8e3777
Author: Heroman3003 <31296024…
@Neerti Neerti merged commit 3a942e6 into PolarisSS13:master May 28, 2019
@VirgoBot VirgoBot mentioned this pull request May 28, 2019
Merged
Verkister added a commit to Verkister/VOREStation that referenced this pull request Jun 9, 2019
@Verkister
Squashed commit of the following:
ae40c6d 
commit f28098c0f2a90a17fb32a2ad31b61b453fa034f1
Merge: b9eaa4f7ec 4c96d56f33
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri Jun 7 09:09:17 2019 -0400

    Merge pull request #5318 from VOREStation/upstream-merge-6197

    [MIRROR] loanchegg

commit 4c96d56f33a9893589959bbd3ca88604988296ec
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Fri Jun 7 02:53:47 2019 -0400

    loanchegg

commit b9eaa4f7ec599b751ba8ecbebd8e15d58398c764
Merge: 3db0e6d4c2 34449354bd
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Jun 6 15:49:43 2019 -0400

    Merge pull request #5296 from Ketrai/fisherdomer

    Adds a fish farm.

commit 3db0e6d4c255c35b0e03c900e1c446394570b31f
Merge: 12069ddb12 0aa11a1813
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Jun 6 15:37:00 2019 -0400

    Merge pull request #5302 from TheFurryFeline/TFF-Infinite-Frame-Fixy

    Infinite Frame Fixy

commit 12069ddb12f9546ad2d263d52d5e4962df533811
Merge: 3d929975c2 377c2e1683
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu Jun 6 15:35:59 2019 -0400

    Merge pull request #5317 from VOREStation/upstream-merge-6195

    [MIRROR] Infinite Frame Fixy

commit 0aa11a18137b5bb72cd82b32a6b36a1cef61c50e
Author: TheFurryFeline <joshuaponzo@gmail.com>
Date:   Thu Jun 6 13:38:31 2019 -0400

    Pre-emptive Conflict Prevention

    Just noticed that my comments were very different and the mirror that's in will conflict if I don't commit this change.

commit 377c2e168361aafb4abc52e0e8e6e6296ba7263b
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu Jun 6 13:11:59 2019 -0400

    Infinite Frame Fixy

commit 88df3de3e6f2cd059851b375edeac4cba9250a8f
Author: Atermonera <atermonera@gmail.com>
Date:   Thu Jun 6 09:10:45 2019 -0800

    Merge pull request #6195 from TheFurryFeline/TFF-Infinite-Frame-Fixy

    Infinite Frame Fixy

commit 3d929975c2565d4c551ca7ea98d304ddbc69d693
Merge: 2ed1919ca0 dea9e242fa
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed Jun 5 11:42:57 2019 -0400

    Merge pull request #5315 from VOREStation/Verkister-patch-1

    Fixes borgs spinning on pounce

commit dea9e242faae7dec542380b2595bc482bda899ec
Author: Verkister <superverkelian@hotmail.com>
Date:   Wed Jun 5 18:28:44 2019 +0300

    Fixes borgs spinning on pounce

commit 2ed1919ca056a0930f850de68ab1841980d26bc9
Merge: 78852d29eb 606d06e3fc
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed Jun 5 00:30:06 2019 -0400

    Merge pull request #5314 from Heroman3003/atmos-fixes

    More fixes for atmos

commit 606d06e3fcf856406885123f1428f7e6fabbf902
Author: Heroman <alesha3000@list.ru>
Date:   Wed Jun 5 14:05:01 2019 +1000

    More fixes for atmos

commit 78852d29ebb4a3dd87223cd92cba8e4921d6abdd
Merge: c0e508eb15 6ff16ce859
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:45:37 2019 -0400

    Merge pull request #5311 from VOREStation/upstream-merge-6192

    [MIRROR] Prevents amber slime feeding from healing slimes

commit c0e508eb15ebc58081a569dfc7d794def3ec38c5
Merge: f86b9bd132 ae42be4d56
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:40:58 2019 -0400

    Merge pull request #5310 from VOREStation/upstream-merge-6190

    [MIRROR] Allows supplypacks with req_one_access to exist

commit f86b9bd132fcb3a1a0c7491fe9a6478a8230bb6d
Merge: 3908487095 5a367aa029
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:39:20 2019 -0400

    Merge pull request #5312 from Novacat/nova-basicfixes

    Adds missing species to Rig whitelist

commit 390848709551588a7e647d2ac9f720e6b3b3e8fa
Merge: a83caa7a69 e3e82eabd9
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:32:03 2019 -0400

    Merge pull request #5309 from VOREStation/upstream-merge-6189

    [MIRROR] Critical ManUpulator Fix

commit a83caa7a694dff2f203700d916d6e3e2744d0da4
Merge: c2aa9f051b e503428617
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:30:29 2019 -0400

    Merge pull request #5308 from VOREStation/upstream-merge-6185

    [MIRROR] lowers the minimum treatment bound of medibots.

commit 6ff16ce8594769a223a460887865148a3712a1bc
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:30:01 2019 -0400

    Update subtypes.dm

commit ae42be4d5603947a1e26e0fbae6142b18c2b87b6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:28:12 2019 -0400

    Update supply.dm

commit c2aa9f051bdc837bb9ce2d2c55e11f7726badd15
Merge: d0c261e542 d273269420
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:26:19 2019 -0400

    Merge pull request #5307 from VOREStation/upstream-merge-6187

    [MIRROR] Adds the clientside ping and reconnect commands to the skin, under file.

commit d0c261e54200bcafc3fdfc1e1b3b1d705d07f41a
Merge: dd5a129187 f0df175285
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:26:05 2019 -0400

    Merge pull request #5306 from VOREStation/upstream-merge-6188

    [MIRROR] Fix Puzzledoors not being locked when no lock is found.

commit dd5a129187ececd1390099016158117c2dbd3f03
Merge: 1ddecf112e 1f801bbdd6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue Jun 4 13:25:54 2019 -0400

    Merge pull request #5305 from VOREStation/upstream-merge-6181

    [MIRROR] Fancy new sprite for elite laptop

commit 5a367aa02922235a2c7d83ef5c85c7d8f1ed52b9
Author: Unknown <RedKerensky@Gmail.com>
Date:   Tue Jun 4 13:25:06 2019 -0400

    Adds missing species to Rig whitelist

    ...I think I got them all this time.

commit 452af8a682272ab1176e9a76aa861ad7f6e875c6
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:15:20 2019 -0800

    Prevents amber slime feeding from healing slimes

commit 8e215ec10f0020ea0750046f90901eda7bff4810
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:14:20 2019 -0800

    Allows supplypacks with req_one_access to exist

commit e3e82eabd94f9eb1d0b88bbee57e982f0d0e2527
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue Jun 4 13:13:57 2019 -0400

    Critical ManUpulator Fix

commit 2f434b45c139928eafe30ccd8a3285a46d069ef7
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:13:02 2019 -0800

    Merge pull request #6189 from mistyLuminescence/manup

    Critical ManUpulator Fix

commit e503428617d05b8d6ceb05a2d99a2365fbf6a864
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue Jun 4 13:12:44 2019 -0400

    lowers the minimum treatment bound of medibots.

commit 8be2258428491b7a4a976580702db656496dfc46
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:10:52 2019 -0800

    Merge pull request #6185 from chaoko99/medibots

    lowers the minimum treatment bound of medibots.

commit d2732694202b16ae335d71fce5a68d75e4638dc3
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue Jun 4 13:12:33 2019 -0400

    Adds the clientside ping and reconnect commands to the skin, under file.

commit 9d4d24a80e630a29884c84616c3ee1bd7e23d382
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:11:31 2019 -0800

    Merge pull request #6187 from chaoko99/reconnect

    Adds the clientside ping and reconnect commands to the skin, under file.

commit f0df1752850f6f62047b4ca198479afe66d9c499
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue Jun 4 13:12:22 2019 -0400

    Fix Puzzledoors not being locked when no lock is found.

commit ddb0b7df2b8bd18db70669cd04a4867e3d301ab0
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:12:05 2019 -0800

    Merge pull request #6188 from Mechoid/PuzzleFix

    Fix Puzzledoors not being locked when no lock is found.

commit 1f801bbdd6630ecd92fef18f913c8b6d0015f792
Author: Atermonera <atermonera@gmail.com>
Date:   Tue Jun 4 09:10:01 2019 -0800

    Fancy new sprite for elite laptop

commit 1ddecf112e4e4f5bde6779d5a40d5112e228d208
Merge: 828392299c f1627cc0bb
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Mon Jun 3 21:06:22 2019 -0400

    Merge pull request #5292 from Ketrai/fishbranch

    Adds lobsters and cuttlefish

commit b8bbe08b836e6f892642d4bf0d40e49715ebf612
Author: TheFurryFeline <joshuaponzo@gmail.com>
Date:   Mon Jun 3 20:50:18 2019 -0400

    Infinite Frame Fixy

    Ports a fix from https://github.com/Citadel-Station-13/Citadel-Station-13-RP/pull/855 to prevent creation of infinite frames with doorbell chimes. Eliminates the runtime that would result from failed deconstruction.

commit 828392299c56fba57f48b6df497e001bd480e12f
Merge: aa4593f3fb 6c65828dd6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Jun 3 18:45:20 2019 -0400

    Merge pull request #5301 from Heroman3003/laptopfixfix

    Fixes closing laptops with no proper support

commit 6c65828dd653978076647ea940ed085322c047ef
Author: Heroman <alesha3000@list.ru>
Date:   Tue Jun 4 08:19:11 2019 +1000

    Fixes closing laptops with no proper support

commit 34449354bd9d72d7845b5968ad3ac7cae73ef2e5
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Mon Jun 3 21:56:38 2019 +0200

    fully reverts surface 3. improves beach shallows

commit aa4593f3fbe5e4c18b47225735a8b51149a06e23
Merge: b88ba6f233 3112cd8fb5
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon Jun 3 12:35:24 2019 -0400

    Merge pull request #5299 from Heroman3003/mapfixespiping

    Some minor piping fixes

commit ce0dabee1c9a578af33d109a54cf4b9f79b6abde
Merge: 7d3c023344 b88ba6f233
Author: TheFurryFeline <joshuaponzo@gmail.com>
Date:   Mon Jun 3 10:37:52 2019 -0400

    Merge remote-tracking branch 'upstream/master'

commit f7baa34e0fd10ba7f8bde84684d0acab4fddec7e
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Mon Jun 3 10:27:00 2019 +0200

    Don't really need these anymore.

commit 3112cd8fb59b2816d8085399f31e75efa767ecf6
Author: Heroman <alesha3000@list.ru>
Date:   Mon Jun 3 18:17:56 2019 +1000

    Some minor piping fixes

commit 5c0ec0277fa6e960c5798a7a4d5fb5cdb42cac5a
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Mon Jun 3 07:47:28 2019 +0200

    Adds intercom, disposals. lil fixes

commit 03369c5e14b26c8c7992eeb12a3da36cba40dbc4
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 22:54:02 2019 +0200

    Adds one more line of coast so it looks nicer.

commit ba8d1c9d79070992c0466cd41c8f44a07cccec63
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 22:40:06 2019 +0200

    Fixes weird shoreline.

commit 717284ebaa58486e8a81779158d582de94831db4
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 22:07:58 2019 +0200

    Removed the dome, adds a fishing farm on level 2, fixes beach map water.

commit b88ba6f23300234ea4908f1673462e97ea5cbf1c
Merge: db88e4ce47 3e62bbcca1
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Jun 2 14:45:57 2019 -0400

    Merge pull request #5279 from Heroman3003/crateaccess

    Access fixes for carogopacks

commit db88e4ce47288b44b678fefe1c50660b253bab7d
Merge: 825e0e2b75 34115d5a48
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun Jun 2 13:07:54 2019 -0400

    Merge pull request #5297 from Heroman3003/mercrename

    Renames Syndicate Commandos to Mercenary Commandos

commit 227c061a7ca1b64f6abe2a460b35f8079d79b34d
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 16:35:21 2019 +0200

    Screm

commit 6d2a2a90010cb476b2d555287b92dbfa86ec8762
Merge: 360688e0dd 386005599e
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 16:28:51 2019 +0200

    Merge remote-tracking branch 'Ketrai/fisherdomer' into fisherdomer

commit 360688e0ddc7b4d79399e9f3b909c559c2663562
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 16:27:19 2019 +0200

    Adds bait, scrubber, fixes indoor rain.

commit 386005599e5c1a8e6c782cfd7aa78134f6d2d47c
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 15:59:07 2019 +0200

    Makes it not rain indoors.

commit 45da153c158d3f21b2e0807c4c0ec227d1ab4278
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sun Jun 2 15:49:24 2019 +0200

    Adds water tiles on which it doesn't rain indoors. :v

commit 34115d5a48f37514073aa8f21262736a08287130
Author: Heroman <alesha3000@list.ru>
Date:   Sun Jun 2 17:49:37 2019 +1000

    Renames Syndicate Commandos to mercs

commit 3e62bbcca10699e4dde03cd2ea2c20c70178c782
Author: Heroman <alesha3000@list.ru>
Date:   Sun Jun 2 07:13:15 2019 +1000

    Moves restriction to _vr file

commit 5d334bf4e91281a84d12c8e87ba78d0feb998007
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sat Jun 1 22:49:11 2019 +0200

    adds some fish

    ye

commit f08e9db247a37888a4384d2cc50d8de6a6f589cb
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sat Jun 1 20:08:24 2019 +0200

    adds a fish more fishing rods etc

commit 97750dd569e680bfda31f1edb71d5dd34b4b662f
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Sat Jun 1 19:44:58 2019 +0200

    Adds a fish farm

commit 825e0e2b755be0143566a58b111718987951786a
Merge: 31d6a0fb40 bd51382a68
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 31 23:00:58 2019 -0400

    Merge pull request #5294 from VOREStation/upstream-merge-6183

    [MIRROR] Fixes some Precursotech oversights.

commit bd51382a68d08f0056cddd3f65db118be6c98014
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Fri May 31 22:18:00 2019 -0400

    Fixes some Precursotech oversights.

commit 5a3040a08dd9ee3eb6f2c57c5c166d44c2244bde
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Fri May 31 22:17:34 2019 -0400

    Merge pull request #6183 from Mechoid/FixPrecursotechOversights

    Fixes some Precursotech oversights.

commit f1627cc0bba215be05321a7b4f74dbf3866dd68d
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 22:09:58 2019 +0200

    another tiny fix

commit 405bbe60c6c9ff5c592d892a029ace02da4a1839
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 19:15:06 2019 +0200

    Fixes

commit 6d94902ddffe34cdf128ab820f743f2c9d659e48
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 19:12:00 2019 +0200

    typos

commit 861f3b60863246e7086a607da6cd56e172036b3d
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 18:45:51 2019 +0200

    ohno

commit 31d6a0fb40feddd0671375810ad7ddc133f2500a
Merge: ae20565d46 0f31ca3baa
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Fri May 31 12:22:18 2019 -0400

    Merge pull request #5293 from Novacat/nova-basicfixes

    Purges remaining mapped in stats

commit ba79dc55d15d24233a48d9aa674254efa40be6af
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 17:41:23 2019 +0200

    trash items

commit a9e139e152d18f2112c331084d4105fc543ca8a1
Merge: 95edaac47c 8af709f599
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 17:17:59 2019 +0200

    Merge remote-tracking branch 'Ketrai/fishbranch' into fishbranch

commit 95edaac47c181e3515cdbdc2546a83fa553bc015
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Fri May 31 17:17:29 2019 +0200

    Adds monkfish

    ITS HOOG

commit 8af709f599ba6ecef74b7ceea46e3733379ede9a
Author: Ketrai <zottielolly@gmail.com>
Date:   Thu May 30 20:35:48 2019 +0200

    Update snacks_vr.dm

commit 7d3c023344ae1a8b339c5f5bee1abe1c7eb7b8d5
Merge: fe8e58244f ae20565d46
Author: TheFurryFeline <joshuaponzo@gmail.com>
Date:   Thu May 30 13:42:17 2019 -0400

    Merge remote-tracking branch 'upstream/master'

commit ae20565d4653243d70063000642ea6cb3e16ad8b
Merge: b691a162f7 c7333d5a30
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 30 13:15:12 2019 -0400

    Merge pull request #5286 from VOREStation/upstream-merge-6154

    [MIRROR] Sif Trees and Icon Scaling

commit c7333d5a30bbed0fbe5c7f763a9b817968bb8895
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 30 13:04:41 2019 -0400

    Conflict Resolution

commit 0f31ca3baa94acdb5f4da23ec87319decdaa9e1d
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 30 12:36:09 2019 -0400

    Purges remaining mapped in stats

    What it says on the tin.

commit e9cc1e48ab5309e8705d857cba9e0d2f25b8ca58
Author: Ketrai <arthur.lambrechts.student@gmail.com>
Date:   Wed May 29 22:37:59 2019 +0200

    Adds lobsters and cuttlefish

commit b691a162f7d66dfa1c0bb3d02328322a1b03a76c
Merge: eb5b57286d bd9205c557
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 18:45:35 2019 -0400

    Merge pull request #5289 from VOREStation/upstream-merge-6180

    [MIRROR] Attempts to fix issues with Timer SS

commit bd9205c557ad1a63c8893a38ddb295266f8d7487
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 15:40:22 2019 -0400

    Attempts to fix issues with Timer SS

commit 9dfbe5500cb562b4a7f1e510a41397570c7422a1
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 28 15:40:05 2019 -0400

    Merge pull request #6180 from Novacat/nova-alerts

    Attempts to fix issues with Timer SS

commit eb5b57286df628488e8fa921e0de3ca13c53ab2d
Merge: bb60e35d14 26626b6d48
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 15:31:51 2019 -0400

    Merge pull request #5288 from VOREStation/upstream-merge-6169

    [MIRROR] Ports Radial Menus

commit bb60e35d14116136aee5b12ffb5aa9d6f0ce28f6
Merge: fd340b1104 dfe74c59b7
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 15:19:49 2019 -0400

    Merge pull request #5287 from VOREStation/upstream-merge-6182

    [MIRROR] No More Pre-Roundstart Events

commit 26626b6d48dd7efd796179898e4dde7d65c4b0f0
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 14:25:49 2019 -0400

    Ports Radial Menus

commit f5f20628fdd6e35c251f98269659df7511be6f00
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 28 14:25:17 2019 -0400

    Merge pull request #6169 from GeneriedJenelle/patch-1

    Ports Radial Menus

commit dfe74c59b791f9e063cdf3935cd2900ff8406072
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 14:24:35 2019 -0400

    No More Pre-Roundstart Events

commit 914fc74a7abe0f22ba00ef0fbe7cbf35a899fd9d
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 28 14:23:54 2019 -0400

    Merge pull request #6182 from mistyLuminescence/eventroundstart

    No More Pre-Roundstart Events

commit fd340b11049ebbb3b460a5d6f19d6a0a29063cad
Merge: 3d40c4f38c fd5fea1a2e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 14:03:36 2019 -0400

    Merge pull request #5285 from VOREStation/upstream-merge-6178

    [MIRROR] Fixes href exploit with whitelisted species

commit 3d40c4f38c45ed77392257b89bbaedd3aaaba71f
Merge: 1f159c8de7 3cae3c4cdc
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 13:57:24 2019 -0400

    Merge pull request #5284 from VOREStation/upstream-merge-6176

    [MIRROR] Fixes graveyard drones becoming antag

commit 1f159c8de7f2ac0f3c45512d263bbf1a0a6990c9
Merge: 8b67854044 2d0e6f6cae
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 13:56:35 2019 -0400

    Merge pull request #5283 from VOREStation/upstream-merge-6177

    [MIRROR] Makes Morpheus - Skeleton Crew slightly less terrible.

commit 8b6785404404834163c56936a88ba1b117438cc2
Merge: 234cc4febf f6e6c44158
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 13:54:26 2019 -0400

    Merge pull request #5282 from VOREStation/upstream-merge-6175

    [MIRROR] Fixed mining drill brace deconstruction issue

commit 234cc4febf66aa36b45f97fd3bbe43212a02a6bb
Merge: 8cb81959d0 4094689e11
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 28 13:44:05 2019 -0400

    Merge pull request #5281 from VOREStation/upstream-merge-6172

    [MIRROR] Makeover Kit

commit f78a4e1dc805e2e7afb1aa00f34493c022182acc
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:21:22 2019 -0800

    Sif Trees and Icon Scaling

commit fd5fea1a2e5d2405a8e31e8893d294b8a1da7250
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:13:14 2019 -0800

    Fixes href exploit with whitelisted species

commit 3cae3c4cdc0741600c1a4b899a1e78af9e96532c
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 13:12:55 2019 -0400

    Fixes graveyard drones becoming antag

commit 0a8c048eb6ab51984bf795c120007b160b02c620
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:11:22 2019 -0800

    Merge pull request #6176 from GeneriedJenelle/patch-2

    Fixes graveyard drones becoming antag

commit 2d0e6f6caeda1888e69fdd65d04f16046f671c87
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 13:12:42 2019 -0400

    Makes Morpheus - Skeleton Crew slightly less terrible.

commit 79442be845a9707c0d2dbd5c8b60b31f0f0ce099
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:12:24 2019 -0800

    Merge pull request #6177 from SubberTheFabulous/master

    Makes Morpheus - Skeleton Crew slightly less terrible.

commit f6e6c44158bf8d1031f79127c701db87dc3997aa
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 13:11:27 2019 -0400

    Fixed mining drill brace deconstruction issue

commit 4cde759face054621338a842fca6626ba9a68a00
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:10:49 2019 -0800

    Merge pull request #6175 from Heroman3003/braceself

    Fixed mining drill brace deconstruction issue

commit 4094689e118754c90bc05d0d61d139a7e986577f
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 28 13:10:09 2019 -0400

    Makeover Kit

commit ef4c7b6601ea8d784942be03bdfe5c1c01339dfe
Author: Atermonera <atermonera@gmail.com>
Date:   Tue May 28 09:09:12 2019 -0800

    Merge pull request #6172 from mistyLuminescence/contacts

    Makeover Kit

commit 316f4754cb262d9da6c75564f9cefb5bcd382398
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 28 12:42:15 2019 +1000

    Fixes restriction

commit 43cad962c6304ce8a6541d903dcba8e7bd92fa0e
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 28 12:21:13 2019 +1000

    More adjusting

commit 7ef057227c718290c0847015d83a7b4aaae133d6
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 28 12:13:55 2019 +1000

    Access fixes for carogopacks

commit 8cb81959d0b6bda3ca182ef29ee74ee2688acebf
Merge: 402fb8418b 2071f9273e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 13:42:48 2019 -0400

    Merge pull request #5278 from Novacat/nova-heterochromia

    New Modular Computer Sprites

commit 2071f9273eecc9741c2603c972b71a865031b1fd
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:15:51 2019 -0400

    Allows Benches/Racks to support laptops

commit 34547c328251fa0571c6362d91dd530b58ba244a
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:09:31 2019 -0400

    Adds some differences for rugged laptops

commit 7515df6187d982bbf37226582542c7965d18211b
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 12:01:00 2019 -0400

    Another new sprite

commit 63fff025bbd0ea863c0be3beb2399ba244fe8929
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 11:22:33 2019 -0400

    New Modular Computer Sprites

    - New laptop sprite, currently only used for the elite model
    - New console sprite that matches pre-existing consoles

    Also fixes a bug with Pathfinder spawning

commit 402fb8418be06e36e6bb953b374e44ad54b43f35
Merge: 50debef580 04341df092
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 01:12:00 2019 -0400

    Merge pull request #5275 from Novacat/nova-basicfixes

    Timer SS Fix Part two

commit 04341df092e6f344547b9802417ea69a749e0846
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 27 01:02:39 2019 -0400

    Timer SS Fix Part two

    Update of Polaris PR

commit 50debef580710ec407d953a205ab596912be78dd
Merge: 9f1d75cdd0 d13e8ee784
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 27 00:08:24 2019 -0400

    Merge pull request #5274 from Novacat/nova-basicfixes

    Critical Fixes

commit d13e8ee78418d42b18a6ed8cbe291d0089ee31d3
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sun May 26 23:58:56 2019 -0400

    Critical Fixes

    - Fixes HREF Exploit
    - Replaces Timer Subsystem with a Bay port in a desperate attempt to fix the timer SS crashes
    - Port of https://github.com/PolarisSS13/Polaris/pull/6180 and https://github.com/PolarisSS13/Polaris/pull/6178
    - Fixes #5272

commit fe8e58244fb209df93a10ec89fbb80d8484b69ce
Merge: 923196a56b 9f1d75cdd0
Author: TheFurryFeline <joshuaponzo@gmail.com>
Date:   Sun May 26 14:18:40 2019 -0400

    Merge remote-tracking branch 'upstream/master'

commit 9f1d75cdd054f381759c2bd7762e49e1bcd30fb2
Merge: 2878a8873d 10a1f2f0ed
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 24 02:12:59 2019 -0400

    Merge pull request #5268 from VOREStation/upstream-merge-6084

    [MIRROR] Borers TLC 1

commit 10a1f2f0ed252edec3e066ad70f816c7e4363eab
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 24 02:04:10 2019 -0400

    Update borer.dm

commit 38e657c83f343c981949930e695288abcd2a2276
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 23 23:01:21 2019 -0700

    Borers TLC 1

commit 2878a8873ddb527384d2a33414ce78ab39bdc86d
Merge: 529c0381bb de395726ad
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:52:24 2019 -0400

    Merge pull request #5265 from VOREStation/upstream-merge-6170

    [MIRROR] Big Bugfix Bonanza

commit de395726ad3a855f2a53b24ec672f1ddf27720e3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:38:01 2019 -0400

    Grumble grumble code standards grumble grumble

commit 64690a85404391dcf76bea7ea4be438512a3636d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 23 13:29:49 2019 -0400

    Update medical.dm

commit 42cc20278e0f77cd62f49ae5005ef800856aa92f
Author: mistyLuminescence <32139558+mistyLuminescence@users.noreply.github.com>
Date:   Thu May 23 17:58:29 2019 +0100

    Big Bugfix Bonanza

commit 529c0381bb9f06ecea01e8634d6a211b1b959e29
Merge: f5fae59be0 649cc9b355
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 21 20:44:12 2019 -0400

    Merge pull request #5263 from VOREStation/upstream-merge-6038

    [MIRROR] Sif Animal Expansion 1

commit 649cc9b355d0caf07206bcd18136c308dcba3328
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 21 20:32:31 2019 -0400

    Update vorestation.dme

commit 7a35723d8550df7803549caf951118144dd66a21
Author: Mechoid <Mechoid@users.noreply.github.com>
Date:   Tue May 21 16:57:34 2019 -0700

    Sif Animal Expansion 1

commit f5fae59be0dab234ee72f2e72fc9edd40e7ec98f
Merge: 49a11c302b 64d6a63f60
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 20 20:04:48 2019 -0400

    Merge pull request #5254 from VOREStation/upstream-merge-6166

    [MIRROR] Lets sec people carry holoprojectors in their belts

commit 64d6a63f607d38261287ba8290dbf637c1ce5b04
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 20 18:43:52 2019 -0400

    Lets sec people carry holoprojectors in their belts

commit 5ed3916de364af9e9bafb79ab7f2762faf9e68a7
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 20 18:43:11 2019 -0400

    Merge pull request #6166 from Sebbe9123/fixholoprojectors

    Lets sec people carry holoprojectors in their belts

commit 49a11c302b64f8bd1621dcc975bdcd6699476912
Merge: f57ab4695a 081e3f608f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 19 18:03:29 2019 -0400

    Merge pull request #5245 from VOREStation/upstream-merge-6167

    [MIRROR] Fixes some bugs with laptop

commit 081e3f608f6d689acddb43ceb994027b01db6544
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 19 17:24:10 2019 -0400

    Fixes some bugs with laptop

commit 3e1555c4f8c62fdbf95ae0ef0c5b759e51c8dc24
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 19 17:23:08 2019 -0400

    Merge pull request #6167 from Heroman3003/laptop-bugfixes

    Fixes some bugs with laptop

commit f57ab4695a88cce5ed9bfc2a3db24c64460e072a
Merge: 790c403f80 ed8cdf33dc
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 19 16:48:19 2019 -0400

    Merge pull request #5244 from Heroman3003/addition

    Fixes copypaste mistake

commit ed8cdf33dca2fb2d66471a5fd2a7f92566171322
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 20 05:59:14 2019 +1000

    fixes copypaste mistake

commit 790c403f80dbf052dbb84b084c3199400cc889d8
Merge: 6cbbadc35c 31b00729e9
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Fri May 17 06:43:40 2019 -0400

    Merge pull request #5238 from Heroman3003/Orefixes

    Adds new ores to Virgo 3b and 2

commit 31b00729e95d38b247f6c40efb93aa9100bc637f
Author: Heroman <alesha3000@list.ru>
Date:   Fri May 17 17:43:31 2019 +1000

    Adds new ores to Virgo 3b and 2

commit 6cbbadc35c15e425a40f8726583390e8f9935329
Merge: 1768e1a2fa 153a7f26f2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 16 02:48:47 2019 -0400

    Merge pull request #5235 from Heroman3003/timefix

    Adds facial checking to timeclock

commit 153a7f26f2e49c3c52f130766302c17270f8236e
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:37:28 2019 +1000

    Adds mind role change

commit 1768e1a2fa959101b6374de7d5df837fdd511461
Merge: 110d0a721a da0762221e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 16 02:34:15 2019 -0400

    Merge pull request #5234 from Heroman3003/alarmfix

    Fixes excess alarm under a door

commit 8ab2abe1510bf060bf4767dcea6f62a7d524c56d
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:29:07 2019 +1000

    Adds favial checking to timeclock

commit da0762221e9a9947aaca817dbae06ed16907bdb5
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 16:07:24 2019 +1000

    Fixes excess alarm under a door

commit 110d0a721af2c055684a341ec40b854e22fbed21
Merge: 6a8ce254df ba420b4ff6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 15 18:44:57 2019 -0400

    Merge pull request #5231 from Heroman3003/awoofix

    Fixes Natje's custom item

commit ba420b4ff60798c1da4c1681f06c78c00728d6bc
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 16 06:05:06 2019 +1000

    Fixes Natje's custom item

commit 6a8ce254df511e4ed11627decb1b7b1d3f5c2375
Merge: 4cb0f34bbf 7b3e62e571
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 15 15:53:00 2019 -0400

    Merge pull request #5230 from InterroLouis/smooth-tail

    Smooth Tail Port

commit 7b3e62e571a71ff7ec5c3e1b12679dd5ef466279
Author: InterroLouis <sielertd@gmail.com>
Date:   Wed May 15 13:26:33 2019 -0400

    Add files via upload

commit 07878d01c41de8a7e45654372cb3c9ef3838e0e9
Author: InterroLouis <sielertd@gmail.com>
Date:   Wed May 15 13:24:29 2019 -0400

    Add files via upload

commit 4cb0f34bbf743ce922f7a7be04e892532ae9d40c
Merge: 9b291fa5b2 53cc4c91e5
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:34 2019 -0400

    Merge pull request #5227 from VOREStation/upstream-merge-6072

    [MIRROR] [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit 9b291fa5b2b7e3537d2b204645729edb42f7ca41
Merge: f39068dd19 91a132234f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:14 2019 -0400

    Merge pull request #5226 from VOREStation/upstream-merge-6160

    [MIRROR] Fixes access restrictions for com&com MC program

commit f39068dd1994748565814ab031bc41c1bc6e0f7b
Merge: 61561e722c 09dedeb6c9
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 14 00:01:06 2019 -0400

    Merge pull request #5225 from VOREStation/upstream-merge-6152

    [MIRROR] Restricts alarm monitor MC program access to engineering

commit 61561e722ca0023443d0b2b80bd5fdaeb759ddf9
Merge: 8b49495789 ad5fa6c7e3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 23:13:21 2019 -0400

    Merge pull request #5224 from VOREStation/upstream-merge-6153

    [MIRROR] Restricts camera access on MC

commit 8b494957891b9be3c0ba5c6b62fde920fa8928cf
Merge: 53cba90f97 7086803485
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 23:04:35 2019 -0400

    Merge pull request #5223 from VOREStation/upstream-merge-6165

    [MIRROR] Fixes error with #6164

commit 09dedeb6c9d64c55999a809a91f2fc41effd471f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:57:31 2019 -0400

    Update alarm_monitor.dm

commit 53cc4c91e5e5954267006da062b5ef64df626bf1
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 13 22:57:23 2019 -0400

    [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit f830985d386075216075ac7c11e98876366028e9
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:56:04 2019 -0400

    Merge pull request #6072 from Mechoid/Start_Conversion_To_Good_RNG

    [RNG is the new RNG] Converts a bunch of events to the Game Master datum system.

commit 91a132234fd73da288f87ad922991dc0a0f40351
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Mon May 13 22:57:13 2019 -0400

    Fixes access restrictions for com&com MC program

commit fb5a2f1904063c64f67140d6e1e0afbe30ae5fbf
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:56:31 2019 -0400

    Merge pull request #6160 from Heroman3003/commod-fix

    Fixes access restrictions for com&com MC program

commit ad5fa6c7e386f5526d43a76b96242413cc2bedba
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:57:06 2019 -0400

    Update camera.dm

commit d95b7fda42b708280e051c84149ce28273d86bf2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:56:41 2019 -0400

    Update camera.dm

commit 53cba90f975d8f40e7c3416466e0d3856192e686
Merge: 84d3652869 69d1e97d2e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:56:01 2019 -0400

    Merge pull request #5222 from VOREStation/upstream-merge-6164

    [MIRROR] Ports character setup subsystem from Bay.

commit 74aa8184bf7af8918aa86c7da31f21d444b8f3ac
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:55:10 2019 -0400

    Restricts alarm monitor MC program access to engineering

commit 31174cee2dfcbd11b3eda04b3e3539acbae3d42c
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:55:18 2019 -0400

    Restricts camera access on MC

commit 7086803485ca24d0aee07ac70e32c3599ba00bde
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:54:18 2019 -0400

    Fixes error with #6164

commit 69d1e97d2ebe90ae6c8d907ecf9f7b609cb5e75d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:43:00 2019 -0400

    Update character_setup.dm

commit 842f3a63ae9d7b7a0b31eefa6ab14b7af82b5bb2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:42:45 2019 -0400

    Update vorestation.dme

commit 318a2f3d0988f115fc712d7c834ac87bd2d203dc
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Mon May 13 22:38:41 2019 -0400

    Ports character setup subsystem from Bay.

commit 84d36528697ba974000d96e65aa713be4fd69466
Merge: 4a50930008 6f80f45eed
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 22:36:21 2019 -0400

    Merge pull request #5221 from Heroman3003/charsetup

    Ports character setup subsystem from Bay

commit 6f80f45eed48a0d478cc63682605243502a31a10
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 14 11:48:34 2019 +1000

    Ports character setup subsystem

commit 4a509300081474e7bf67e7241e412b1fa1cc53ce
Merge: 7f6e124502 b99afcd201
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 13 20:11:25 2019 -0400

    Merge pull request #5220 from Heroman3003/turretfix

    Fixes turrets in ai core

commit b99afcd201d3a8d9b0b6877da76b3673be6d9662
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Tue May 14 09:57:16 2019 +1000

    Fixes turrets in ai core

commit 7f6e12450246c9a5a256806d8bdf21c546820c84
Merge: e6a7027d96 87f9c19fd6
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 17:12:24 2019 -0400

    Merge pull request #5218 from Heroman3003/jobslotsareamess

    Changes timeclock jobslot filling

commit 87f9c19fd69d1ac7052d52c23250f57d58a6928e
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 13 07:01:19 2019 +1000

    Changes timeclock jobslot filling

commit e6a7027d967b7cb33ad5fa4634b642d9c93fe137
Merge: c1f9a97767 a3fbc7c710
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 15:27:20 2019 -0400

    Merge pull request #5217 from VOREStation/upstream-merge-6161

    [MIRROR] Fixes access restriction for MC atmos control

commit a3fbc7c7107a1012ddffe71ff1669a4489128203
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 12 13:57:34 2019 -0400

    Fixes access restriction for MC atmos control

commit d1c953fb0e91dd139a4ae245dfdd4c598a2350f1
Author: Anewbe <matthwledder@gmail.com>
Date:   Sun May 12 12:56:22 2019 -0500

    Merge pull request #6161 from Heroman3003/atmosaccessfix

    Fixes access restriction for MC atmos control

commit c1f9a977673a03a1df917b04d0f8dcf14065fd41
Merge: 08243a95df 8d24173567
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 12 10:45:26 2019 -0400

    Merge pull request #5209 from Ketrai/master

    Overhauls Fennix Tail.

commit 8d24173567f6eba5732a97e545b6d0048b3f3550
Author: Ketrai <zottielolly@gmail.com>
Date:   Sun May 12 10:28:43 2019 +0200

    updates tails_vr to make sure there's no xeno tail fuckery.

commit 08243a95df3907a8218988a05a412430d1f31ea5
Merge: 7322cbf7fb 4fa1c7e51b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 18:00:04 2019 -0400

    Merge pull request #5214 from Novacat/nova-heterochromia

    Enables Pilot Blue Voidsuits

commit 7322cbf7fb7717ec289897874145a47b1b822b93
Merge: 1c19844bc0 25585908b3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:59:16 2019 -0400

    Merge pull request #4906 from Sebbe9123/Disbot

    Adds new robit, to discourage facetanking.

commit 1c19844bc06911431f6f3a89661871c0338297f2
Merge: 9805cfb3a8 1e662f11d3
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:54:28 2019 -0400

    Merge pull request #5216 from Heroman3003/accessfix

    Fixes access on research windoor

commit 25585908b356d1e7ffe5aa3d5d1cdf7c59775f36
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:49:24 2019 -0400

    Switches to Expired Medicine

commit 1e662f11d33bd3b489b115b3ca943c5ef8aa7b0d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 12 07:43:14 2019 +1000

    Fixes access on research windoor

commit 9805cfb3a8396fd4dc98d91e7d2d3ef75e051134
Merge: 65093ca49e 1050d422c7
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 17:37:02 2019 -0400

    Merge pull request #5215 from VOREStation/upstream-merge-6162

    [MIRROR] Fixes smasher recipies being microwave ones

commit 1050d422c7263b07c315fbe07f6e25cfeaa8a35a
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sat May 11 16:04:54 2019 -0400

    Fixes smasher recipies being microwave ones

commit 994e12e1d20ea841c6ed035b9710d2a4f113908a
Author: Atermonera <atermonera@gmail.com>
Date:   Sat May 11 12:04:20 2019 -0800

    Merge pull request #6162 from Heroman3003/smashing

    Fixes smasher recipies being microwave ones

commit 4fa1c7e51b4d995a4804db3293ef20edd64f87c8
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sat May 11 14:06:09 2019 -0400

    Enables Pilot Blue Voidsuits

    Can be found in Pilot Suit Cycler

commit 65093ca49e6ac93cfd815630363401054916b757
Merge: 928bbbbee7 362f55f27f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 11 00:44:57 2019 -0400

    Merge pull request #5212 from Heroman3003/fixforrobo

    Fixes missing stuff in robotics

commit 362f55f27f73e841e33223c3a8339519f509265f
Author: Heroman <alesha3000@list.ru>
Date:   Sat May 11 14:34:03 2019 +1000

    Fixes missing stuff in robotics

commit 6166207bd60329efed8344cfbb7e4a0ad0a46654
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 11:29:40 2019 +0200

    Fixes three pixels to make back sprite work with boots

commit 83c3c607981b03024d0d530d3173a280b3ea2d04
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 10:50:35 2019 +0200

    Adds the new tail to selection.

commit d488bb59c0da24e6536ee78d3b5ed227ae56f1db
Author: Ketrai <zottielolly@gmail.com>
Date:   Fri May 10 10:45:58 2019 +0200

    Re-adds old tail, remove swish, speed up.

commit 928bbbbee7763927b79032957326c06354492076
Merge: 6cceb5a3fc 6de8eab14b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 16:51:51 2019 -0400

    Merge pull request #5210 from VOREStation/upstream-merge-6159

    [MIRROR] Allows objects to be made uncatchable

commit 6de8eab14bf558fe5d47210ccff53603bfd4ddda
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Thu May 9 16:40:23 2019 -0400

    Allows objects to be made uncatchable

commit abd1b97d1097c76f4d448de077ca1fbe03cf1a8e
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu May 9 16:39:19 2019 -0400

    Merge pull request #6159 from Heroman3003/youcantcatchme

    Allows objects to be made uncatchable

commit 3ca15cccc744cf43d5d70fa045515c2a36563df8
Author: Ketrai <zottielolly@gmail.com>
Date:   Thu May 9 22:21:36 2019 +0200

    Updates middle sprite

commit 0cb2e5a44a462c92e582db4399623fb3721ee8b5
Author: Ketrai <zottielolly@gmail.com>
Date:   Thu May 9 22:04:25 2019 +0200

    Add files via upload

commit 6cceb5a3fcda199c3af6e629bcdb299913548925
Merge: b13068670d a64b6b9ffd
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 16:00:19 2019 -0400

    Merge pull request #5203 from Heroman3003/astolfo

    Adds Astolfo hairstyle

commit a64b6b9ffd89cb830a7fd691bae211a0dcbd0506
Author: Heroman <alesha3000@list.ru>
Date:   Fri May 10 05:42:13 2019 +1000

    Fixes pixel misalignment

commit b13068670d5d7fe3f2294b1d49120cfd459419f8
Merge: a174fdb084 8dd3039217
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:54:26 2019 -0400

    Merge pull request #5208 from VOREStation/upstream-merge-6158

    [MIRROR] Fixes bug with custom laptops/tablets

commit 8dd30392171b92a299bf78a80817529c0b7e8e7c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:43:15 2019 -0400

    Update loadout_utility.dm

commit 0b8648a0b1c9ece6a4ec6415d1b4182a6aaf711e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 13:42:09 2019 -0400

    delet conflicts

commit 445923d6993c018b28dca0769831221cfdd8317b
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 9 09:04:46 2019 -0800

    Fixes bug with custom laptops/tablets

commit a174fdb084ec3302cbde7c39c95d4fc37e3aaddf
Merge: 7a5efc3fcf 02ad80db1f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 07:02:31 2019 -0400

    Merge pull request #5207 from Heroman3003/mapfixes2

    Fixes some map bugs

commit 02ad80db1ff1925b960cacc6a9dfc0f41942338c
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 18:40:12 2019 +1000

    Fixes more bugs

commit 743af76d697b3642536ca878f8c9733e038e23c1
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 18:09:20 2019 +1000

    Fixes some map bugs

commit 1a9cfe3be65cf0c0bc48fda5647e7faed965c03f
Author: Sebbe <sebbeblind@gmail.com>
Date:   Thu May 9 09:43:36 2019 +0200

    fixes complaints after bored hiatus

commit 7a5efc3fcf54200a2586e6c276072a148531751e
Merge: 785a610b09 512a898b70
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 9 00:55:37 2019 -0400

    Merge pull request #5206 from Heroman3003/decalening

    Fixes some missing decals

commit 512a898b706368310b0c6e02cccff972f4fe76ef
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 14:35:54 2019 +1000

    Fixes decals near chem lab.

commit adfd70e04e7a811964be6a32d8af3e5274cf944a
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 14:30:49 2019 +1000

    Fixes some missing decals

commit 785a610b093432a68f9d639d7ff1736a9a5303d3
Merge: a2c9f29648 12ef6cd3d9
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Wed May 8 18:51:12 2019 -0400

    Merge pull request #5205 from Heroman3003/smesfix-2

    Fixes SMES outputting (again)

commit 12ef6cd3d986868c02dee4d49621f97306204fcb
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 08:22:39 2019 +1000

    Fixes outputting again

commit ad21685c864f15a7e1edbdba95e508fc7fe0def0
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 9 07:47:32 2019 +1000

    Adds astolfo hairstyle

commit a2c9f296481d1a741ca0058a12570158ac66d6a2
Merge: d9ea21c156 f8cf1be42f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 7 18:10:42 2019 -0400

    Merge pull request #5202 from VOREStation/upstream-merge-6156

    [MIRROR] changelog

commit d9ea21c1565cc5a38e8a4b265dcaa85cd2731f4d
Merge: 857c84e9a4 ec107e005e
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Tue May 7 18:10:33 2019 -0400

    Merge pull request #5201 from VOREStation/upstream-merge-6157

    [MIRROR] Makes roundstart spawn spots choose random one

commit f8cf1be42fe7a579ebd26752e6bcb9e3662d851e
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 7 17:07:09 2019 -0400

    changelog

commit 1d7564523ec4d313b817b73331f20fe72ffe1238
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 7 17:06:05 2019 -0400

    Merge pull request #6156 from Atermonera/changelog

    changelog

commit ec107e005e797db7934006876389b35f0ce9c32c
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Tue May 7 17:06:55 2019 -0400

    Makes roundstart spawn spots choose random one

commit d9cd96810728a6abc9d428587cc65245ac981f3b
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Tue May 7 17:06:36 2019 -0400

    Merge pull request #6157 from Heroman3003/landmarkening

    Makes roundstart spawn spots choose random one

commit 857c84e9a476c80e83991bd8bf7438f7e0fbea94
Merge: a81595e3b0 79c44fd68c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 18:22:31 2019 -0400

    Merge pull request #5197 from Heroman3003/landmarkening-3

    Fixes some landmarks in medical

commit 79c44fd68ccaff55d37bf77e5831af06d4f49f40
Author: Heroman <alesha3000@list.ru>
Date:   Tue May 7 06:46:18 2019 +1000

    Fixes some landmarks in medical

commit a81595e3b04fa083fb87cda18506c6fee9131e88
Merge: 3ec181dace 31d7663bf1
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:47:49 2019 -0400

    Merge pull request #5196 from VOREStation/upstream-merge-6113

    [MIRROR] Fishing!

commit 31d7663bf1b7a556b15cd261b36e2bf4552a13db
Author: Unknown <RedKerensky@Gmail.com>
Date:   Mon May 6 14:32:18 2019 -0400

    Conflict Resolution

commit b4b5ca1eafc46051ef963f91de782290a933683c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:24:40 2019 -0400

    Update equipment_vendor.dm

commit b7761ee3efd36a6164281b3713cf288223400ef8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 14:18:39 2019 -0400

    Update Chemistry-Recipes.dm

commit 90ee680dd540029489bf31b835dfd740e71df90e
Author: Atermonera <atermonera@gmail.com>
Date:   Mon May 6 10:15:23 2019 -0800

    Fishing!

commit 3ec181dace52095349771e3d2136e886792bc0d6
Merge: 272c90f94f 5ee5142e32
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Mon May 6 01:10:49 2019 -0400

    Merge pull request #5194 from Heroman3003/landmarkening-2

    Adds more roundstart spawn landmarks

commit 5ee5142e324f17ed6b1703afb0138dcb19e4cfec
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 6 14:52:29 2019 +1000

    Adds more roundstart spawn landmarks

commit 272c90f94f02e1e8faab2f03cc493959d47d2a4d
Merge: f71bfd4bf2 2283c1051d
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 22:13:54 2019 -0400

    Merge pull request #5193 from VOREStation/upstream-merge-6146

    [MIRROR] Ports SEV Torch Accessories

commit 2283c1051dcc6069d71b43caaecdef06e8f30577
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Sun May 5 21:41:07 2019 -0400

    Ports SEV Torch Accessories

commit 66e0532e97f8734bb50f4be44d2d8affeb6c4c16
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 21:40:01 2019 -0400

    Merge pull request #6146 from Novacat/nova-alerts

    Ports SEV Torch Accessories

commit f71bfd4bf28f73a4fad9789f25537ab977aa7cb2
Merge: a8bfa80298 e7d492852c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:32:04 2019 -0400

    Merge pull request #5190 from Heroman3003/mc-opening-table

    Makes laptops require table to be opened

commit a8bfa80298731690b27ca231cdbfbdddafc5a80d
Merge: b7e5bb4461 c1263a31e8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:34 2019 -0400

    Merge pull request #5189 from Heroman3003/mc-camera-access

    Restricts access on camera program

commit b7e5bb4461507d15a79cc87daeb460e73b8bc941
Merge: aa17e3211c 6c3b174b4a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:16 2019 -0400

    Merge pull request #5188 from Heroman3003/mc-alarm-access

    Restricts alarm program to engineering

commit aa17e3211c8dd45dbc38d693d6cf6422a945aea0
Merge: 494c11cf8c f87db8cb0f
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:31:05 2019 -0400

    Merge pull request #5191 from VOREStation/upstream-merge-6150

    [MIRROR] Fixes nullspace clothes with accessories being deleted causing runtimes

commit 494c11cf8cbe52ba89d1e22f785a3fbdbc5a045d
Merge: d25fedee67 10637ec48b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:30:58 2019 -0400

    Merge pull request #5192 from VOREStation/upstream-merge-6149

    [MIRROR] Buffs adminordrazine

commit 10637ec48bc3ba4f74e1b115c5625c5035785182
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 20:06:47 2019 -0400

    Buffs adminordrazine

commit f87db8cb0f39f2c35ad4bed6538f07270f5e415b
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 20:06:57 2019 -0400

    Fixes nullspace clothes with accessories being deleted causing runtimes

commit d25fedee6776dfca3e59ee866c42424605eac653
Merge: 015c3c82b1 e73c436f0c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 20:06:52 2019 -0400

    Merge pull request #5187 from VOREStation/upstream-merge-6140

    [MIRROR] Bay Accessory Hiding Code

commit e7d492852c64389451b8d9230f1da6bf7fea98fc
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:59:49 2019 +1000

    Makes laptops require table to be opened

commit c1263a31e88697d4ef915df06aa61b22fe6ff1cb
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:55:58 2019 +1000

    Restricts access on camera program

commit e73c436f0c9eb815da653f09d7ff5e13c981a59d
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Sun May 5 19:53:56 2019 -0400

    Bay Accessory Hiding Code

commit 6c3b174b4ab4016328ac1112a6054c394d7935dc
Author: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Date:   Mon May 6 09:51:30 2019 +1000

    Restricts alarm program to engineering

commit 015c3c82b1651cd8bf2ed157e00e48f2154ec480
Merge: ea5dca3a45 f5ce8b6e0a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 18:30:33 2019 -0400

    Merge pull request #5186 from Heroman3003/empty-vendor

    Fixes empty vendomat in research storage

commit f5ce8b6e0a7c01693d54d9a4d4c1f04f847e9d9c
Author: Heroman <alesha3000@list.ru>
Date:   Mon May 6 06:12:57 2019 +1000

    Fixes empty vendomat in research storage

commit ea5dca3a45dbe09c4e4634e65a473b9f1cab6c79
Merge: 45e8f5e5b8 048760f2ea
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:32:00 2019 -0400

    Merge pull request #5185 from VOREStation/upstream-merge-6151

    [MIRROR] Ports #6039 with Virgo Fixes

commit 048760f2ea5ca8f3ec8985839291ab32e10105d2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:17:53 2019 -0400

    Update Chemistry-Holder.dm

commit 909a44ff4c2a008fc27650abdb8b861f2943e03c
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sun May 5 14:17:36 2019 -0400

    Update nanoui.dm

commit 1757c3007522a87dc7d7be737fc9a04a694d39c7
Author: Atermonera <atermonera@gmail.com>
Date:   Sun May 5 10:14:25 2019 -0800

    Ports #6039 with Virgo Fixes

commit 45e8f5e5b8162fde6f4ff893831b78afe5bfea63
Merge: 32f7057a4a 44c71b2768
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 19:52:30 2019 -0400

    Merge pull request #5184 from Heroman3003/pfofficefix

    Allows Pathfinder to reach all their stuff

commit 44c71b2768785218a8db419340003536bc44b6a9
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 09:41:33 2019 +1000

    Allows Pathfinder to reach all their stuff

commit 32f7057a4a7865f6539a27a219ad3f98bf386ff6
Merge: 4508d913f3 6d0f0fa77b
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 18:36:16 2019 -0400

    Merge pull request #5183 from Novacat/nova-heterochromia

    Fixes a MC oversight

commit 4508d913f3c061f51ff08f0796ee2bfe17467c16
Merge: 5826005ad1 ed55a2f6cd
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Sat May 4 18:33:19 2019 -0400

    Merge pull request #5182 from Heroman3003/boxfix

    Fixes Off-duty engineers and explorers spawning without survival boxes

commit 6d0f0fa77b3c8b499ace8a18c4d44e03f621015d
Author: Unknown <RedKerensky@Gmail.com>
Date:   Sat May 4 18:27:25 2019 -0400

    Fixes a MC oversight

commit ed55a2f6cdd2c07c65a15d2ea3754ac5f0dc9e97
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 08:17:51 2019 +1000

    Fixes Offduty engi and explorers spawning without survival boxes

commit 5826005ad120887dfeca43ab62c517c8ce9b4126
Merge: bc442d3886 05964dda04
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Sat May 4 15:57:49 2019 -0400

    Merge pull request #5180 from Heroman3003/maintfix

    Fixes some minor issues with new map changes

commit 05964dda044fe205313b71137663de0bdf974e9d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 04:04:25 2019 +1000

    Fixes invisible mimic

commit c287be168a5a717d4239be61743a42629e3e7bf7
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 03:51:29 2019 +1000

    Fixes some more new maint issues

commit 668c552cd54147a18c9d6a30133e6a70e89e133d
Author: Heroman <alesha3000@list.ru>
Date:   Sun May 5 03:44:13 2019 +1000

    Fixes some wires and alarms in maint

commit bc442d388633f8dd181d1836a6be8f276b074345
Merge: 3de7d4dbfa 96bdb05ee3
Author: Spades <SpadesNeil@users.noreply.github.com>
Date:   Sat May 4 12:44:08 2019 -0400

    Merge pull request #5167 from Heroman3003/research-re-do-twoaparently

    Research floor 2 and 3 redesign

commit 3de7d4dbfa056cd15e9ad442279e1931e3ee0271
Merge: 4bb7073630 dd2b696ca2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 23:18:12 2019 -0400

    Merge pull request #5178 from VOREStation/upstream-merge-6148

    [MIRROR] Removes melee damage from snacks.

commit dd2b696ca21f64b406f9a7b45ac5df31cd6b5306
Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com>
Date:   Fri May 3 21:56:22 2019 -0400

    Removes melee damage from snacks.

commit ea2860eeb34a810087429f8a2b1b3cc0256636ba
Author: Atermonera <atermonera@gmail.com>
Date:   Fri May 3 17:56:01 2019 -0800

    Merge pull request #6148 from Verkister/patch-22

    Removes melee damage from snacks.

commit 4bb707363091f977baa1bc175add320379027d2e
Merge: 4f9531d517 07b866b2f8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 18:15:37 2019 -0400

    Merge pull request #5177 from Novacat/nova-heterochromia

    Last Second Tweaks

commit 07b866b2f8ce5d8af6e15b8b2c670c59d0b06c62
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 16:32:21 2019 -0400

    Last Second Tweaks

    - Swaps trash pile money breifcase with something more balanced.
    - Adds emergency softsuit box to luxury capsules.

commit 4f9531d5179cce1e983340d31ae2aa49a33d9829
Merge: fd66d1b5f8 e191542337
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Fri May 3 04:11:02 2019 -0400

    Merge pull request #5174 from Novacat/nova-heterochromia

    Adminbus Stuff/Trash Pile Additions

commit e191542337794ead2386dc81937e5ef1f455971f
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 04:01:38 2019 -0400

    EXPLORATION VENDOR SPRITE

commit 043b15ed58a9485c20440cb093891c39d9dbd496
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 03:15:42 2019 -0400

    Removes mini translocator

commit 27565f4da99fed5a814593f647fb59b4375c7f93
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 03:06:00 2019 -0400

    Boxed emergency suits

commit 764486174299f4db2524b0e147b3e657e27d3436
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 02:34:08 2019 -0400

    ...Eh, this ended up being too strong

commit 42c5f0eaa7fb845b6b88522a913780df30720208
Author: Unknown <RedKerensky@Gmail.com>
Date:   Fri May 3 01:10:49 2019 -0400

    Tweaks Trash Pile Loot

commit fd66d1b5f85335897eade1f136cb4d771a03e1ce
Merge: 09b8cbba7c 7467509672
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 21:01:28 2019 -0400

    Merge pull request #5175 from VOREStation/upstream-merge-6147

    [MIRROR] Fixes emergency pods not working

commit 5dd8153c196c6904d4759a98f689ff4136a7c9b6
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 21:01:07 2019 -0400

    Ports Polaris PR

commit 7467509672b325734f73cede245a723ab519fe0f
Author: Atermonera <atermonera@gmail.com>
Date:   Thu May 2 16:35:05 2019 -0800

    Fixes emergency pods not working

commit eeb198d3a43f369173672d8ad15724a8c22d4d19
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 19:41:17 2019 -0400

    Metabolism effects

commit fcb2830fe5f838e860f1d8e4cbd56ccc82d7fb4e
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 19:34:35 2019 -0400

    Changes adminordrazine pill

commit 68649aeb7101f559372853ddc58d12020747de44
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:38:26 2019 -0400

    Recommended changes

commit bd08ef98aa8808de018afd37981353abb09dba88
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:27:07 2019 -0400

    Buffs adminordrazine

commit 1b1489d8cc69ea04a417920ee54b496056da0635
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 17:08:39 2019 -0400

    Adds medicíne pills/bottles for adminbus

commit 09b8cbba7cc52790fd5dbf63e872a6e2a42174da
Merge: faa007bddf 92f5e3b525
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:51:27 2019 -0400

    Merge pull request #5159 from Heroman3003/filling-up-the-underdark

    Adds a bunch of new points of interest to Underdark

commit faa007bddfb6b2c6ae5031ab3b413812b0062518
Merge: 8ccc91e03d 9717bdd8f8
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:51:04 2019 -0400

    Merge pull request #5136 from Heroman3003/solargrubs-return-bring-the-hate-in

    Solargrub hibernation season is over

commit 8ccc91e03da4e810c33d2d777d23633b77ad7a32
Merge: d852bb30b2 00acf3a5f2
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:50:43 2019 -0400

    Merge pull request #5152 from Heroman3003/exploratory-rewards

    Exploration reward vendor + minor map fixes

commit d852bb30b2b65236f30ca5c59e17b6ac91df8795
Merge: e14cbd5aa5 281cf5ab9a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 08:48:54 2019 -0400

    Merge pull request #5173 from VOREStation/upstream-merge-6121

    [MIRROR] Ports Citadel Voidsuit Sprites

commit 00acf3a5f28256e37275217aaa0ef2905a5d1419
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 18:32:37 2019 +1000

    Maps vendor in, fixes some map bugs

commit 281cf5ab9a85a60a4ceafbc7ea3aaf15601c0b6a
Author: Neerti <Neerti@users.noreply.github.com>
Date:   Thu May 2 04:31:29 2019 -0400

    Ports Citadel Voidsuit Sprites

commit 3e1e4fba2a48902d0b5033a193576e30d039aa2e
Merge: f279faf2fd e14cbd5aa5
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 18:27:37 2019 +1000

    Merge branch 'master' into exploratory-rewards

commit e14cbd5aa5b58e26f4081e6bef909675aeebd3a5
Merge: 8b81a3ef63 d22f668012
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 03:56:26 2019 -0400

    Merge pull request #5161 from Novacat/nova-heterochromia

    Miscellaneous Fixes

commit 8b81a3ef637f06b03118851b71c8bcb52ff5de46
Merge: d852713f7e d85efce19a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 03:48:37 2019 -0400

    Merge pull request #5171 from Heroman3003/pumpfix

    Fixes wrong direction of pump in security EVA

commit d22f66801218dc2f196f6644b5a8224fc307422c
Author: Unknown <RedKerensky@Gmail.com>
Date:   Thu May 2 03:47:11 2019 -0400

    Fixes Part Two

commit d852713f7e03751bc270e6eb509e305ed5323a86
Merge: 44be2d7c35 ff9e4f2e4a
Author: Novacat <35587478+Novacat@users.noreply.github.com>
Date:   Thu May 2 01:00:17 2019 -0400

    Merge pull request #5170 from Heroman3003/ooc-note-flavor-text-properization

    Makes Flavor Text properly required for joining

commit d85efce19ae7b19985dbd5dd4c3873a211046495
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:57:43 2019 +1000

    Fixes wrong direction of pump in security EVA

commit ff9e4f2e4a48b2eae68b64c3ffbd5c0cbcd50cf4
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:40:13 2019 +1000

    Makes Flavor Text properly required for joining

commit 96bdb05ee342f94e153cc4251c125b40f23d1b25
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 14:05:18 2019 +1000

    Adds blast doors to robotics-mechbay passage

commit c50b5f5596e310d6bad1719a77f7896d7e0bb427
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 21:32:17 2019 -0400

    Fixes Part One

commit 34457953cbd8f3eef8da0c76da60139543f25beb
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:55:25 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6147

commit de5f932d6e020d90a2492e759c53bb7ab9ff6b97
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:51:53 2019 -0400

    Uncomments valid code

commit 808e64c3bbdc998a1e844d7e0ad88495f34ce362
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:50:31 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6146

commit 36ec23b3774fa78255c3f3142d10f31925c28f9e
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:47:03 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6140

commit 71eff3a22937b234dd5abdecb2b37248de753a87
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 20:40:43 2019 -0400

    Ports https://github.com/PolarisSS13/Polaris/pull/6121

commit 8d5fd87b4b9c235fd29ed7e2a54db4fdc5ce0374
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 19:09:20 2019 -0400

    More Shadekin AI

commit 20a827cde8329fbfb9ec6de481ef432e7fc536bc
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 19:06:45 2019 -0400

    Adds AI for all the other shadekin types

commit 0bc49795807457637720a1bf12699a93a6518558
Author: Unknown <RedKerensky@Gmail.com>
Date:   Wed May 1 17:39:14 2019 -0400

    adds holopads to exploration

commit c7dce7e6fc06fc27f67de641fa01b57f2e3386d6
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 07:26:58 2019 +1000

    Fixed firedoor directions in hallway

commit 8262f161b4cff6bd6dc304d1a7a3741a02d31f4c
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 07:18:48 2019 +1000

    Some missed things in RD office and mapmerge

commit e49edb5046d299613d24291e1f06d5639cc88097
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 06:52:32 2019 +1000

    Wiring fix

commit e618e6b7c098cd29c75ff6a26b87b0ddc5790446
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 06:37:24 2019 +1000

    pre-test-finish

commit 92f5e3b525a2c590c4112b0b66ae82b6873ca35f
Author: Heroman <alesha3000@list.ru>
Date:   Thu May 2 05:25:19 2019 +1000

    Adjusts mecha-equipment loot table

commit 97b7a806c95f4420cd7ea7fbf0940…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Novacat @Neerti