Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 99d945107536f0acfa95cb463ff56cbf6a4e089b
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Wed Jul 14 12:34:54 2021 +0100

    fix (#16361)

commit f135593a110b6070ed5d96f7690349e179ca71bf
Merge: 712721fbc6 61f92f4953
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Wed Jul 14 06:43:08 2021 -0400

    Merge pull request #16335 from AffectedArc07/code-of-conduct-get-it

    Repository Code of Conduct

commit 712721fbc6dad795830cf177c6cf20e321f57364
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Tue Jul 13 15:27:14 2021 +0200

    [READY] Reworks and Refactors Hallucinations (#15360)

    * Hallucination rework start

    * Chaser/Attacker, Abduction

    * Moderates

    * Majors

    * saber alter

    * address SteelSlayer

    * Fix admin logging and runtime

    * put hallucination logging on ATKLOG_ALL

commit 5124f5ef7ece094408424b4c9adf3fd0e2090dda
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Tue Jul 13 08:19:41 2021 -0500

    [TGUI] Adds a HUD management UI for ghosts (#16302)

    * ghost hud panel

    * changes up UI a bit, fix conflicts

    * no resizable

commit e98d81ac46c6591a24bc610e65eccb079222a936
Merge: b6b510c2f9 c2c2794d82
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Jul 13 00:51:50 2021 -0400

    Merge pull request #15833 from McRamon/mist-shadowstep

    Mist and Shadowstep icons update (second attempt)

commit b6b510c2f9878fc213d9c103eb98cd472077258f
Merge: 78b26a4145 702500af9f
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Jul 13 00:41:05 2021 -0400

    Merge pull request #16284 from AffectedArc07/sorium-ldm-nerf

    Nerfs sorium and LDM

commit 78b26a4145fbcd25e51fe42a08156f22689f850e
Merge: 40ab95bbaf fd8e1a1a3e
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Jul 13 00:36:13 2021 -0400

    Merge pull request #15618 from TDSSS/ssu-nodrop-fix

    SSU now reject nodrop items

commit 40ab95bbaf2aee4fff097b69c951cd348d7d10cb
Merge: aca230bb7b b6f334f92f
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Jul 13 00:34:47 2021 -0400

    Merge pull request #15778 from Sirryan2002/Despookify

    Prevents Ghosts from circumventing boo spell cooldown

commit aca230bb7b8f6713cad788ac7f3e014ddba75ab8
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Jul 11 23:08:25 2021 +0100

    fixes mech RCDing indestructible walls  (#16348)

    * no just no

    * this is probably good

commit 102e42a381e4268526b7ee133b308c3cc411e337
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sun Jul 11 17:32:19 2021 +0100

    heck (#16344)

commit 61f92f495370d51378ad984d66fe874e4ee074a1
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jul 10 21:55:43 2021 +0100

    Text tweak

commit 3e8482cebbcebdb3fbfcf0b8add2996f9b344139
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat Jul 10 19:43:40 2021 +0100

    Makes machine frames show their circuit name (#15025)

    * Circuit Names Refactor

    * Some review stuff

    * now with less runtimes

    * Machine Boards and Computer Boards

    * Only a little late

    * YouTool fix

    * Resupply crate too

    * Supplycomp board

    I'll do the other stuff tomorrow

    * Computer Frame Refactor

    Plus also removing the HONKputer to avoid a conflict.

    * Don't need this diff anymore

commit 9b1eb41e58b4d19ee96a071bbcb8b26ea440086e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jul 10 12:16:03 2021 +0100

    More tweaks

commit 50ce5cbc44f3210f57de204b7acef11a5c48a9ff
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jul 10 12:03:47 2021 +0100

    Of *course* S34N has nitpicks here

commit eb8afb6f16cc87130cea6bf9ed00ae7a940589dc
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jul 10 11:48:10 2021 +0100

    Repositoy Code of Conduct

commit 9d3800b49eac0f1acb1da5a6f423f64a0e2e8564
Author: Pyrodes <68454411+Pyrodes@users.noreply.github.com>
Date:   Fri Jul 9 16:36:29 2021 -0400

    Added an arcade machine to the syndie space base (#16240)

    * Added an arcade machine to the syndie space base

    * Added an arcade machine to the syndie space base

    * Moved location of the arcade in syndiespacebase

commit 568a8b17cee8fa167f823b95af612a83a144f1aa
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri Jul 9 15:05:48 2021 +0100

    Makes all Terror spiders immune to dragging (#16325)

    * Update white.dm

    * Makes ALL spiders heavy

commit 702500af9f4580f9c26f9e15450c05e0129c6787
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jul 9 11:52:13 2021 +0100

    Fox fixes. Foxes?

commit 52e86bd0edd464f54ef9e6ac638c74bbc17f10c2
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Fri Jul 9 12:39:37 2021 +0200

    Early stage viruses no longer show on medical HUD (#16307)

commit 908c4f0dd1e49218611e2174a9aa4fc407ad23f1
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri Jul 9 11:39:01 2021 +0100

    Jobban adjustments (#16319)

    * Borer ban

    * Terror Spider jobban category

    * Defines

commit 31cec0d4de01a591798bce962adba26710f79799
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jul 9 11:38:01 2021 +0100

    Removes fungus announcement (#16322)

    * Crewmate victory

    * removes setup

commit 94f1140f236530e47051d982b8cd320fe7ca8104
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jul 9 11:29:19 2021 +0100

    Bump color-string from 1.5.3 to 1.5.5 in /tgui (#16329)

    Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.3 to 1.5.5.
    - [Release notes](https://github.com/Qix-/color-string/releases)
    - [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md)
    - [Commits](https://github.com/Qix-/color-string/commits/1.5.5)

    ---
    updated-dependencies:
    - dependency-name: color-string
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 11de88fc3b62b48b434b4d89ffc4e42cc53aa245
Author: ppi13 <rainbowdestroy@gmail.com>
Date:   Fri Jul 9 12:21:56 2021 +0200

    Borgs can't use onclick when locked stunned, weakened or paralysed. (#16028)

    * Borgs can't use onclick when locked stunned, weakened or paralysed.

    * Includes low_power_mode check

commit 9f008f3de460fef2e7bb361201d1c90b28e5bbe6
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Jul 9 11:21:20 2021 +0100

    jacobs ladder removal from tendrils (#16324)

commit 7a7364fcfd0ac8349188235006d20ff794cbe863
Author: warior4356 <warior4356@yahoo.com>
Date:   Fri Jul 9 03:21:04 2021 -0700

    Adds critical as a state to the crew monitor (#16313)

    * Adds critical as a state to the crew monitor

    * TGUI rebuild

commit b9a49292358c0f59060824d4ef1c458340380a61
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri Jul 9 11:18:05 2021 +0100

    'Fit Viewport' & Scoreboard refactor (#16294)

    * Fit Viewport V1

    * Scoreboard

    * Moderate scoreboard refactor

    Mostly just removing the global variables, since Mochi has plans for a proper big scoreboard refactor in the future.

commit 5270cd53a9c8aad39163289d21ac55bc2c910fb7
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri Jul 9 11:16:06 2021 +0100

    Logging for AntagHUD and DNR (#16293)

    * AntagHUD Logging

    * Readability

    * Persistent logging

    Surprised that `create_log()` isn't doing this already.

commit e7cf6d9f38f10eab78bbb90ca88ee2dd0c98714e
Merge: dad52950ff 41c69d9911
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Jul 8 20:25:39 2021 -0400

    Merge pull request #16252 from S34NW/sm-exploit-fix

    Fixes an SM exploit with ripleys.

commit dad52950fff1c8367cd3c864e965c36318d492ee
Merge: ddea09dce2 79fe4f7dd2
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Jul 8 20:13:38 2021 -0400

    Merge pull request #16156 from ppi13/singularity-radiation-fix

    Fixes singularity radiation not reaching rad collectors

commit ddea09dce27972956b35c8c20a8b9e994cda6460
Merge: 1d04a9ec74 8ddfe635b5
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Jul 8 19:25:23 2021 -0400

    Merge pull request #16082 from AffectedArc07/gc-improvements

    GC ref finding improvements

commit 1d04a9ec74b198250b79ae3c4a4d0e0bc500aca5
Author: Kepplerx <65926304+Kepplerx@users.noreply.github.com>
Date:   Fri Jul 9 00:18:15 2021 +0200

    AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles (#15535)

    * Update navigation_computer.dm

    * V7

    * Update navigation_computer.dm

    * All instances

    * Added explainers

    Seems this is done some places, seems nice and easier to understand with em

    * Updated name

    * Change Variable name

    Changed as per advise of Fox

commit e835205f50bcfd24407458e69b89955e6e13bade
Author: moxian <moxian@users.noreply.github.com>
Date:   Thu Jul 8 22:10:39 2021 +0000

    Alphabetize items in debug equipment selection menu. (#14641)

    * Alphabetize items in debug equipment selection menu.

    * Rename some outfits to group them together in the selection menu.

    * Farie's suggestions

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit 1455af127a56de94818226f3b7929f65c3ab4b72
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Jul 8 23:02:17 2021 +0100

    Makes Poly less confused about the engine (#15469)

    * Poly Phrases

    * More quote variety!

commit 5009e9209bbbc0b07793b0af32f28b1c638b30ce
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Jul 8 22:59:12 2021 +0100

    .g AI absorbing me (#15562)

commit 92bdb8f15967d8613a9f0ab96314d319667ec223
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jul 8 17:58:44 2021 -0400

    Makes gluon grenades use ice instead of permafrost (#15577)

    * Makes gluon grenades use ice instead of permafrost

    * Makes it only select floor turfs

commit 5ed4c3ca83208d3b85b805bf89cf99025000142b
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Jul 8 22:57:54 2021 +0100

    Loadout Instruments (#15633)

commit 04c689817ed9898575cc4f81e0f1f549f1653252
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Jul 8 22:57:08 2021 +0100

    Fire + Cloth = Bad things (#15635)

commit f8bc686abb1944c4fc7b5052660d52391b48f8b8
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jul 8 17:48:54 2021 -0400

    Adds the B.S.G (#15798)

    * Adds the 100% original and serious BSG

    * Adds sprites

    * prevents divide by zero

    * Adds to protolathe, shield from projectiles, prevents hitting through walls

    * adds sprites for inhands, pain, and suffering

    * Finished the gun sprites.

    * Adds admin version, sound effect, visual

    * moves chain to base projectile, adds shitty sprite for bsg explosion

    * Fixes it, maybe.

    * I hate merge conflicts, gun sprites are back

    * I need this, it seems.

    * re-adds sprites back

    * Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

    * Apply grammer and spaceing suggestions from code review

    Co-authored-by: dearmochi <shenesis@gmail.com>

    * Makes the code clearer, use update icon, fix shaded charge

    * Better inhands, tweaked base sprite

    * Better explosion effect, mochi suggestion, PR ready

    * Accidently removed this

    * I did not intend to put this in, I discarded this change

    * Update settings.json

    * Spelling and return removal

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Removes spawn, makes it a callback

    * Lowercase states

    Co-authored-by: dearmochi <shenesis@gmail.com>
    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit d85f2261e585a432633fc5ed66bc81324ec85f92
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Jul 8 22:35:23 2021 +0100

    Fixes firing flamethrowers when you cannot fire guns (#15935)

    * fixes

    * code review

    * code review

    * Henk review 2

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit a598acf1594943d3683802d51e87ef17de609e85
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Thu Jul 8 17:33:59 2021 -0400

    General Bugfixes + Closing Issues (#15936)

    * Prevents Species Action Icons from Duplicating

    * Spelling Correction for Igniter

    * Guardian Fixes

    * Photocopier bugfix

    * another spelling fix

    Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

    * removes redundant item_state declaration

    Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>

commit 64a0b9e83da9db9cf06ad60f9c61c72dd09bc98b
Author: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Date:   Fri Jul 9 07:33:12 2021 +1000

    Bottles and cartons now smash when thrown, breaking the container and spilling the contents over whatever is hit. This includes ones made into molotov cocktails. (#15943)

commit b949b1adc229914ae5ea7565f1889c78d1189267
Author: warior4356 <warior4356@yahoo.com>
Date:   Thu Jul 8 14:31:06 2021 -0700

    Adds sec hailers and space pod keys to sec belt (#15977)

commit 027bd7f11011c836bf8ba4352a73220357efb7f8
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Thu Jul 8 14:24:45 2021 -0700

    Mechs no longer spit out invisible air tanks. (#16075)

    * Internal tank set visible, nulled.

    * Update code/game/mecha/mecha_wreckage.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Tweaks crowbar fail message.

    * Removes unneeded line.

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 8719801295f636870411871fce3bf9505f3317cb
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Thu Jul 8 23:22:59 2021 +0200

    Bandolier stacks (#16106)

commit 8dcb2c1a0f2e61a78a44a33b40501c063b97f1a1
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jul 8 17:20:32 2021 -0400

    Prevents final summon rune by being cleaned by normal methods (#16224)

    * Prevents final summon rune by being cleaned by normal methods

    * Makes it a proc

    * Moves cleanable, makes it work with space cleaner

commit 3724eb3ef06f3828d946e763ceea79855279a84f
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Thu Jul 8 22:16:44 2021 +0100

    Refactors AI slipping machines (#16265)

    * refactors AI slipping machines

    * spans

    * Update code/game/machinery/ai_slipper.dm

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

commit 3dace390607b1d19b322ff02b73810282c01a224
Author: theo-3 <85434590+theo-3@users.noreply.github.com>
Date:   Fri Jul 9 00:11:50 2021 +0300

    Prevent AIs from seeing the syndicate test lab (#16326)

commit 3f6eac48d17fcf336b1e2e21a12f56ee92b5abf5
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Wed Jul 7 19:22:49 2021 +0100

    Fixes getting TK abilities when you shouldn't (#16300)

    * fix

    * oops

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * review

    * oops

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit 16f07cf9f474f51e6db1a976e85c5ac2d7a3158c
Merge: f5af21b794 c4435b1aaf
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Wed Jul 7 09:58:29 2021 -0400

    Merge pull request #16292 from AffectedArc07/cleans-up-ban-logging

    Refactors ban logging

commit f5af21b79413a417c4d5b04d8a6e2a3faaeca019
Merge: 4f269afb07 4fa871136f
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Wed Jul 7 09:57:16 2021 -0400

    Merge pull request #16213 from AffectedArc07/nukes-awful-code

    Removes some oldcode

commit 4f269afb071285a8503f0eb2ade0e0152e7edd9c
Merge: 2ee7413197 9f963ffd22
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Wed Jul 7 09:56:06 2021 -0400

    Merge pull request #16221 from AffectedArc07/map-render-config

    Improves our map rendering

commit 2ee7413197191e1d023ca44bd3cede27fc6f8196
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Wed Jul 7 14:50:28 2021 +0200

    Sanitizes incoming Discord PMs (#16321)

commit 1ab701e7312dd33c279828f899839e932200709f
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Tue Jul 6 21:56:12 2021 +0100

    fix (#16316)

commit 7c505d93d91b52f3e0df5e63498081ac3f6816d6
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Mon Jul 5 13:18:20 2021 -0500

    Fixes a couple things related to miner borg upgrades and kinetic accelerator modkits (#16306)

    * miner borg upgrade fix

    * re-add check

commit 22b83565d27e1a5164af8f2ecc6350c4bf37b359
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Mon Jul 5 18:28:18 2021 +0100

    damn rogue characters (#16309)

commit 3efc77a9e8551ce5a44a3ec4b0dc172c12736eb1
Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com>
Date:   Mon Jul 5 13:27:53 2021 -0400

    fixes spelling error. (#16308)

commit b6f334f92fe0090d96123c412ee16663784807e8
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Sun Jul 4 23:44:44 2021 -0400

    applys correct fix

commit f9ef6a6d385e979f5b7b7176510623339f1df5b4
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sun Jul 4 12:01:47 2021 +0100

    Observation Console Fix (#16296)

commit f4e07cd148125b297acf83e1c0d6e9d7ee64c47b
Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com>
Date:   Sun Jul 4 06:42:54 2021 -0400

    Fixes a glaring grammatical error in the matter bin's description.  (#16299)

    * How did this get past S34N?

    * Round 2, cleanup

commit 6121d4277628245251dc74f273168ac74e0193c2
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat Jul 3 06:23:29 2021 -0400

    Makes chameleon belt have the same name / desc as a tool belt (#16290)

commit c4435b1aaf5ad96f147b6c0f142c8c80249f5a44
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jul 3 11:20:45 2021 +0100

    Refactors ban logging

commit 1b1f49ac8157ca740f1539746bd591b54a9dc824
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Fri Jul 2 16:32:45 2021 -0400

    Adds the Emergency Extraction Flare (#16220)

    * Adds the Emergency Extraction Flare

    * removes extra message

    * Apply suggestions from code review

    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

    * Apply suggestions from code review

    Co-authored-by: dearmochi <shenesis@gmail.com>

    * All I ever get, is a pain in the ash... :musical_note:

    * Affecteds requests part 1

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Use populate_contents

    * Update code/modules/mining/equipment/wormhole_jaunter.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
    Co-authored-by: dearmochi <shenesis@gmail.com>
    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 7e16877a2e89628d4b20a76164c971593cf051c5
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Jul 2 20:46:32 2021 +0100

    Adds radial menus to blood rites (#16118)

    * radial menu

    * new sprite

commit 15b7a76c91bd649cfa82efa3fb2d391ed41ffc9b
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Fri Jul 2 14:39:58 2021 -0400

    Fixes syndicate teleporter saving throw bug (#16287)

commit 5a0eafb0a82dbff0b04f6f5a721057de29fc151c
Author: Vallidian <jetbujason@gmail.com>
Date:   Fri Jul 2 13:00:32 2021 -0400

    Adds adminfreeze drink (#15976)

    * Adds adminfreeze drink

    Adds a drink similar to Antifreeze called Adminfreeze as a bit of a meme. Requires an upgraded booze machine or a bottle of Nothing, ether from medbay, and some heat to create.
    2 counts Vodka, 1 count Nothing, 1 count Ether.

    * Removed BWOINK from taste description

    Audio cue happens when mixed already.

    * Updated adminfreeze drink

    Changed sprite to not have the ADMIN on the side.
    Changed the recipe to include a more difficult mixture.
    1 count neuro-toxin, 1 count toxin special, 1 count fernet, 1 count moonshine, 1 count morphine

    Adds a freeze effect and lowers body temp each sip.

    Increased the alcohol percentage to 1.5 from .9

    * reverted adminfreeze sprite to include ADMIN

    After updating the recipe to make it harder to create, and popular opinion. Readded the ADMIN text to fully embrace the meme drink.

commit 4fa871136f2fb515c22676275717e50012b2c45e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jul 2 17:24:14 2021 +0100

    Sabre suggestion + Runtime fix

commit 38fdfa5813dcb00160dbc060b1429d504ea7e72d
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jul 2 16:55:53 2021 +0100

    Refactor honksquads

commit 7413256cb86e4cc0db6e22e8cf9d787f8f99e5ff
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Fri Jul 2 11:20:12 2021 -0400

    Prevents ghosts from setting off mousetraps (#16274)

    * Prevents ghosts from setting off mousetraps

    * Update code/game/objects/items/weapons/storage/storage.dm

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

    * Note to self: Do not be tired when commiting suggestions

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

commit b85b672b9df3e566c12b19f1ec96791e0d1765af
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jul 2 13:51:18 2021 +0100

    Nerfs sorium and LDM

commit 1af34decd711cfc9e2486f0019c81dac6d72674b
Author: Mitchs98 <mitchs98@gmail.com>
Date:   Fri Jul 2 04:55:46 2021 -0500

    Fixes some typos in the spellbook. (#16281)

    * spellcheck

    * Fixes my own typo

commit 66cc94be42bcf2ffab54aa294dda4d6f3769f27f
Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com>
Date:   Fri Jul 2 05:55:23 2021 -0400

    fixes the grammar error (#16280)

commit d9d09deb004628e2b03da7260c50b8c19c5bc452
Merge: fe24ce4d75 9b86a42a3d
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Jul 1 22:15:58 2021 -0400

    Merge pull request #16212 from AffectedArc07/atom-rotation

    Better atom rotation

commit fe24ce4d751f14223eca0b0006f0347698ac8c17
Merge: dd9278ae98 516cd5d557
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Jul 1 22:14:21 2021 -0400

    Merge pull request #16159 from AffectedArc07/new-player-gc-hopefully-please

    (Hopefully) makes new players GC

commit dd9278ae98732bb6631c6069f35ca5d49671cf06
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Wed Jun 30 22:47:01 2021 +0100

    bomb (#16273)

commit 41c69d991141046135fea92e0bae2e025b859a24
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Wed Jun 30 16:51:56 2021 +0100

    Revert "Ai now gets stunned, not dusted"

    This reverts commit 34497c8e07e7f12fb841e0ac5529ce41fb3a32f5.

commit 34497c8e07e7f12fb841e0ac5529ce41fb3a32f5
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Wed Jun 30 12:41:39 2021 +0100

    Ai now gets stunned, not dusted

commit 516cd5d5573ad73788dbbea738a9c4479abf2de6
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Jun 11 22:11:32 2021 +0100

    Improves new player GCR

commit ec967cbaa7b3d96ce2bd0e726e514e5e04ebb30c
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Tue Jun 29 07:23:33 2021 -0400

    Prevents TK moving objects with people in or buckled to it (#16160)

    * Prevents TK moving objects with people in or buckled to it

    * Better proc for mob checking

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 0690c3dddd5906761f3f6c7b01b10e784ad361c8
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Tue Jun 29 03:50:06 2021 -0700

    EFTPOS code parcel now spawns in the chef's backpack. (#16034)

    * EFTPOS now spawns on the ground under the chef.

    * Now spawns in the chef's backpack, thanks AA.

    * Update code/modules/economy/EFTPOS.dm

    Unneeded identifier.

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Now drops on floor if there is no backpack.

    * Update code/modules/economy/EFTPOS.dm

    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
    Co-authored-by: Farie82 <farie82@users.noreply.github.com>

commit 7de29bd81f02cd4fdd70968d057065c8a11fa3eb
Author: datlo <quentinkoyote@gmail.com>
Date:   Tue Jun 29 12:46:43 2021 +0200

    Replace nukie jetpacks by oxygen tanks (#16101)

    * Replace nukie jetpack by oxy tanks

    * replace all harnesses

commit 27fe4da2df661aa28861f30b3c5591c89cf7b41e
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Tue Jun 29 11:46:13 2021 +0100

    Hand tele portals malfunctions teleport to random Z levels (#16126)

    * thinking about portals

    * affected's suggestion

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * teleporter machine change

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit c1d19836e1491a7e4ef38cefb2fa96c29760f0fe
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Tue Jun 29 11:45:35 2021 +0100

    Adds warning to gluttony morph about not being an antag (#16148)

    * chat message about not being an antag

    * melts the snowflake

    * forgot to do this

    * Update code/datums/diseases/transformation.dm

commit 7f6c31e7a48ea77f9cc3bbe0719b81d4975d4e8a
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Tue Jun 29 06:44:45 2021 -0400

    Gives the syndicate the latest tech (#16177)

commit bcb0cbe5cbbc90f70f015b75e7e8cb5af0cb48a8
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Tue Jun 29 06:44:18 2021 -0400

    Prevents built APCs from being hacked, Prevents AI from loosing points from apc destruction (#16192)

    * Prevents built APCs from being hacked, prevents deconstructing apcs from removing malf points

    * Spacing

    * whoops

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Affecteds other suggestions.

    * Grammer changes

    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

    * And autodoc for steel

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit 9a21cf1d4bf546ab7e4f64c610736ff300d9facd
Author: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com>
Date:   Tue Jun 29 07:43:08 2021 -0300

    no more message (#16202)

commit e08220e76c9ca3eb5c4226edf2e60e398b17bf78
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Tue Jun 29 11:42:31 2021 +0100

    Makes CC cryogenic freezers silent (#16223)

    * Makes CC cryopods silent

    * tweak

commit 612bb0a3bb4d281b92d830009bd43ea00e287000
Author: melandor0 <bigbang37@gmail.com>
Date:   Tue Jun 29 12:40:52 2021 +0200

    remove mouse ears (#16214)

    Mouse ears were originally the vanity/flair item made for me that somehow made their way into the autodrobe, then out of the autodrobe and into donator items. I'd like to reclaim my vanity item, and thus remove it from donor availability.

commit a92af2a3f8df0b0eed662c0d6f6312ba5854b09e
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Tue Jun 29 06:34:53 2021 -0400

    Ports dark gygax sprite from TG (#16243)

commit 1e9ed4c648cb17b9fe971a95869e46792365e25d
Author: meow20 <62257265+meow20@users.noreply.github.com>
Date:   Tue Jun 29 12:34:26 2021 +0200

    Let's labcoats store cyborg analyzers. (#16246)

    * Update labcoat.dm

    * Update code/modules/clothing/suits/labcoat.dm

    Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>

    Co-authored-by: meow20 <meow20@onet.pl>
    Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>

commit 5f4df8090997e6458d63e810aa66d616d76175ad
Author: theo-3 <85434590+theo-3@users.noreply.github.com>
Date:   Tue Jun 29 13:34:05 2021 +0300

    Add blast doors and a camera to the syndicate base test chamber (#16261)

    * Add blast doors and a camera to the syndicate base test chamber

    * Replace floating camera with two cameras

commit e99a5952aeb17cec39894e26a3c715ded32486bc
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Mon Jun 28 10:45:24 2021 -0400

    Prevents AIS from gibbing when being carded from a mech (#16271)

commit 1ace0bd9124ac1e30442f6429f138ae3c86a7e1d
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Mon Jun 28 15:16:41 2021 +0100

    Fixes bot pathing (#16270)

commit 9f963ffd2226191923d7871ef6c1965676443c7e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Jun 28 12:08:27 2021 +0100

    good enough

commit d083eb25e7fa66f9569877215f6a1124108d1c3b
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Jun 28 12:00:32 2021 +0100

    oh boy do I love spacing

commit 83d3045cbd2aa92de89da198a4b9b11575c7d5a3
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Jun 28 11:59:35 2021 +0100

    More improvements

commit 2b147b29c28c694b8b15aefbee18248167d0803c
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Mon Jun 28 11:00:27 2021 +0100

    Fixes upgraded teleporters UI (#16198)

    * fix

    * I did an oopsy

commit 206cedd07d869a508ba559ce724e335beb55d9e6
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Sun Jun 27 18:18:17 2021 +0100

    Farie code review

commit c266b27aed6c05a2302e61eafee6d36b57b446d6
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat Jun 26 22:57:27 2021 +0100

    Another small bugfix bundle (#16260)

    * Closet examine

    * Lit welder inhands

    * Capitalisation

    * Cyber organ eating

    * Nukie reinforcements code

    * Welding tool lathe cost

    * Patch pack dropping

    * Welding tool fix

    * Spacing

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 6080189ea3786fa3a89a6e1ea9f1b47fe3ebe810
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Jun 26 21:34:08 2021 +0100

    Fixes powersink not giving you a beacon on purchase. (#16255)

    * powersink gives you a beacon, as described

    * no longer a bomb subtype

    * Update code/game/objects/items/devices/radio/beacon.dm

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

    * Update code/game/objects/items/devices/radio/beacon.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit d6f15657fea6f9850ce48cc0ebbe34175d5367ff
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat Jun 26 16:33:40 2021 -0400

    Fixes contractors removing ipc power cord (#16262)

commit 4a30b87a269535a54a90abda43d563d0b3342205
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Jun 26 14:39:37 2021 +0100

    thralls no longer waste your blood (#16257)

commit 672f900b40a23ea17914f991d633fc0cabc56bfe
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Jun 26 14:36:40 2021 +0100

    fixes RPD eating TEG circulators (#16258)

commit 26b0ee7c8fd8412d8cef1e63a4a5f0664196b0bf
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 19:07:32 2021 +0100

    code review part 2

commit 65c985b301444db31f6bfede3827a120757a2a1b
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 18:51:04 2021 +0100

    Apply suggestions from code review

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit 8e383c6fc55562f2bda85aa207733c6079d5f89f
Author: meow20 <62257265+meow20@users.noreply.github.com>
Date:   Fri Jun 25 19:49:06 2021 +0200

    Stops swarmers from eating tiny fans and holo fans. (#16253)

    * Update swarmer.dm

    * Update swarmer.dm

    Co-authored-by: meow20 <meow20@onet.pl>

commit eb5fa5080cb98be107c2c810396ce860173a9ca4
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Fri Jun 25 12:48:04 2021 -0500

    Update robot_upgrades.dm (#16248)

commit 71eef5de4142eb61e1ad6280b0d5b2aa2637cab2
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 13:17:26 2021 +0100

    🔔 Come get your early returns here!

commit a601abed31728bdb45e249527efe654482e53d00
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 11:38:42 2021 +0100

    Update code/game/mecha/equipment/tools/work_tools.dm

commit ea6126f210e79d5e6bb49ea79607611d0297f156
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 11:31:53 2021 +0100

    early return it is

commit c2343fe6714105747ea10e7d3e7e902b252d401c
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 11:26:11 2021 +0100

    Apply suggestions from code review

commit 10e61d8836936ddc897b2b88adcecf58db2fdc6b
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 25 11:22:09 2021 +0100

    fix the exploit

commit e4d1788088906132b262160d7d7739778798b1e6
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Jun 24 20:02:32 2021 +0100

    Fixes singulo hammer sucking in ghosts (#16247)

    * fix

    * review

commit 9b86a42a3dc137ca9358fa7990a6b44bf95ec4d7
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Jun 24 17:29:18 2021 +0100

    Casing

commit 956daa36ec576b80316d078c490739e47afeaa09
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Jun 24 12:32:53 2021 +0100

    Farie tweaks

commit f11a934ded04251e314601e56dad9d1bbff2f254
Author: Matt <namen937@gmail.com>
Date:   Thu Jun 24 04:13:12 2021 -0700

    Change all off-station power terminals to /monitor/secret (#16245)

commit cfddae4a32c2b398d6a241ed04de1dee6dae83ba
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jun 24 07:11:26 2021 -0400

    Prevents cult pylons from converting indestructible walls (#16244)

commit 93a0b15834be16eb2331d5002e85a83aa14f2e7c
Author: Akira Akashi <rubenru09@aol.com>
Date:   Tue Jun 22 21:06:48 2021 +0100

    capitalise the no-prints and x-ray deactivation messages (#16225)

    * capitalise the no-prints deactivation message

    * capatalise x-ray deactivation

commit 2fa72b64ecae4ab022533280166cddd309bec309
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Tue Jun 22 16:06:23 2021 -0400

    Removes white pixels from boxing gloves on vox (#16234)

commit b1fe555a79ad27921539f8a0a452a31d420a0e0b
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Tue Jun 22 22:05:14 2021 +0200

    Fix shower mist not going away on deconstruction (#16233)

    Co-authored-by: dearmochi <>

commit 483f31e038f5e85dbb30dc83eb322c9d4f22a19e
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Tue Jun 22 10:42:48 2021 +0100

    This was a lot simpler than I expected (#16230)

commit 82b29ba837f2fb29e48f37e231a1832c036f5e81
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Tue Jun 22 10:41:19 2021 +0100

    I hate soulstones (#16227)

commit db333ce3927e6050b6fda4470f0e331ef17a5c1f
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Jun 21 13:27:35 2021 +0100

    More render tweaks

commit 6b06ca3ef5104d1c145488bcfa13295b9e304d36
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Mon Jun 21 12:21:32 2021 +0100

    Ports HTML manifest to TGUI (#16210)

    * Ghost manifest is tgui now

    * moved to tgui modules

    * Delete crew_manifest.dm

    * global

    * ghost -> nologo

    * sorry mr. tgui, i forgot about you again

    * Jade review + more trimming

    * lobby and silicons get some love

    * bye bye, all traces of old manifest.

    * renamed

commit f1ad48c45007e16187f1c2ef0d4ba52a95338da3
Author: Akira Akashi <rubenru09@aol.com>
Date:   Mon Jun 21 10:42:20 2021 +0100

    remove \the from loom.dm (#16222)

commit 7f40c8dcce9d43423af4d4dcab1c2a6f2a75d45e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Jun 21 00:11:11 2021 +0100

    Improves our map rendering

commit 0b375de42cc4cdcaaa1cd4bf9c7c468139dc6111
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sun Jun 20 15:20:32 2021 +0100

    Removes the the vast majority of 'The the' from the the code (#15597)

    * The the

    * Some more

    * Review 1

    * A couple more

commit e4d71a172aacf90a2c214b9b5b8e0ee71f120d2e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sun Jun 20 12:07:41 2021 +0100

    Tweaks

commit fc3185dcb664a03989b419099c590b67fd20a60f
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Sat Jun 19 23:07:50 2021 +0100

    fix (#16209)

commit 841eb0d30913346e36beae72e0139e2afbe333d0
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jun 19 19:04:00 2021 +0100

    And this

commit 3f1a6bcd35f7d3b47285e1d5dc57e02438db8c80
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jun 19 19:02:37 2021 +0100

    This too

commit aed6fed004f7bbb78a89f8f2cc21721fa6657f01
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jun 19 18:56:48 2021 +0100

    Removes some oldcode

commit 066c61dccddc57855500e8cc4203abb81c23e9c2
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jun 19 18:14:37 2021 +0100

    Better atom rotation

commit fb4cf6841c01c31c2f1410433bd9373c6cbf2527
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat Jun 19 09:12:25 2021 -0400

    Fixes the descriptions so it doesn't make broke guns (#16207)

commit e852dd90fe4f3123dddd28ca1f27bd8df15adf3d
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat Jun 19 09:11:48 2021 -0400

    Makes directional ranged attacks respect armor direction  (#16206)

    * Makes directional ranged attacks respect armor direction

    * src need not apply

commit dd0243509551c14b7ada6949c06b7b9d5bff4277
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat Jun 19 14:10:01 2021 +0100

    Fixes secborg batons (#16196)

    * Cell linking

    * V2

commit 266e7c2dbf92f9108a41178e6349c57dd34b0c10
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Fri Jun 18 16:15:12 2021 -0400

    Prevents ablative armor from reflecting in hand (#16204)

    * Prevents ablative armor from reflecting in hand

    * Update code/modules/clothing/suits/armor.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 810a94e48b50b926136d1e6864e4d9c95470a0c8
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Fri Jun 18 16:14:33 2021 -0400

    Prevents every gun under the sun from lying about alt skins (#16205)

commit 45449da433c4324d90c359f01e0f091bf85b228a
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Jun 18 21:00:27 2021 +0100

    table climbing fix (#16203)

    * table climbing fix

    * TRUE/FALSE

commit acfcce672880b51fd4061ba818340d99a5a02d69
Author: Aziz Chynaliev <azizonkg@gmail.com>
Date:   Fri Jun 18 18:41:05 2021 +0300

    Do not run hack in /obj/structure/closet if not mapload (#13) (#16201)

    Co-authored-by: Simon Ogorodnik <simon.ogorodnik@gmail.com>

commit 5fb2ccbcfcc8e9553952e58d2866400809e22f67
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jun 17 10:47:31 2021 -0400

    Rebalences teslium blob slightly (#16119)

    * part 1 of rework

    * Finishes the rework for now

    * Allows it to leave the body

    * Makes it a proc

commit d6e71523b1fea28ae526ddfb06b1f433532af720
Author: shmabuu <68139038+shmabuu@users.noreply.github.com>
Date:   Thu Jun 17 02:41:39 2021 -0700

    No more CQC discount (#15920)

commit f28e20af2186c7ecb45a98ab1698cc76e7c89ba7
Author: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Date:   Thu Jun 17 19:40:35 2021 +1000

    Anyone can now use the finger gun and fake finger gun spells. (#15941)

commit 11f6ca1cc1e5b7ef2d229b2b81cf3b689c352f3f
Author: Lumi <pipps6@hotmail.com>
Date:   Thu Jun 17 19:36:46 2021 +1000

    Adds banarnarbread (#15984)

    * Adds banarnarbread

    Adds banarnarbread

    * Fixes nutriment between loaf and slice

commit 85be09d7cecf91996bfae1314e4004cc930c1a24
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Jun 17 10:33:39 2021 +0100

    Refactors and tweaks reactive armours (#16086)

    * changes things

    * Review

    * better way of doing this.

commit 9e28cc0afe526bdd1312ec0b2d3dca2d68ffd547
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Thu Jun 17 05:32:59 2021 -0400

    Enforces nukies to wait at least 10 minutes after war before heading to station (#16115)

commit e64d8d9de211553d74b5a9445787c778ce2bb443
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Thu Jun 17 11:31:50 2021 +0200

    Optimizes customizable foods slightly + makes stacking beyond the limit of 41 impossible to avoid the server from dying (#16108)

    * Optimizes customizable snacks + fixes exploit
    Makes adding ingredients to customizable snacks less performance heavy.
    Makes it impossible to add customizable snacks together if that would make it go over the ingredient limit

    * Fixes the auto doc syntax used

    * QOL put in active hand + bug fix

commit 00de6dc6c1a34986c6f14297fb0c3239da8de437
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Thu Jun 17 10:30:30 2021 +0100

    Adds pref to remove internals pressure from status tab, adds it to inspect text (#16110)

    * yeets the internals from status panel

    * adds pressure reading to the tank inspect text

    * Adds a pref toggle

    * numbers are hard

    * catchup with master

    * Revert "catchup with master"

    This reverts commit bb972cb11080c1bd16440fbb9a3f23fccccd07e4.

commit c55acec92bd346b4a144c64dd93a78c424473db4
Author: RadiantFlash7 <kevinJCona@aol.com>
Date:   Thu Jun 17 05:25:24 2021 -0400

    Makes E-Bolas as they should be. Noncyborg variants. (#16168)

    * The E-bola is not a cyborg variant.

    Returns E-bola break out time to 60, instead of 20.
    Security bolas are limited supply and should be better then makeshift ones.

    * whoops

    Adjusts the breakout time to not to default to beartraps and use the 6 seconds listed in the Ebola item.

    * Update code/game/objects/items/weapons/legcuffs.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 75375efce9e141d3687aa2ebda025bd8a519597f
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Jun 17 10:23:14 2021 +0100

    Why is this a thing, really (#16169)

commit 5de0ebddaff0ece382dfe3b106d47ed2f0394539
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Jun 17 10:18:17 2021 +0100

    plamsa (#16178)

commit b7bef4f2e8e9bcdb1ff7aab81d7ae28a29fd423a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jun 17 10:16:15 2021 +0100

    Bump postcss from 7.0.27 to 7.0.36 in /tgui (#16193)

    Bumps [postcss](https://github.com/postcss/postcss) from 7.0.27 to 7.0.36.
    - [Release notes](https://github.com/postcss/postcss/releases)
    - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/postcss/postcss/compare/7.0.27...7.0.36)

    ---
    updated-dependencies:
    - dependency-name: postcss
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b7d9fcf87aa2841ad94a1b983993e623c2284c3c
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Wed Jun 16 13:23:34 2021 +0100

    fix (#16191)

commit 4d26621d0b8ef595eba7be487319956bccb0c277
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Wed Jun 16 05:02:58 2021 -0400

    Fixes being unable to pickup the armblade nullrod on mining (#16189)

commit 268f1cf83314ac3280a03ce8091b25767e642834
Author: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com>
Date:   Tue Jun 15 08:56:23 2021 -0300

    jumpboots use the correct icon (#16181)

commit 455836c189b0c6a9268de3eab98e340ea5a9b377
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Tue Jun 15 12:55:56 2021 +0100

    fi (#16184)

commit 01c0c86d01f7aaa418a077addda948973c4e518f
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Mon Jun 14 05:35:54 2021 -0500

    robobrain runechat fix (#16176)

commit 18f47d2ef35b90148b8aa9b0dca2fa87ef523f66
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sun Jun 13 18:08:15 2021 +0100

    Fixes broken shuttle and escape pod rotation (#16154)

    * Fixes shuttle rotation

    * Apply AA suggestions

    * Apply suggestions from code review

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 8ddfe635b59adb9506da3c79ad76a2b8bd8883cd
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sun Jun 13 16:18:43 2021 +0100

    AAAAAAAAAAAAAAAAAAAAAAAAAAAAA

commit 91c3d1750dc55334cfb4531754cd0da8869114da
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Sun Jun 13 16:18:12 2021 +0200

    Makes machinery/shields GC properly (#16174)

commit 89d6a26991a412be6dd6c282dd683e338afae11e
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Jun 12 20:14:58 2021 +0100

    Not required

commit 70447e7a4ba837d1e3efb2095afeaa6956f39b34
Author: dearmochi <shenesis@gmail.com>
Date:   Sat Jun 12 19:23:38 2021 +0200

    Fix forum link runtime (#16166)

commit 7f6a28f16dca3eeddf134a7919b3a2f930ae03fa
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Sat Jun 12 19:13:42 2021 +0200

    Respawning using anomalous crystal exploit fixes (#16165)

    * Ahud anomalous crystal fix
    Makes it so that you can't get around ahud enabling using the anomalous helper crystal

    * Merge conflict fix thing

commit ddacfbb009c78559915106f847179745d338954c
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Jun 12 16:22:35 2021 +0100

    fixes exploit (#16164)

commit 872de72dc6171d2e47d14368709bb961c5bf39b0
Author: dearmochi <shenesis@gmail.com>
Date:   Sat Jun 12 12:17:34 2021 +0200

    Moves Goonchat chat debug logging to RUSTG (#16162)

    * Moves Goonchat chat debug logging to RUSTG

    * Round-based logging

    * Update goon/code/datums/browserOutput.dm

commit 79fe4f7dd26104dc6cfc5ef64b8fb06a53cb1301
Author: ppi13 <rainbowdestroy@gmail.com>
Date:   Fri Jun 11 18:23:06 2021 +0200

    Fixes singularity radiation not reaching rad collectors

commit 75eb603e5b34e870007b8fd7f9a445f7ab1fdd4e
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 11 16:48:16 2021 +0100

    Grammar issues in PR template (#16155)

    * Grammar issues in PR template

    * I forgot a .

    * Update .github/PULL_REQUEST_TEMPLATE.md

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit fc04f2fa2693041fa3eede1a7a8c9c91e80cd99c
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 11 15:24:38 2021 +0100

    new format for DMI editor associations (#16152)

commit 0c66d089a2dfb52025e44c82ab467f13267540da
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu Jun 10 16:06:42 2021 +0100

    Bump pillow from 8.1.1 to 8.2.0 in /tools/mapmerge2 (#16138)

    Bumps [pillow](https://github.com/python-pillow/Pillow) from 8.1.1 to 8.2.0.
    - [Release notes](https://github.com/python-pillow/Pillow/releases)
    - [Changelog](https://github.com/python-pillow/Pillow/blob/master/CHANGES.rst)
    - [Commits](https://github.com/python-pillow/Pillow/compare/8.1.1...8.2.0)

    ---
    updated-dependencies:
    - dependency-name: pillow
      dependency-type: direct:production
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit 0a6a441aa5fb6de5a59c95da1f3b1d29a62f343a
Author: dearmochi <shenesis@gmail.com>
Date:   Wed Jun 9 19:47:25 2021 +0200

    Fix nullspaced GPS causing runtime on display (#16146)

commit 7b20c9ddded67f69e98ca542de947f6f50d47506
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Wed Jun 9 03:33:42 2021 -0500

    borg malf hack fix (#16143)

commit 265053f96624b6bb1b5beb25d3a5cf2918588bdc
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Tue Jun 8 15:05:00 2021 +0100

    makes sol trader IDs properly update (#16137)

commit d4402f2ebb33d09e14c27928c16a051e86dfd45e
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Tue Jun 8 07:04:28 2021 -0700

    Cleaner no longer resets Light Tiles. (#16070)

    * Cleaner no longer resets Light Tiles.

    * Update code/modules/reagents/chemistry/reagents/water.dm

    Spacing

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * Creates a Clean proc, overrides it for light tile

    * Forgot to fix this when copy pasting.

    * Update code/game/turfs/turf.dm

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * Update code/game/turfs/simulated/floor/light_floor.dm

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * Update code/game/turfs/turf.dm

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * Updates other files to match proc name

    * Calls parent function instead of duplicating code.

    * Update code/modules/reagents/chemistry/reagents/water.dm

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit cabe76044a21335a34b51233b23eaa8e9480fedf
Author: Adrer <erwin@lombok.demon.nl>
Date:   Mon Jun 7 21:56:49 2021 +0200

    Switched the sprites around (#16002)

    Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>

commit 3650a943a4b02834bc5516bc4e29f684f90101f0
Author: dearmochi <shenesis@gmail.com>
Date:   Mon Jun 7 21:16:23 2021 +0200

    AIs can no longer be pushed in disposal chutes (#16136)

commit 5896bd2c8e5e0373c045f9620f0a287d53702c13
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Mon Jun 7 13:46:16 2021 -0400

    Fixes some exploits (#16134)

commit ede40b87734f4a177494f4f14ecab5d69f0439b0
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Mon Jun 7 13:45:43 2021 -0400

    Fixes guardian bluespace pads having a non-existent icon_state (#16133)

commit 6191c84860b028f400a70034095cdb00ef8578e0
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Sun Jun 6 04:45:49 2021 -0700

    Poly can no longer grab inside disposals. (#16068)

    * Poly can no longer grab inside disposals.

    * Update code/modules/mob/living/simple_animal/parrot.dm

    Spacing from SabreML

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

commit 9d10cf426042b2f92ffea59b2cab304ef5c56f12
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sun Jun 6 12:43:28 2021 +0100

    Fixes soulstones ignoring DNR or AntagHUD settings (#16117)

    * DNR/AntagHUD soulstoning

    * Update code/game/gamemodes/wizard/soulstone.dm

    Co-authored-by: dearmochi <shenesis@gmail.com>

    * Revive rune

    Co-authored-by: dearmochi <shenesis@gmail.com>

commit e8be0bd8699b2db740d974f39643e64b5ea5987d
Author: Ryal <warior4356@yahoo.com>
Date:   Sat Jun 5 01:14:46 2021 -0700

    Makes all nuclear operatives remember the nuke code (#15978)

    * Makes all nukies remember the nuke code

    * var argument fix and formatting tweaks

    * Apply suggestions from code review

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

commit b890db5cb9bcfdc3f0cd68b226b943b6da654007
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Fri Jun 4 20:44:07 2021 +0100

    fixes runtime in destructive analyzer (#16129)

commit 3415bfdf2143c7872c85e26fe858196baeb07c10
Merge: dfa17e9d07 1d7015c070
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Fri Jun 4 15:31:29 2021 -0400

    Merge pull request #16124 from AffectedArc07/fixes-space-pipe-memes

    Fixes bad inits on space tiles

commit dfa17e9d0797284746af47d60147681a23ad4a68
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri Jun 4 19:23:32 2021 +0100

    Drone suicide fix (#16128)

commit f451b84c072ec9c7097bfcb6b051c6f17af2479a
Merge: f80e50588e 0efa44aa2d
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Fri Jun 4 12:37:03 2021 -0400

    Merge branch 'ParadiseSS13:master' into Despookify

commit 0efa44aa2d3019ed9b20cbd3fbf50232cb723711
Author: DogsParadise <48732029+DogsParadise@users.noreply.github.com>
Date:   Fri Jun 4 11:50:54 2021 +0200

    Cleaning up .dmi files in effects folder for dreammaker (#16026)

    * am_engine, badass and laptop deletion

    * Removes unsude in effects.dmi

    * Genetics.dmi - Unused + ugly

    * targeted.dmi cleanup

    * Revert "am_engine, badass and laptop deletion"

    This reverts commit 1080828526891b484519525120eb29eb01689cb2.

    * Unused files

commit aacae884cac8791bed37345e1f83ceaf7f441ae6
Author: ppi13 <rainbowdestroy@gmail.com>
Date:   Fri Jun 4 11:50:03 2021 +0200

    Fixes #16019 (#16021)

    * Fixes #16019

    * Adds a way to 'drop' the kiss without throwing it.

    * A better way to fix this

    * Fixes fuckups, and make it work.

    * Fixes #16019

    Adds a way to 'drop' the kiss without throwing it.

    A better way to fix this

    Fixes fuckups, and make it work.

commit 98b97e02b0eeb733985329dd527af6539ac4e8c6
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Fri Jun 4 05:49:12 2021 -0400

    Axes Ratvar_Act() from the code (#16025)

    * Ratvar_Act() is no more

    * fixes runtime with recipes

    * readds removed brass objects

    * Fixes an oopsie

    * removes unnecesary procs

commit 27f8610b23767fc452703b20323449c4069314d4
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Fri Jun 4 04:46:57 2021 -0500

    secborg charge fix (#16127)

commit 1d7015c07021dec7a033ffe246951bf72940563c
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Wed Jun 2 22:35:32 2021 +0100

    Fixes bad inits on space tiles

commit 65b70a878d10831dcbee9287250fdb75a74771b3
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Wed Jun 2 17:07:42 2021 +0000

    Gives PRRs qdel log ingame (#16065)

commit 5a12564b7249a842d94b947a7610e7355ed509be
Author: Deniz <66401072+Oyu-De@users.noreply.github.com>
Date:   Tue Jun 1 15:24:52 2021 +0300

    fixes "destoyed" to "destroyed" (#16121)

    The station was destoyed by the nuclear blast to
    The station was destroyed by the nuclear blast

commit 8e6787a791d0865fbb985ef0ba57bbe17c63bbd2
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sun May 30 16:19:56 2021 +0000

    2FA for server login (#16094)

    * AA2FA

    * Its always dbconfig

    * Extra security

    * oops

commit f68220879da72d90e82836cbd3b51bd63345079b
Author: Leanfrog <52841396+Leanfrog@users.noreply.github.com>
Date:   Sat May 29 16:19:53 2021 -0400

    Adds A Nitrile Glove Crate To Cargo (#16011)

    * glove crate blue

    * 4 gloves over 3 as per Fox's request

commit 0801a51d96aad4d41c8131096f684865c47cf2bd
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat May 29 16:19:29 2021 -0400

    Logs pacman overheating (#16043)

    * Logs pacman overheating

    * Jump to it

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

    * affected spells like teen spirit

    Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit cd7017e1b3c5abf8a2e68d3a86027adebaaecab4
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat May 29 21:19:05 2021 +0100

    Allows Maintenance Drones to see wire names (#16047)

    * drone buff

    * V2 (Item Trait)

    * Indentation

    Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit a8608ccee174f5c8ac5afe61cba67f899764e165
Author: Dragonkiller93 <82484852+Dragonkiller93@users.noreply.github.com>
Date:   Sat May 29 13:17:25 2021 -0700

    Stethoscope now checks whether the target is dead. (#16062)

    * Stethoscope now checks whether the target is dead.

    * Update code/modules/clothing/under/accessories/accessory.dm

    Removes unnecessary parentheses.

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

    Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

commit 8f1b77e02cb0ca819a9124a8730b4fa48ed05882
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat May 29 21:16:25 2021 +0100

    [station] (#16074)

commit 3b3411f602d4eb04a3f5bd2f7b2b2f527345518e
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat May 29 22:14:51 2021 +0200

    Add a pilot seat to the ert shuttle (#16081)

commit 4e63120df49016fc0af746f5344e5bab798494b5
Author: Leanfrog <52841396+Leanfrog@users.noreply.github.com>
Date:   Sat May 29 16:13:30 2021 -0400

    Makes Display Cases Emaggable (#16096)

    * Emaggable Case

    * Emag Alarm

    * one space is kil

    * the is kil

commit 64f1fd589d4388616b2482b5f8c5200da96b84f7
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat May 29 21:12:35 2021 +0100

    Adds a station alert level display to the join game menu (#16097)

    * Alert Levels

    * pain

    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

    Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

commit d8c429df6edc0944407cd7bb069e41c87d470055
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat May 29 21:12:10 2021 +0100

    Reworks area icons, removes box-focused names (#16099)

    * begone scribble sprites

    * why were you animated, stop being animated please

    * also, nanomob moment

    * purges kidan

commit bf88adadf1bf5e54070687063670c42e3a5ccd9c
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat May 29 21:11:23 2021 +0100

    One line change (#16100)

commit 15a2ac8f1d4d2db9052821728cf3d9e7241ff697
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat May 29 16:11:06 2021 -0400

    Makes offstation roles (bar ERT) unable to be sharded (#16102)

    * Makes offstation roles (bar ERT) unable to be converted / sharded

    * Grammer changes

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

    * either or

    * Update code/game/gamemodes/cult/runes.dm

    Co-authored-by: dearmochi <shenesis@gmail.com>

    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
    Co-authored-by: dearmochi <shenesis@gmail.com>

commit b4b30ae694350676a6e949ba5c822a2770e0407e
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Sat May 29 22:10:15 2021 +0200

    Fixes the maploader seeing "123" as number 123 (#16109)

commit d428c472ed03665e083de28c796cf01461f5fc51
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sat May 29 21:08:05 2021 +0100

    how was this not reported until now (#16111)

commit 77c243722f40f410d7a66b463aa931b77d7a6cdc
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Sat May 29 21:05:13 2021 +0100

    Bump ws from 7.2.3 to 7.4.6 in /tgui (#16113)

    Bumps [ws](https://github.com/websockets/ws) from 7.2.3 to 7.4.6.
    - [Release notes](https://github.com/websockets/ws/releases)
    - [Commits](https://github.com/websockets/ws/compare/7.2.3...7.4.6)

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit dd8d59d895e33b198ba3913ce6093f65f0ba6f7e
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Sat May 29 14:56:20 2021 -0500

    atmos computer fix (#16112)

commit 40458173e21156b33aa8abf62d0c9222f2b8230e
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Fri May 28 16:53:22 2021 +0100

    I can't think of a commit name (#16104)

commit 740ac1607444868be42e8412a637ab764bdc366a
Author: Adrer <erwin@lombok.demon.nl>
Date:   Thu May 27 16:59:41 2021 +0200

    sol trader lootdrop autosurgeon now of the organ subtype (#16098)

    Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>

commit 8c84b62e4ad7fe490532e6d54c50e8b9267bcb04
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Wed May 26 23:43:37 2021 +0200

    Fixes the maploader incorrectly loading list values. Fixing the AI upload turret control (#16093)

    * Fixes the maploader incorrectly loading list values. Fixing the AI upload turret

    * Adds better logging

commit ebf7d7911e2989bdc90ff53ae004f01b4b23cbe8
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Wed May 26 23:41:35 2021 +0200

    Caches all unique areas so that they are properly loaded in (#16092)

commit bfc5895c7d15840546e19322642660b3a86abac8
Merge: 9f692ba9db a886039f22
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Wed May 26 16:41:12 2021 -0400

    Merge pull request #16056 from Bizzonium/fixAtmosLeak

    Fix air leak through reinforced window that not updating atmos

commit 9f692ba9db6aac78740f49386d6d9de420aac232
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Wed May 26 15:30:47 2021 +0100

    Bump browserslist from 4.11.1 to 4.16.6 in /tgui (#16089)

    Bumps [browserslist](https://github.com/browserslist/browserslist) from 4.11.1 to 4.16.6.
    - [Release notes](https://github.com/browserslist/browserslist/releases)
    - [Changelog](https://github.com/browserslist/browserslist/blob/main/CHANGELOG.md)
    - [Commits](https://github.com/browserslist/browserslist/compare/4.11.1...4.16.6)

    Signed-off-by: dependabot[bot] <support@github.com>

    Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

commit b6ed587e01a034615aa043dacb063754c2e7e596
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date…
  • Loading branch information
LordShekelstein committed Jul 14, 2021
1 parent 5e1b674 commit 22ffd66
Show file tree
Hide file tree
Showing 686 changed files with 18,677 additions and 24,814 deletions.
7 changes: 4 additions & 3 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do
<!-- Include a small to medium description of what your PR changes. Document every changes or this may delay review or even discourage maintainers from merging your PR! -->
<!-- Include a small to medium description of what your PR changes. Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->

## Why It's Good For The Game
<!-- Please add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->
<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Images of changes
<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif of your feature if you want -->
<!-- If you did not make a map or sprite edit, you may delete this section. You may include a gif or mp4 of your feature if you want. -->

## Changelog
:cl:
Expand All @@ -27,3 +27,4 @@ experiment: Added an experimental thingy

<!-- Both :cl:'s are required for the changelog to work! You can put your name to the right of the first :cl: if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
tools/ci/install_byond.sh
source $HOME/BYOND/byond/bin/byondsetup
tools/ci/generate_maplist.sh
tools/ci/dm.sh -Mci_map_testing paradise.dme
tools/ci/dm.sh -DCIMAP paradise.dme
unit_tests_and_sql:
name: Unit Tests + SQL Validation
Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"workbench.editorAssociations": {
"*.dmi": "imagePreview.previewEditor"
}
}
37 changes: 37 additions & 0 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Important

The Paradise GitHub is not exempt from Paradise Station community and server rules, especially rules 0, 1, and 4. An inability to abide by the rules on the GitHub will result in disciplinary action up to, or including, a repository ban.

## General Expectations

### PR Discussion

Comments on Pull Requests should remain relevant to the PR in question and not derail discussions.

Under no circumstances are users to be attacked for their ideas or contributions. While constructive criticism is encouraged, toxicity or general mean-spirited behaviour will not be tolerated. All participants on a given PR or issue are expected to be civil. Failure to do so will result in disciplinary action.

"Merge-nagging" or similar behaviour is not acceptable. Comments of this nature will result in warnings or an outright ban from the repository depending on general behaviour.

If you exhibit behaviour that's considered to be a net-negative to the community (offensive commentary, repeat violations, constant nagging, personal attacks, etc.), you may be banned from other Paradise services (Discord, forums, server, wiki, etc.)

Maintainers reserve the right to permanently revoke access from the repository if your behaviour is considered to be a net negative.

### PR Approval/Objection Info

Heads of Staff and Maintainers have the final say on Pull Requests. While thumbsup/thumbsdown reaction ratios are generally taken into account, they do not dictate whether or not a PR will be merged.

After a twenty four hour minimum waiting period, Pull Requests can be merged once they receive approval from both a Head of Staff and a Maintainer. An exception is made for refactors and fixes, which may be merged at a Maintainer's discretion with no waiting period.

While normally provided, Heads of Staff and Maintainers are not obligated to publicly state their objections to a Pull Request. Attacking or berating either of these roles over an objection will not be tolerated. Additionally, whining over the closure of a PR, the existence of an objection, or similar behaviour, will not be tolerated.

### PR Expectations

All Pull Requests are expected to be tested prior to submission. If a submitted Pull Request fails to pass CI checks, the likelihood of it being merged will be significantly lower. If you can't take the time to compile/test your Pull Request, do not expect a warm reception.

It is expected that contributors discuss larger design changes on the forums prior to coding a Pull Request. The amount of time spent on any given Pull Request is not relevant. Maintainers are not responsible for contributors wasting their time creating features nobody asked for.

Barring highly specific circumstances (such as single line changes, submissions from advanced users, or changes to repo documentation), we will not accept Pull Requests utilising the web editor.

Pull Requests regarding heavy-handed nerfs, particularly immediately after said mechanic was used, will be tagged with `I ded pls nerf`. A bad experience with a particular mechanic is not a justification for nerfing it.

Reactionary revert PRs are not tolerated under any circumstances. Posting a revert immediately after a Pull Request is merged will result in a repoban.
30 changes: 22 additions & 8 deletions SQL/paradise_schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ CREATE TABLE `customuseritems` (
`cuiJobMask` text NOT NULL,
PRIMARY KEY (`id`),
KEY `cuiCKey` (`cuiCKey`)
) ENGINE=MyISAM AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -126,7 +126,7 @@ CREATE TABLE `death` (
`fireloss` int(11) NOT NULL,
`oxyloss` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand Down Expand Up @@ -241,7 +241,7 @@ CREATE TABLE `feedback` (
`version` tinyint(3) UNSIGNED NOT NULL,
`json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand Down Expand Up @@ -277,6 +277,7 @@ CREATE TABLE `player` (
`fupdate` smallint(4) DEFAULT '0',
`parallax` tinyint(1) DEFAULT '8',
`byond_date` DATE DEFAULT NULL,
`2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`),
KEY `lastseen` (`lastseen`),
Expand Down Expand Up @@ -321,7 +322,7 @@ CREATE TABLE `karma` (
`spenderip` text NOT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -338,7 +339,7 @@ CREATE TABLE `karmatotals` (
`karmaspent` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
KEY `byondkey` (`byondkey`)
) ENGINE=MyISAM AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -359,7 +360,7 @@ CREATE TABLE `library` (
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`),
KEY `flagged` (`flagged`)
) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -375,7 +376,7 @@ CREATE TABLE `legacy_population` (
`admincount` int(11) DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -392,7 +393,7 @@ CREATE TABLE `whitelist` (
`species` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`)
) ENGINE=MyISAM AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

Expand Down Expand Up @@ -585,3 +586,16 @@ CREATE TABLE `round` (
`station_name` VARCHAR(80) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;


--
-- Table structure for table `2fa_secrets`
--
CREATE TABLE `2fa_secrets` (
`ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
`date_setup` DATETIME NOT NULL DEFAULT current_timestamp(),
`last_time` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ckey`) USING BTREE
)
COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
29 changes: 21 additions & 8 deletions SQL/paradise_schema_prefixed.sql
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ CREATE TABLE `SS13_customuseritems` (
`cuiPropAdjust` text,
`cuiJobMask` text NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=56 DEFAULT CHARSET=utf8mb4;
ALTER TABLE `SS13_customuseritems` ADD INDEX(`cuiCKey`);
/*!40101 SET character_set_client = @saved_cs_client */;

Expand Down Expand Up @@ -126,7 +126,7 @@ CREATE TABLE `SS13_death` (
`fireloss` int(11) NOT NULL,
`oxyloss` int(11) NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=166546 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand Down Expand Up @@ -240,7 +240,7 @@ CREATE TABLE `SS13_feedback` (
`version` tinyint(3) UNSIGNED NOT NULL,
`json` LONGTEXT NOT NULL COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=257638 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand Down Expand Up @@ -276,6 +276,7 @@ CREATE TABLE `SS13_player` (
`fupdate` smallint(4) DEFAULT '0',
`parallax` tinyint(1) DEFAULT '8',
`byond_date` DATE DEFAULT NULL,
`2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' COLLATE 'utf8mb4_general_ci',
PRIMARY KEY (`id`),
UNIQUE KEY `ckey` (`ckey`),
KEY `lastseen` (`lastseen`),
Expand Down Expand Up @@ -320,7 +321,7 @@ CREATE TABLE `SS13_karma` (
`spenderip` text NOT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=73614 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -337,7 +338,7 @@ CREATE TABLE `SS13_karmatotals` (
`karmaspent` int(11) NOT NULL DEFAULT 0,
PRIMARY KEY (`id`),
KEY `byondkey` (`byondkey`)
) ENGINE=MyISAM AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=25715 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -358,7 +359,7 @@ CREATE TABLE `SS13_library` (
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`),
KEY `flagged` (`flagged`)
) ENGINE=MyISAM AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=4537 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -374,7 +375,7 @@ CREATE TABLE `SS13_legacy_population` (
`admincount` int(11) DEFAULT NULL,
`time` datetime NOT NULL,
PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
) ENGINE=InnoDB AUTO_INCREMENT=2550 DEFAULT CHARSET=utf8mb4;
/*!40101 SET character_set_client = @saved_cs_client */;

--
Expand All @@ -391,7 +392,7 @@ CREATE TABLE `SS13_whitelist` (
`species` mediumtext COLLATE utf8mb4_unicode_ci DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `ckey` (`ckey`)
) ENGINE=MyISAM AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
) ENGINE=InnoDB AUTO_INCREMENT=4080 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
/*!40101 SET character_set_client = @saved_cs_client */;
/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;

Expand Down Expand Up @@ -582,3 +583,15 @@ CREATE TABLE `SS13_round` (
`station_name` VARCHAR(80) NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;

--
-- Table structure for table `2fa_secrets`
--
CREATE TABLE `SS13_2fa_secrets` (
`ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
`date_setup` DATETIME NOT NULL DEFAULT current_timestamp(),
`last_time` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ckey`) USING BTREE
)
COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
11 changes: 11 additions & 0 deletions SQL/updates/22-23.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Updating SQL from version 22 to 23 -AffectedArc07
# Converts existing MyISAM tables to InnoDB

ALTER TABLE `customuseritems` ENGINE=InnoDB;
ALTER TABLE `death` ENGINE=InnoDB;
ALTER TABLE `feedback` ENGINE=InnoDB;
ALTER TABLE `karma` ENGINE=InnoDB;
ALTER TABLE `karmatotals` ENGINE=InnoDB;
ALTER TABLE `legacy_population` ENGINE=InnoDB;
ALTER TABLE `library` ENGINE=InnoDB;
ALTER TABLE `whitelist` ENGINE=InnoDB;
13 changes: 13 additions & 0 deletions SQL/updates/23-24.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Updates DB from 23 to 24 -AffectedArc07
# Add new column to player table for 2FA status
ALTER TABLE `player` ADD COLUMN `2fa_status` ENUM('DISABLED','ENABLED_IP','ENABLED_ALWAYS') NOT NULL DEFAULT 'DISABLED' AFTER `byond_date`;

# Create new table for 2FA tokens
CREATE TABLE `2fa_secrets` (
`ckey` VARCHAR(50) NOT NULL COLLATE 'utf8mb4_general_ci',
`secret` VARCHAR(64) NOT NULL COLLATE 'utf8mb4_general_ci',
`date_setup` DATETIME NOT NULL DEFAULT current_timestamp(),
`last_time` DATETIME NULL DEFAULT NULL,
PRIMARY KEY (`ckey`) USING BTREE
)
COLLATE='utf8mb4_general_ci' ENGINE=InnoDB;
38 changes: 32 additions & 6 deletions SpacemanDMM.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,38 @@
[langserver]
dreamchecker = true

# Keep the keys in this file alphabetical please
[code_standards]
disallow_relative_type_definitions = true
disallow_relative_proc_definitions = true
disallow_relative_type_definitions = true

[debugger]
engine = "auxtools"

[dmdoc]
use_typepath_names = true

[debugger]
engine = "auxtools"
[langserver]
dreamchecker = true

[map_renderer]
hide_invisible = [
"/obj/effect/landmark",
"/obj/effect/mapping_helpers",
"/obj/effect/spawner/random_barrier",
"/obj/effect/spawner/random_spawners",
]

[map_renderer.fancy_layers]
# -10
"/turf/simulated/floor/plating" = -10
"/turf/space" = -10
# -2
"/turf/simulated/floor/bluegrid" = -2
"/turf/simulated/floor/carpet" = -2
"/turf/simulated/floor/engine" = -2
"/turf/simulated/floor/plasteel" = -2
"/turf/simulated/floor/wood" = -2
"/turf/simulated/wall" = -2

[map_renderer.render_passes]
icon-smoothing = false
icon-smoothing-2016 = true
smart-cables = false
5 changes: 5 additions & 0 deletions _maps/base_map.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#include "map_files\generic\centcomm.dmm"
#define CC_TRANSITION_CONFIG DECLARE_LEVEL(CENTCOMM, SELFLOOPING, list(ADMIN_LEVEL, BLOCK_TELEPORT, IMPEDES_MAGIC))
#ifdef CIMAP
#include "ci_map_testing.dm"
#endif
27 changes: 0 additions & 27 deletions _maps/cyberiad.dm

This file was deleted.

0 comments on commit 22ffd66

Please sign in to comment.