mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-31 07:57:47 +01:00
Vi3triceandGitHub
09a27707fa
* Reworked the operating room/patient rooms area along with the nearby maintenance Made space for two operating rooms, moved the patient rooms up. Shifted part of maintenance and solars to make space for the medbay. * Removed one extra intercom, one massive change from mapmerge * Added first aid kits and intercoms * Added displays * Fixes disposals in the backroom * Might as well remove the ears from the maintenance theater * Made vents on child type * Forgot one scrubber manifold * Squashed commit of the following: commitfbda59a8f5Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Fri Jul 16 11:34:06 2021 -0500 slime-iv (#15642) commit3417b51c9eAuthor: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Jul 16 16:13:46 2021 +0100 Maps in the HoS hardsuit (#15637) * Added HoS locker to all maps * removes sneaky magboots * Update code/game/machinery/suit_storage_unit.dm Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> commit2ddd4d06a2Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri Jul 16 12:10:00 2021 +0100 NanoMap Auto-Update (Fri Jul 16 01:00:51 UTC 2021) (#16375) Co-authored-by: NanoMap Generation <action@github.com> commit8909d6e3fcMerge:369aac8c9e4503131a8aAuthor: Fox McCloud <Fox-McCloud@users.noreply.github.com> Date: Thu Jul 15 17:51:35 2021 -0400 Merge pull request #16373 from AffectedArc07/repo-broke-fuck Revert "Re-adds engineering items to secure storage and main engineering storage (#15458)" commit4503131a8aAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu Jul 15 22:45:19 2021 +0100 Revert "Re-adds engineering items to secure storage and main engineering storage (#15458)" This reverts commit369aac8c9e. commit369aac8c9eAuthor: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com> Date: Thu Jul 15 18:20:27 2021 -0300 Re-adds engineering items to secure storage and main engineering storage (#15458) * budget increase * Update cyberiad.dmm * Update cyberiad.dmm commit8abfad34e7Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 15 22:08:05 2021 +0100 Changes the Escape Shuttle Security doors to basic Security access (#15584) * Shuttle doors * Delta standardisation Also corrected the name on the door commitf8d510e7f5Author: dearmochi <1496804+dearmochi@users.noreply.github.com> Date: Thu Jul 15 23:07:24 2021 +0200 Lightly refactors human Initialize() (#15738) * Refactors human Initialize * spelling * use ComponentInitialize() * 🇬🇧 commitb67bab70c6Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 15 17:56:55 2021 +0100 Adds direction signs around the station [V2] (#15486) * Cyberiad Directional Signs * Mochi Review * Map edits remake Conflict fixer didn't work :( commite3866fda81Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Thu Jul 15 16:38:59 2021 +0100 Delta brig edits (#15405) * Cells moved and added, processing added, evidence moved. * i did an oopsie with gitignore * Expanded Perma, added solitary, gamma, and perma maints * fire alarms * more fire alarms * magi office * Resolved issues Fixed issues highligted by steelslayer. Added monitors to interrogation observation, and an intercomm for that area only. Changed inner airlock doors for non-glass on main entryance and prison wing access. * Update code/game/area/ss13_areas.dm Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> * power cables should actually have a purpose * forgot to map merge latest stuff innit * merge conflict part 2 * repipes brig, decal fixes * merge conflict part 2 * Updated area icon Co-authored-by: Sean Williams <sw26243@my.open.ac.uk> Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> commitaf5ea7b4bfAuthor: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Thu Jul 15 15:51:52 2021 +0100 round two (#16371) commit69fe1e0a14Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 15 14:04:15 2021 +0100 Radioactive Spot (#15456) commit9c52358336Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 15 14:03:36 2021 +0100 Hall Lights (#15455) commit64930de41cAuthor: Farie82 <farie82@users.noreply.github.com> Date: Thu Jul 15 14:59:26 2021 +0200 Makes all toy figurines tiny and refactors the code behind it (#15368) * Makes toy figures tiny and refactors the code behind it * Apply suggestions from code review Co-authored-by: dearmochi <shenesis@gmail.com> * atom_say and capitalize names * Web edit baby * Merge conflict fixes * Init instead of New * prize_ball instead of mechball * prize_ball should not be a figure. Revert but keep the Init change Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com> Co-authored-by: dearmochi <shenesis@gmail.com> commit036a69fea4Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Wed Jul 14 23:07:12 2021 +0100 Removes `pixel_* = 0` and `tag = "icon*"` from the map files (#15438) * Pixel Removal Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> * Fix Why is that even there? * Fix Apparently I did the regex stuff in the wrong order for `Lavaland.dm`. Whoops * Unit tests * Mother of all map edits * `tag = "icon` purging * No area check Far too much code debt for this PR to cover, but soon... * At request Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> commit0596c0a12eAuthor: SabreML <57483089+SabreML@users.noreply.github.com> Date: Wed Jul 14 16:53:25 2021 +0100 Adds a code of conduct link to the readme (#16363) * Code of Conduct link in the readme Yes this is webedited, I can preview the changes that way. * Alphabetically ordered links alphabetti spaghetti commit3eb3bdcdc7Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Wed Jul 14 15:01:28 2021 +0100 indestructable walls (#16362) commit99d9451075Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Wed Jul 14 12:34:54 2021 +0100 fix (#16361) commitf135593a11Merge:712721fbc661f92f4953Author: 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 commit712721fbc6Author: 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 commit5124f5ef7eAuthor: 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 commite98d81ac46Merge:b6b510c2f9c2c2794d82Author: 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) commitb6b510c2f9Merge:78b26a4145702500af9fAuthor: 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 commit78b26a4145Merge:40ab95bbaffd8e1a1a3eAuthor: 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 commit40ab95bbafMerge:aca230bb7bb6f334f92fAuthor: 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 commitaca230bb7bAuthor: 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 commit102e42a381Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun Jul 11 17:32:19 2021 +0100 heck (#16344) commit61f92f4953Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jul 10 21:55:43 2021 +0100 Text tweak commit3e8482cebbAuthor: 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 commit9b1eb41e58Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jul 10 12:16:03 2021 +0100 More tweaks commit50ce5cbc44Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jul 10 12:03:47 2021 +0100 Of *course* S34N has nitpicks here commiteb8afb6f16Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jul 10 11:48:10 2021 +0100 Repositoy Code of Conduct commit9d3800b49eAuthor: 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 commit568a8b17ceAuthor: 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 commit702500af9fAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jul 9 11:52:13 2021 +0100 Fox fixes. Foxes? commit52e86bd0edAuthor: 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) commit908c4f0dd1Author: 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 commit31cec0d4deAuthor: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Jul 9 11:38:01 2021 +0100 Removes fungus announcement (#16322) * Crewmate victory * removes setup commit94f1140f23Author: 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> commit11de88fc3bAuthor: 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 commit9f008f3de4Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Fri Jul 9 11:21:20 2021 +0100 jacobs ladder removal from tendrils (#16324) commit7a7364fcfdAuthor: 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 commitb9a4929235Author: 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. commit5270cd53a9Author: 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. commite7cf6d9f38Merge:dad52950ff41c69d9911Author: 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. commitdad52950ffMerge:ddea09dce279fe4f7dd2Author: 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 commitddea09dce2Merge:1d04a9ec748ddfe635b5Author: 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 commit1d04a9ec74Author: 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 commite835205f50Author: 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> commit1455af127aAuthor: 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! commit5009e9209bAuthor: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Thu Jul 8 22:59:12 2021 +0100 .g AI absorbing me (#15562) commit92bdb8f159Author: 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 commit5ed4c3ca83Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 8 22:57:54 2021 +0100 Loadout Instruments (#15633) commit04c689817eAuthor: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jul 8 22:57:08 2021 +0100 Fire + Cloth = Bad things (#15635) commitf8bc686abbAuthor: 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> commitd85f2261e5Author: 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> commita598acf159Author: 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> commit64a0b9e83dAuthor: 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) commitb949b1adc2Author: warior4356 <warior4356@yahoo.com> Date: Thu Jul 8 14:31:06 2021 -0700 Adds sec hailers and space pod keys to sec belt (#15977) commit027bd7f110Author: 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> commit8719801295Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com> Date: Thu Jul 8 23:22:59 2021 +0200 Bandolier stacks (#16106) commit8dcb2c1a0fAuthor: 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 commit3724eb3ef0Author: 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> commit3dace39060Author: 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) commit3f6eac48d1Author: 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> commit16f07cf9f4Merge:f5af21b794c4435b1aafAuthor: 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 commitf5af21b794Merge:4f269afb074fa871136fAuthor: 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 commit4f269afb07Merge:2ee74131979f963ffd22Author: 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 commit2ee7413197Author: dearmochi <1496804+dearmochi@users.noreply.github.com> Date: Wed Jul 7 14:50:28 2021 +0200 Sanitizes incoming Discord PMs (#16321) commit1ab701e731Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Tue Jul 6 21:56:12 2021 +0100 fix (#16316) commit7c505d93d9Author: 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 commit22b83565d2Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon Jul 5 18:28:18 2021 +0100 damn rogue characters (#16309) commit3efc77a9e8Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com> Date: Mon Jul 5 13:27:53 2021 -0400 fixes spelling error. (#16308) commitb6f334f92fAuthor: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Sun Jul 4 23:44:44 2021 -0400 applys correct fix commitf9ef6a6d38Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sun Jul 4 12:01:47 2021 +0100 Observation Console Fix (#16296) commitf4e07cd148Author: 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 commit6121d42776Author: 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) commitc4435b1aafAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jul 3 11:20:45 2021 +0100 Refactors ban logging commit1b1f49ac81Author: 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... 🎵 * 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> commit7e16877a2eAuthor: 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 commit15b7a76c91Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Fri Jul 2 14:39:58 2021 -0400 Fixes syndicate teleporter saving throw bug (#16287) commit5a0eafb0a8Author: 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. commit4fa871136fAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jul 2 17:24:14 2021 +0100 Sabre suggestion + Runtime fix commit38fdfa5813Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jul 2 16:55:53 2021 +0100 Refactor honksquads commit7413256cb8Author: 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> commitb85b672b9dAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jul 2 13:51:18 2021 +0100 Nerfs sorium and LDM commit1af34decd7Author: 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 commit66cc94be42Author: LordShekelstein <81524060+LordShekelstein@users.noreply.github.com> Date: Fri Jul 2 05:55:23 2021 -0400 fixes the grammar error (#16280) commitd9d09deb00Merge:fe24ce4d759b86a42a3dAuthor: 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 commitfe24ce4d75Merge:dd9278ae98516cd5d557Author: 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 commitdd9278ae98Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Wed Jun 30 22:47:01 2021 +0100 bomb (#16273) commit41c69d9911Author: 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 commit34497c8e07. commit34497c8e07Author: S34NW <12197162+S34NW@users.noreply.github.com> Date: Wed Jun 30 12:41:39 2021 +0100 Ai now gets stunned, not dusted commit516cd5d557Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Fri Jun 11 22:11:32 2021 +0100 Improves new player GCR commitec967cbaa7Author: 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> commit0690c3ddddAuthor: 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> commit7de29bd81fAuthor: 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 commit27fe4da2dfAuthor: 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> commitc1d19836e1Author: 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 commit7f6c31e7a4Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue Jun 29 06:44:45 2021 -0400 Gives the syndicate the latest tech (#16177) commitbcb0cbe5cbAuthor: 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> commit9a21cf1d4bAuthor: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com> Date: Tue Jun 29 07:43:08 2021 -0300 no more message (#16202) commite08220e76cAuthor: 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 commit612bb0a3bbAuthor: 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. commita92af2a3f8Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Tue Jun 29 06:34:53 2021 -0400 Ports dark gygax sprite from TG (#16243) commit1e9ed4c648Author: 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> commit5f4df80909Author: 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 commite99a5952aeAuthor: 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) commit1ace0bd912Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Mon Jun 28 15:16:41 2021 +0100 Fixes bot pathing (#16270) commit9f963ffd22Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Jun 28 12:08:27 2021 +0100 good enough commitd083eb25e7Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Jun 28 12:00:32 2021 +0100 oh boy do I love spacing commit83d3045cbdAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Jun 28 11:59:35 2021 +0100 More improvements commit2b147b29c2Author: 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 commit206cedd07dAuthor: S34NW <12197162+S34NW@users.noreply.github.com> Date: Sun Jun 27 18:18:17 2021 +0100 Farie code review commitc266b27aedAuthor: 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> commit6080189ea3Author: 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> commitd6f15657feAuthor: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Sat Jun 26 16:33:40 2021 -0400 Fixes contractors removing ipc power cord (#16262) commit4a30b87a26Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat Jun 26 14:39:37 2021 +0100 thralls no longer waste your blood (#16257) commit672f900b40Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat Jun 26 14:36:40 2021 +0100 fixes RPD eating TEG circulators (#16258) commit26b0ee7c8fAuthor: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 25 19:07:32 2021 +0100 code review part 2 commit65c985b301Author: 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> commit8e383c6fc5Author: 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> commiteb5fa5080cAuthor: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Fri Jun 25 12:48:04 2021 -0500 Update robot_upgrades.dm (#16248) commit71eef5de41Author: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 25 13:17:26 2021 +0100 🔔 Come get your early returns here! commita601abed31Author: 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 commitea6126f210Author: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 25 11:31:53 2021 +0100 early return it is commitc2343fe671Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 25 11:26:11 2021 +0100 Apply suggestions from code review commit10e61d8836Author: S34NW <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 25 11:22:09 2021 +0100 fix the exploit commite4d1788088Author: 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 commit9b86a42a3dAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu Jun 24 17:29:18 2021 +0100 Casing commit956daa36ecAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Thu Jun 24 12:32:53 2021 +0100 Farie tweaks commitf11a934dedAuthor: Matt <namen937@gmail.com> Date: Thu Jun 24 04:13:12 2021 -0700 Change all off-station power terminals to /monitor/secret (#16245) commitcfddae4a32Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Thu Jun 24 07:11:26 2021 -0400 Prevents cult pylons from converting indestructible walls (#16244) commit93a0b15834Author: 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 commit2fa72b64ecAuthor: 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) commitb1fe555a79Author: 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 <> commit483f31e038Author: 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) commit82b29ba837Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Tue Jun 22 10:41:19 2021 +0100 I hate soulstones (#16227) commitdb333ce392Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Jun 21 13:27:35 2021 +0100 More render tweaks commit6b06ca3ef5Author: 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 commitf1ad48c450Author: Akira Akashi <rubenru09@aol.com> Date: Mon Jun 21 10:42:20 2021 +0100 remove \the from loom.dm (#16222) commit7f40c8dcceAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Mon Jun 21 00:11:11 2021 +0100 Improves our map rendering commit0b375de42cAuthor: 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 commite4d71a172aAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sun Jun 20 12:07:41 2021 +0100 Tweaks commitfc3185dcb6Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Sat Jun 19 23:07:50 2021 +0100 fix (#16209) commit841eb0d309Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jun 19 19:04:00 2021 +0100 And this commit3f1a6bcd35Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jun 19 19:02:37 2021 +0100 This too commitaed6fed004Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jun 19 18:56:48 2021 +0100 Removes some oldcode commit066c61dccdAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jun 19 18:14:37 2021 +0100 Better atom rotation commitfb4cf6841cAuthor: 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) commite852dd90feAuthor: 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 commitdd02435095Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Sat Jun 19 14:10:01 2021 +0100 Fixes secborg batons (#16196) * Cell linking * V2 commit266e7c2dbfAuthor: 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> commit810a94e48bAuthor: 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) commit45449da433Author: 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 commitacfcce6728Author: 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> commit5fb2ccbcfcAuthor: 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 commitd6e71523b1Author: shmabuu <68139038+shmabuu@users.noreply.github.com> Date: Thu Jun 17 02:41:39 2021 -0700 No more CQC discount (#15920) commitf28e20af21Author: 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) commit11f6ca1cc1Author: 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 commit85be09d7ceAuthor: 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. commit9e28cc0afeAuthor: 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) commite64d8d9de2Author: 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 commit00de6dc6c1Author: 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 commitbb972cb110. commitc55acec92bAuthor: 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> commit75375efce9Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jun 17 10:23:14 2021 +0100 Why is this a thing, really (#16169) commit5de0ebddafAuthor: SabreML <57483089+SabreML@users.noreply.github.com> Date: Thu Jun 17 10:18:17 2021 +0100 plamsa (#16178) commitb7bef4f2e8Author: 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> commitb7d9fcf87aAuthor: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Wed Jun 16 13:23:34 2021 +0100 fix (#16191) commit4d26621d0bAuthor: 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) commit268f1cf833Author: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com> Date: Tue Jun 15 08:56:23 2021 -0300 jumpboots use the correct icon (#16181) commit455836c189Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com> Date: Tue Jun 15 12:55:56 2021 +0100 fi (#16184) commit01c0c86d01Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Mon Jun 14 05:35:54 2021 -0500 robobrain runechat fix (#16176) commit18f47d2ef3Author: 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> commit8ddfe635b5Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sun Jun 13 16:18:43 2021 +0100 AAAAAAAAAAAAAAAAAAAAAAAAAAAAA commit91c3d1750dAuthor: Farie82 <farie82@users.noreply.github.com> Date: Sun Jun 13 16:18:12 2021 +0200 Makes machinery/shields GC properly (#16174) commit89d6a26991Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Sat Jun 12 20:14:58 2021 +0100 Not required commit70447e7a4bAuthor: dearmochi <shenesis@gmail.com> Date: Sat Jun 12 19:23:38 2021 +0200 Fix forum link runtime (#16166) commit7f6a28f16dAuthor: 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 commitddacfbb009Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Sat Jun 12 16:22:35 2021 +0100 fixes exploit (#16164) commit872de72dc6Author: 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 commit79fe4f7dd2Author: ppi13 <rainbowdestroy@gmail.com> Date: Fri Jun 11 18:23:06 2021 +0200 Fixes singularity radiation not reaching rad collectors commit75eb603e5bAuthor: 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> commitfc04f2fa26Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 11 15:24:38 2021 +0100 new format for DMI editor associations (#16152) commit0c66d089a2Author: 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> commit0a6a441aa5Author: dearmochi <shenesis@gmail.com> Date: Wed Jun 9 19:47:25 2021 +0200 Fix nullspaced GPS causing runtime on display (#16146) commit7b20c9dddeAuthor: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Wed Jun 9 03:33:42 2021 -0500 borg malf hack fix (#16143) commit265053f966Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Tue Jun 8 15:05:00 2021 +0100 makes sol trader IDs properly update (#16137) commitd4402f2ebbAuthor: 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> commitcabe76044aAuthor: 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> commit3650a943a4Author: dearmochi <shenesis@gmail.com> Date: Mon Jun 7 21:16:23 2021 +0200 AIs can no longer be pushed in disposal chutes (#16136) commit5896bd2c8eAuthor: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com> Date: Mon Jun 7 13:46:16 2021 -0400 Fixes some exploits (#16134) commitede40b8773Author: 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) commit6191c84860Author: 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> commit9d10cf4260Author: 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> commite8be0bd869Author: 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> commitb890db5cb9Author: S34N <12197162+S34NW@users.noreply.github.com> Date: Fri Jun 4 20:44:07 2021 +0100 fixes runtime in destructive analyzer (#16129) commit3415bfdf21Merge:dfa17e9d071d7015c070Author: 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 commitdfa17e9d07Author: SabreML <57483089+SabreML@users.noreply.github.com> Date: Fri Jun 4 19:23:32 2021 +0100 Drone suicide fix (#16128) commitf451b84c07Merge:f80e50588e0efa44aa2dAuthor: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com> Date: Fri Jun 4 12:37:03 2021 -0400 Merge branch 'ParadiseSS13:master' into Despookify commit0efa44aa2dAuthor: 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 commit1080828526. * Unused files commitaacae884caAuthor: 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. commit98b97e02b0Author: 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 commit27f8610b23Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com> Date: Fri Jun 4 04:46:57 2021 -0500 secborg charge fix (#16127) commit1d7015c070Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed Jun 2 22:35:32 2021 +0100 Fixes bad inits on space tiles commit65b70a878dAuthor: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Wed Jun 2 17:07:42 2021 +0000 Gives PRRs qdel log ingame (#16065) commit5a12564b72Author: 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 commit8e6787a791Author: 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 commitf68220879dAuthor: 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 commit0801a51d96Author: 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: Affe… * Updated to newer specs, plus that disposal pipe Added the two holosigns, the missing disposal pipe in the office, and also replaced the bloodbags with the IV closet. * Maps weren't prepared properly in mapmerge2, redo * Update delta.dmm * Update delta.dmm * Purged tags and pixel 0 * 1 pixel buttons