Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Reworks the morph. Makes it a more stealth ambush oriented antag #15208

Merged
merged 23 commits into from Nov 17, 2021

Conversation

farie82
Copy link
Member

@farie82 farie82 commented Dec 29, 2020

What Does This PR Do

Makes the morph more stealth and ambush focused. Like a mimic in DnD or such.

  1. Morphs now remember forms they learned. They can switch between them on the go (after a short do_after)
  2. While morphed morphs are slower. This form is not meant for traveling
  3. Morphs are a bit faster while in normal form. Still slower than humans.
  4. While morphed morphs can prepare an ambush. This will make their first attack extra powerful and will weaken the target. When somebody touches the morph with their hands they will ambush them as well dealing even more damage. Walking away or attacking things/getting attacked will stop the ambush. Preparing for another 15 seconds will make their disguise perfect. Removing the there is something wrong message when examining. An alert will be shown to notify the user that he's in this mode.
  5. Morphs can remember up to 5 forms. After that they will forget the oldest form.
  6. Morphs gather food points when eating mobs and lose it when eating items (can't eat items if they have no food points). Bigger mobs mean more points. Humans also have a bonus. They start with a bit so they can use some abilities
  7. Morphs can "reproduce" once they ate enough mobs. 5 humans right now or equivalent. A new morph will spawn from the signed up ghost pool. Morphs can only start reproducing on a floor tile. While a ghost is being picked they can't vent crawl.
  8. Being eaten by a morph now will turn your suit sensors off if possible. Prisoner jumpsuits are an example of where this is not possible
  9. Morphs eating light sources will try to extinguish them to avoid becoming a light source themselves
  10. Morphs can no longer turn into certain things. Like effects or things that are way to big
  11. Morphs have objectives! EAT AND REPRODUCE!
  12. Morphs can open vents/scrubbers at the cost of stored food. Takes a bit to do for the user and then it slowly burns away 4 second total.
  13. Eating items as a morph now takes 3 seconds instead of 21
  14. Morphs can pass closed airlocks using an ability. This takes 6 seconds and won't work on bolted airlocks.
  15. Morphs are now unpushable and unpullable in their true form.
  16. New dead sprite for the morph. The old one was... weird
  17. The Gluttony ruin now has a matter eater injector instead of the morph injector. It would be problematic to have miners become morphs now since they can reproduce and what not.
  18. Turning into an object with the color var set to anything now properly resets your color once you become your true form again as morph

I've also changed the NPC behaviour to correctly use the new mimic spell and ambush ability. They do cheat though

All action button sprites except the pass airlock one were provided by @smokincheez
Dead morph and the pass airlock action button sprites was provided by @Pewtershmitz

Fixes a bug where wirecutters did not return a value when the attack succeeded. Dunno how much this impacted though

Fixes: #13800 since it removes the glut ruin morph injector. Thus no more cheese. Other cases can be dealt with using admins

Why It's Good For The Game

A morph is currently a bit... boring? It can turn into things but then it has no real ambush ability. If you undo your form you will be to slow to catch them and you do to little damage to actually hurt them enough to slow them down usually.
This PR aims to make morphs a dangerous foe for the crew. And something the crew should be paranoid about when finding a random taser in maintenance.

Images of changes

morph_ambush_morph
Morph morphing and ambush

5N7oGaX5ZH
When somebody tries to use the mimic while in ambush mode

i1fmMBLgNl
Open vent ability

jz0wgV3tx5
Reproduce ability (you spawn on the same tile)

morph_airlock
Morph passing through airlocks

Changelog

🆑 Farie82 smokincheez Pewtershmitz
add: Added the Mimic spell. Works for morphs. Potential to work for other mobs (doesn't work yet). When used on other objects you will start to remember their form. When used on yourself you will get the option to morph into a remembered form
add: Morphs can now prepare an ambush when morphed. Dealing a ton of damage and will weaken the target.
add: Morphs now gather food points when they eat. This can be spent on eating non mobs and reproducing
add: Morphs can reproduce by eating enough mobs (5 humans will do)
add: Morphs can open welded vents/scrubbers at the cost of stored food
add: Morphs have formal objectives now. EAT AND REPRODUCE
add: Morphs can now pass through closed airlocks which are not bolted using an ability
tweak: Eating items as a morph costs food. 5 per item you eat. Not enough food points means no eating items
tweak: Being eaten by a morph turns your suit sensors off if possible
tweak: Morphs will try to extinguish light giving objects when eating them. Avoiding them to become a light source themselves
tweak: Morphs now use the Mimic spell.
tweak: Morphs are a bit faster when not morphed and slower when morphed.
tweak: Morphs do a bit less damage in normal form
tweak: Morphs can no longer transform into effects or objects to big.
tweak: Eating items as a morph now takes 3 seconds instead of 2
tweak: Morphs are unpushable and unpullable in their true form
tweak: Gluttany's ruin now has a matter eater injector instead of a morph injector
imageadd: Action background for morphs by smokincheez
imageadd: Icon for the mimic spell and the morph ambush, vent open and reproduce ability by smokincheez
imageadd: Alert icon for the morph ambush ability
imageadd: New dead morph sprite by Pewtershmitz
imageadd: Icon for the morph pass through airlock action button sprite by Pewtershmitz
fix: Turning into an object with the color var set to anything now properly resets your color once you become your true form again as morph
/:cl:

@farie82 farie82 marked this pull request as draft December 29, 2020 17:41
@AffectedArc07 AffectedArc07 added Balance This PR will modify how effective something is or isnt Tweak This PR tweaks something ingame labels Dec 29, 2020
@farie82 farie82 marked this pull request as ready for review December 29, 2020 21:27
@Drobe50
Copy link

Drobe50 commented Dec 30, 2020

Does this also affect the morphs created by mining loot?

@Peakwastaken
Copy link
Contributor

Morphs also desperately need more concise objectives.

I've seen a midround morph, disguised as an e-dagger, working as a sec offcer's partner, staying hidden until the officer was in danger and then revealing themselves to attack/drag them away... when ahelped, the answer was pretty much that morphs don't have objectives and as such are free to do whatever. This was an extremely frustrating experience and I really, really, think some clearer objectives for them is needed.

@farie82
Copy link
Member Author

farie82 commented Dec 30, 2020

Does this also affect the morphs created by mining loot?

Yes any type of morph. Mining morphs are... a pain in the ass for me. I am not sure if they are seen as antags or not

Morphs also desperately need more concise objectives.

I've seen a midround morph, disguised as an e-dagger, working as a sec offcer's partner, staying hidden until the officer was in danger and then revealing themselves to attack/drag them away... when ahelped, the answer was pretty much that morphs don't have objectives and as such are free to do whatever. This was an extremely frustrating experience and I really, really, think some clearer objectives for them is needed.

Aye I hate those morphs as well. I'll think about adding some goals to make them unable to be "friendly" (disgusting).
I hope that the ability to reproduce and their abilities relying on eating mobs also helps with that

@farie82 farie82 marked this pull request as draft December 30, 2020 16:31
@farie82
Copy link
Member Author

farie82 commented Dec 30, 2020

New update:
Morphs can open vents now by spending collected food. Gif coming soon.
Morphs have actual objectives now. All be it simple.
Morphs no longer can become effects and big things like the DNA vault or the dead clockwork god on lavaland. (might still not have covered all the edge cases though)
They start with a bit of stored food now

Sprites will be added soon. Made again by smokincheez!

@procdrone
Copy link
Contributor

Greetings mimic.

Good change.

@farie82 farie82 marked this pull request as ready for review December 30, 2020 19:25
@Spacemanspark
Copy link
Contributor

Very well made. Looking forward to this.

@farie82
Copy link
Member Author

farie82 commented Jan 7, 2021

TM was done. Quite some issues were found and I got a lot of suggestions. Here a summary:

  • Examine was broken... making the morphs appear normal while disguised. Fixed
  • Morphs could split in vents. Fixed now by making them unable to do that + they can't vent crawl while the ghost player gets picked.
  • I've nerfed their base speed and morphed speed a bit
  • Their healing is now based on the food gained from the being eaten. It is a 1 on 1 conversion. So 30 healing from a human. Was 50 for all
  • Fixed a bug where morphs could hide under vents when they disguised themselves as hidden maint drones or other hidden beings. They will now always be positioned on the Mob layer
  • When using the ambush ability you now won't get the food left message
  • Fixed a rogue pixel on the dead morph sprite (maybe another sprite will be made. Maybe not)
  • Morphs can now pass through closed airlocks using an ability. Bolted airlocks will prevent the morph from passing it. No more having to break down maint doors when you spawn
  • Fixed a bug where the ambush do_after didn't stop when unmorphing
  • Fixed a runtime when you morphed twice without unmoprhing
  • Fixed a runtime when remembering more than the limit of the forms
  • Morphs can now not be pulled/pushed when they are in their true form. Morphs are slower now so getting away is painful already. Cheesing them getting away by pushing/pulling them is not possible now when they are unmorphed.
  • When sitting still for another 15 seconds after preparing your ambush you will get a perfect disguise. This means that the "hey this looks weird" message when examining you does not get shown.

TODOs:
Add a sprite for the pass through doors ability.
Maybe add another sprite for the dead morph

Maybe stuff:
Add thermals to the morph. I can see why that would be nice but I don't want to give them to much buffs.
Remove the health HUD from them. This would make them even harder to detect. Maybe...
Make morphs spawn near vents more. Now they got the go through doors ability I don't think this is needed. Some of their spawns are already near a vent anyway.

code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/game/gamemodes/miniantags/morph/morph.dm Outdated Show resolved Hide resolved
Comment on lines +28 to +31
/obj/effect/proc_holder/spell/morph/before_cast(list/targets, mob/living/simple_animal/hostile/morph/user)
user.use_food(hunger_cost)
if(hunger_cost)
to_chat(user, "<span class='boldnotice'>You have [user.gathered_food] left to use.</span>")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The way this is set up makes abilities which cost food give confusing feedback in chat:

image

user.use_food(hunger_cost) should probably go further down in the chain of spell procs or something.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aye I saw that as well while testing. Issue with fixing this is that I have to refactor the spell code even more :(
The costs are currently deducted before a cast. So if the user cancels the cast midway they will get a refund then the message will make more sense. Currently the after_cast proc is also always called no matter what cast returns so putting it there will lead to even worse messages. You have 30 left. You have 20 left (since it gets reversed before the after_cast gets called.

I think I'm gonna leave this one in till that refactor

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah alright, I don't blame you, spell code is confusing/annoying to work with. Refactor is out of scope.

@@ -0,0 +1,50 @@
// TODO refactor when spell code is component based instead of OO based
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Component based? 👀

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not the components as in DM but more like described here https://en.wikipedia.org/wiki/Component-based_software_engineering
The targeting on it's own can be a datum or so which you can just put on your spell at will. Which will reduce the OO madness where you can't make a morph AOE spell and a morph click based spell
Soon:tm:

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh ok I was thinking datum components, and I got excited for a minute 😄 Still, sounds like a good idea.

var/mob/C = pick(candidates)

var/mob/living/simple_animal/hostile/morph/new_morph = new /mob/living/simple_animal/hostile/morph(get_turf(user))
var/datum/mind/player_mind = new /datum/mind(C.key)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think I've ever seen a new mind created like this when used for ghost roles. The observer should already have a mind (hopefully). Is there a reason you did this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you transfer the mind from the observer to the morph then they will keep their old objectives and memories. Even their martial arts and the like...
I don't want a hijack morph with carp :P

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true I suppose.. which means it already happens with human based ghost roles, abductors, SITs and so on. 😳 At least, I think so.

Edit: Nevermind, they're given new minds.

@AllStickyGithub
Copy link
Contributor

mining morphs are... a pain in the ass for me. I am not sure if they are seen as antags or not
If we are going to make a powerful antag out of morphs I am not sure we can justify leaving a free antag item on lavaland. The lavaland morph was never intended as an antagonist though. It was more like something miners could use to goof around with and miners have been punished by admins for abusing it. The real problem I see is the reproduction. If a miner morphs starts to reproduce what rules should the offspring follow?

I loved the TM though and if the gluttony ruin has to go for this it will still be worth it.

@farie82 farie82 marked this pull request as draft January 8, 2021 23:08
@TheYeetster1
Copy link
Contributor

Was playing a round, Gluttony's Ruin Morph disguised as the bar sign, which is 2 tiles wide. I think you asked to be notified if you missed anything that they shouldn't be able to be disguised as? @farie82

@farie82
Copy link
Member Author

farie82 commented Jan 10, 2021

Was playing a round, Gluttony's Ruin Morph disguised as the bar sign, which is 2 tiles wide. I think you asked to be notified if you missed anything that they shouldn't be able to be disguised as? @farie82

Yep! Thanks for the comment. I'll add it to the blacklist. I'm sure I won't get all the items but getting most "common" ones on the station would be good

Copy link
Contributor

@Necaladun Necaladun left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks way more fun to me

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Feb 24, 2021
@Spacemanspark
Copy link
Contributor

@farie82 A morph was also able to disguise itself as sparks recently. Not sure if that's fixed in this PR but worth mentioning.

@farie82
Copy link
Member Author

farie82 commented Feb 24, 2021

@farie82 A morph was also able to disguise itself as sparks recently. Not sure if that's fixed in this PR but worth mentioning.

Yeah that is fixed here. Ive made it impossible to become an effect

@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Feb 24, 2021
@farie82
Copy link
Member Author

farie82 commented Mar 2, 2021

Small update, the gluttony ruin now has a matter eater implanter instead of the morph injector. Having miners become the new type of morph will be problematic to say the least

@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Mar 7, 2021
@github-actions github-actions bot removed the Merge Conflict This PR is merge conflicted label Mar 7, 2021
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
user.pixel_x = initial(user.pixel_x)
user.layer = MOB_LAYER // Avoids weirdness when mimicing something below the vent layer

playsound(user, "bonebreak", 75, TRUE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This sound still makes me physically cringe whenever I hear it

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CRUNCH

code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/datums/spells/mimic.dm Outdated Show resolved Hide resolved
code/game/gamemodes/miniantags/morph/morph.dm Outdated Show resolved Hide resolved
code/game/gamemodes/miniantags/morph/spells/reproduce.dm Outdated Show resolved Hide resolved
Co-authored-by: dearmochi <shenesis@gmail.com>
@github-actions github-actions bot added the Merge Conflict This PR is merge conflicted label Mar 20, 2021
@S34NW
Copy link
Member

S34NW commented Jul 1, 2021

Is this in a ready state (minus the conflict?)

@farie82
Copy link
Member Author

farie82 commented Jul 1, 2021

Is this in a ready state (minus the conflict?)

Yep yep. All finished

@dearmochi dearmochi added GBP: No Update and removed Merge Conflict This PR is merge conflicted labels Nov 17, 2021
@dearmochi dearmochi merged commit c4cda09 into ParadiseSS13:master Nov 17, 2021
@farie82 farie82 deleted the morph-rework branch November 18, 2021 18:50
Dragonkiller93 added a commit to Dragonkiller93/Paradise that referenced this pull request Nov 30, 2021
commit ca87534d467ccfa80b6893423f087ee0662ae420
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Sun Nov 28 10:18:27 2021 +0100

    Revert "Removes some unnecessary global variables (#16353)" (#17170)

commit 5397d28c4f195fbf76f5f067377ee5e4b1bf87f8
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Sun Nov 28 08:50:27 2021 +0000

    Removes some unnecessary global variables (#16353)

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

commit fa275ffe74666885a4def58a4d3b0f01a4e51b3b
Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date:   Sun Nov 28 03:40:09 2021 -0500

    Fix - Bodybag tags don't disappear when opening/closing the bags. (#17164)

commit 4356dc746f3075eb5c28c1501aa030b519862a42
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Nov 27 18:58:10 2021 +0000

    Ban refactor part 2/3 - Kills off savefile bans (#17135)

commit 40222cdd6ef4be5aa2f769696c6103d0c036108e
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Nov 26 09:22:00 2021 +0000

    Fixes some runtimes where mobs were spawned in nullspace (#17158)

commit 0c8b99f29b955c511cde2d8bd65e4b6c83667036
Merge: d3b93d9dd8 e7fce67fc2
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Thu Nov 25 14:37:29 2021 -0600

    Merge pull request #17145 from hal9000PR/funny-slap

    Fixes abstract items hiding in linen bins.

commit d3b93d9dd8d68514d8b47f6d4aa177bffce410be
Merge: c5149314e1 ca4f01b36a
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Thu Nov 25 14:16:21 2021 -0600

    Merge pull request #17146 from Adrer/Jamming-tweak

    Remove angle brackets from gibberish

commit c5149314e142131c3140ca8f63a054b1f053baf7
Author: Adrer <erwin@lombok.demon.nl>
Date:   Thu Nov 25 09:48:17 2021 +0100

    Removes mention of mechanic in RND Robotics server (#17157)

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

commit 93908eefc8a593495e211bb068091d5cc62c1fe3
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Thu Nov 25 01:29:46 2021 -0600

    Antag datum clean up/refactor (#15084)

commit 57dcffa33e3b9b65cfc81bab83a52a7100687906
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Wed Nov 24 08:55:47 2021 +0000

    Mime finger gun description update (#17151)

commit d445cbc4de7449f7bacfdf37f82e7e3fb0dc991d
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Wed Nov 24 08:53:14 2021 +0000

    Fixes burst weapons not properly having weapon spread when dual wielded (#17149)

commit c9df82da969e8d49cd855e3017581e83680a8db1
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Sun Nov 21 01:50:34 2021 -0500

    hotfix (#17147)

commit ca4f01b36a56d7458b44070e1ca08633d69b8072
Author: adrermail@gmail.com <adrermail@gmail.com>
Date:   Sat Nov 20 22:34:20 2021 +0100

    Remove angle brackets from gibberish

commit e7fce67fc2006d1065b0064c9bd23ec7028dfc47
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Sat Nov 20 14:54:04 2021 +0000

    antidrop pain

commit 870ef7bf91e59e285a5f563df89d93550f76163d
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Sat Nov 20 12:32:43 2021 +0000

    fix and refactor

commit 0f8ceeba237b6bbbcf0d34c2a135938b36a6daac
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sat Nov 20 03:03:31 2021 -0500

    TG Sprite Project: SMES, Supermatter, and Rad Collector (#17139)

commit 66a169fa1af497499b3ea284458b44bed7f24bdf
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sat Nov 20 03:03:12 2021 -0500

    Updates Meteors (#17138)

    * Updates Meteors

    * nitpicks

commit d784880b9e63916fed3bed848e8213bdc8cf66ec
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Nov 19 21:38:27 2021 +0000

    Fixes bad documentation (#17144)

commit 566ad7fccbe347fc2faf953d5f19913f98638ec4
Author: Adrer <erwin@lombok.demon.nl>
Date:   Fri Nov 19 16:09:30 2021 +0100

    Fixes all remaining invisible crates/lockers (#17143)

    * I varedited a single var on a crate on deltastation and all I got was this stupid PR

    * This should be it, the last of the closet fixes

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

commit da544ecbbce2f6cc2a044ee26dedb668cabe0d2a
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Fri Nov 19 09:07:24 2021 -0600

    fax machine fix (#17142)

commit 15ab57d78c5e3cd90dd92261830f7d99b9231f56
Merge: 01044ab481 8e581d06c2
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Nov 18 15:57:07 2021 -0500

    Merge pull request #17047 from hal9000PR/PUZZLE

    Removes prison cubes

commit 01044ab4812ed51741c7bdeadc1347e7747c756d
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Nov 18 13:24:50 2021 +0000

    Ban refactor part 1/3 - Removes appearance bans (#17125)

commit 3a77df7518e4a836e7b795f7533b4c380fa0e148
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Nov 18 11:18:39 2021 +0000

    Fixes a rare bug where you can spawn as IPC cling (#17133)

commit c3877bba402aeeddda0cae5e91334b9a046c93d0
Author: Adrer <erwin@lombok.demon.nl>
Date:   Thu Nov 18 12:17:39 2021 +0100

    Doomsday device detonation plays cinematic (#17130)

    * Adds doomsday cinematic

    * Duplicate code bad

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

commit 7780f1cf81b464f3a68cf2279359f97c3c16e781
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Thu Nov 18 09:55:59 2021 +0000

    signals agony (#17129)

commit 90a18ff17f7b17d1bf2ebe1534b72492165fb938
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Nov 18 02:50:47 2021 -0500

    Refactors Simple Mob Respawning (#17119)

commit cc86264b25394d9a0623506a97ba755a4710d4e9
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date:   Thu Nov 18 02:32:59 2021 -0500

    Remove unnecessary has (#17131)

commit c4cda0930f8ed7218dca57750f749f6c5e35aeed
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Wed Nov 17 17:25:59 2021 +0100

    Reworks the morph. Makes it a more stealth ambush oriented antag (#15208)

    * Reworks the morph

    * Hunger points. Reproduce. Sprites. Other tweaks

    * vent open. Convert to spells. Valid checks. Minor tweaks

    * undo life hack

    * Icons, Fixes, No more morphed lights

    * Item eat fix. All eating takes 3 seconds

    * Add sounds

    * Fixes and tweaks. Pass airlock ability. Ambush screen alert

    * Steel review fixes

    * New dead morph sprite from Pewtershmitz

    * Pass airlock sprite provided by Pewtershmitz

    * No barsigns or cryo cells as mimic

    * Gluttany ruin change

    * Color fix. No forms fix

    * fix the stupid icons

    * Apply suggestions from code review

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

    Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
    Co-authored-by: dearmochi <shenesis@gmail.com>

commit 34b40c786077be5cf83f73d1c1be4896a09e9690
Author: Adrer <erwin@lombok.demon.nl>
Date:   Wed Nov 17 11:11:18 2021 +0100

    Add mecha disabler sprite, remove duplicate carbine sprite (#17124)

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

commit c1f3123fe8e0da1092fc2d7c9a83b58209a71b6a
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Tue Nov 16 22:15:48 2021 +0000

    removes flask thing (#17121)

commit 27a4e47e91fc95858c4f78f506fc49b63e7e800a
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Nov 16 17:13:02 2021 -0500

    Fixes Security Closets Not Having Seclites (#17120)

commit bdf1cebcc0d3192198344b6f26c2252e2e62a101
Author: Adrer <erwin@lombok.demon.nl>
Date:   Tue Nov 16 19:50:37 2021 +0100

    Minor description update advanced mimery (#17114)

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

commit 35a8d99377b39910b8c441adba33fc5089601b39
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Tue Nov 16 13:50:14 2021 -0500

    TGUI Fix (#17117)

commit 55a6c23bc7ada125a8483a311eaf1fffe1f1cef2
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Tue Nov 16 13:49:08 2021 -0500

    Removes civilian: Return of the Assistant King (#17103)

    * Removes Civilian

    * other alt-titles as well

    * further resolution

    * forgot these

    * TGUI

    * hud icon

commit e8add7384ed18830079d8823231651c54b2e096a
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Tue Nov 16 09:42:23 2021 +0100

    Copy paste good, yes (#17110)

commit b912fc901a081aeecd1db10ce9b7b3e1d1d805bb
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Mon Nov 15 20:51:16 2021 +0000

    more banned areas (#17108)

commit 9f533d137d8aa351b65128f67467e78059f4a9dd
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Mon Nov 15 15:43:56 2021 -0500

    [TGUI] Converts Photocopier interfact to TGUI + refactors its code and adds two new features (#17001)

    * yuh

    * God is a bureaucrat

    * Last second fixes

    * Revert "yuh"

    This reverts commit bd7c0fcbb39b23444b5ee35d74e578fbd165aa70.

    * oops

    * Revert "oops"

    This reverts commit 7922b564a65b77e5b39ee8563ae5ace41aea385b.

    * tgui fix

    * Apply suggestions from code review

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

    * Fax Proc Fix + M -> copymob

    * TGUI Tweaks + Autoupdate changes

    * batch suggestions from Mochie

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

    * variable cleanup

    * more refactoring + documentation

    * define documentation

    * Apply suggestions from code review

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

    * adds Destroy() proc

    * attempt #3 to make this pass tests

    * lazy init list stuff

    * Implements LazyInitLists and Cleans up For Loops

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

commit f61eb288290f5260f19bf7ebb23cf450dfdeaf80
Author: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com>
Date:   Mon Nov 15 15:05:25 2021 -0500

    New Fire Extinguisher Sprites - Round 2 (#16739)

    * New Sprites

    * it looks like a duck

    * i have no idea what i'm doing .jpg

    * tweak and fix conflict

    * inhand fix

    * fix merge conflict final one pixel tweak

    * I promise i'm done tweaking

    back to the #6b36c13 design sort of. it just looks better and cuter

commit ab92435be0c9f0f53d8bf3a4f263193c65888ffa
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Mon Nov 15 12:52:56 2021 +0000

    Karma refactor (#17070)

    * Karma refactor

    * This too

    * Fixes recursion

    * Fixes bugs

    * Fixes bad usr

    * Update code/modules/karma/karma_holder.dm

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

    * Logic tweak

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

commit 5e41a1e1d12cf813721518a150f6e37ad53d3941
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 15 06:38:09 2021 -0500

    Ensure Alt Title Sanity (#17104)

commit 6b80bce9c41acdfef6d561c44b2604ce43b2cc29
Merge: 3e75ad4270 e957dc6cd1
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 15 03:46:29 2021 -0500

    Merge pull request #17107 from dearmochi/fix-table-runtime

    Fixes runtime on table frame completion

commit e957dc6cd1908a72fc1b6221044cfec5dbe5c1c7
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Mon Nov 15 09:16:57 2021 +0100

    Fixes runtime on table frame completion

commit 3e75ad42702aa109b7c900c936c356cb6c7c6e19
Merge: 3e40379c8b b723999741
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Mon Nov 15 00:04:54 2021 -0600

    Merge pull request #17106 from SteelSlayer/clownfish

    Fix - clownfish are no longer invisible

commit b723999741bfeb9a92236719625d1a86ee336c6e
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Sun Nov 14 23:26:49 2021 -0600

    clownfish

commit 3e40379c8ba35d363fe3b57cccb16cb7344c021a
Merge: a5c65002b5 19bb1c73fe
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 15:52:45 2021 -0600

    Merge pull request #16915 from Qwertytoforty/Clinging-to-hope

    Reworks changeling strained muscles

commit 19bb1c73fe69ed23f7bc29241dda8667e9acea74
Merge: 0a11de6afe a5c65002b5
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sun Nov 14 16:43:35 2021 -0500

    Merge branch 'master' into Clinging-to-hope

commit a5c65002b576cf9c0c45d5a2e294d0d3f9f507f5
Merge: 1fac0b007d 531bb709b6
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 15:37:04 2021 -0600

    Merge pull request #17100 from Adrer/Cabinet-doors-2-electric-boogaloo

    Fix cabinet doors 2: Electric boogaloo

commit 1fac0b007db8c218b56b098d8290a4b3da8ab6f6
Merge: 2c5c495cd1 a7ec0affaa
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 15:33:48 2021 -0600

    Merge pull request #17092 from datlo/remove-cancer

    Remove commie vending machines

commit 2c5c495cd13fda810b18ff19336a9578d7cb9337
Merge: 1182ecbcfa 7e3420f3d9
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 15:32:41 2021 -0600

    Merge pull request #17064 from Vi3trice/heres-johnny

    Rework the fireaxe cabinet so it uses less sprites, and other tweaks

commit 1182ecbcfa459c8701d9f6abccc29e93bf550c9e
Merge: 3148ec22ce bea948a7d8
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 15:31:22 2021 -0600

    Merge pull request #17084 from dearmochi/remove-ai-living-verbs

    Removes some inherited verbs from AIs and cyborgs

commit 3148ec22ceb2c18f5af6169e29188891aa7c97e7
Merge: 634f9c72f1 6bf0d516d3
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sun Nov 14 15:47:42 2021 -0500

    Merge pull request #17102 from dearmochi/fix-runtime-pr-17096

    Fixes a runtime on organ processing

commit 6bf0d516d34d334d30c16082770895968a426c96
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Sun Nov 14 21:39:36 2021 +0100

    Fixes a runtime on organ processing

commit 634f9c72f123d79cd8624c46a77709c376853faa
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Nov 14 14:34:56 2021 +0000

    Vampire Rework. (#16476)

    * vampire rework

    * fixes and tweaks

    * cleanup + tweaks

    * grug stomp

    * TGUI

    * TGUI rebuild

    * UID fix

    * debugging cooldown fix

    * first review changes

    * subclass refactor

    * tweaks + some sprites

    * blackbox logging

    * tweaks + grammar

    * minor UI tweaks

    * ability icon sprites.

    * placeholder sprite warning fix

    * melee mod code comment warning

    * nullification rework

    * final sprites!

    * fixes

    * sabre review pt 1

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

    * sabre review pt2

    * sprites readd

    * tgui rebuild

    * removes traitor vampires

    * fixes

    * readds sprites

    * runtime fixes

    * hotfix

    * more runtime fixes

    * glare tweak. less confusing when the vampire is stunned.

    * gargantua nerf

    * minor tweaks.

    * hemomancer nerfs

    * bugfixes and cleanup

    * I did a dumb

    * couple of fixes

    * confusion and shadow snare fixes

    * hemomancer nerfs part 2 electric boogaloo

    * TGUI rebuild

    * fixes and easier events

    * Umbrae tweaks

    * gargantua tweak

    * umbrae nerf 2 electric boogaloo. also var edit suggestion

    * runtime fix

    * buffs blood nutrition to be in line with its metabolic rate

    * Henk stuff

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

    * more review changes

    * final tweak

    * affected request + runtime fix

    * FUCK

    * fat fucks

    * darkness tweaks

    * UMBRAE AAAAAAAAAAAAAHH

    * force doors bugfix

    * either git or I am drunk

    * admin rejuv fix

    * I CANNOT SPELL

    * shitnt code

    * steel review

    * tgui rebuild

    * mochi review

    * vampire ability usage logging

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

commit 46d375921602529267c66aafe6d1149a7875bab1
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Nov 14 14:25:22 2021 +0000

    Fixing jaunting not teleporting you to the correct turf. (#17094)

    * jaunt fix

    * fix part 2, actually fixes it edition

    * fix part 3, no revert edition

    * fix part 4, in spaaaaaaace

commit 531bb709b67c1769210a5769844da409d17519e0
Author: adrermail@gmail.com <adrermail@gmail.com>
Date:   Sun Nov 14 14:09:31 2021 +0100

    Fix cabient doors 2

commit 78158de88630932fc2f1e1f109a75acc3ef04581
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sun Nov 14 03:37:50 2021 -0500

    Optimizes Organ Processing (#17096)

commit 2e62b8e6ac9d6a5d419d0827ed68c9241a9f76af
Merge: 236e815dbd 44bbfd7bd1
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 14 00:29:35 2021 -0600

    Merge pull request #17098 from Qwertytoforty/bugs-suck-souls

    Fixes revenant ability bug

commit 44bbfd7bd154d76d68d6d2cf6c6afa7eb1d406c1
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sat Nov 13 23:52:37 2021 -0500

    Fixes revenant ability bug

commit bea948a7d8382c9d59874c96c6189c8938e028a9
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Sat Nov 13 16:29:47 2021 +0100

    Okay, not that

commit 236e815dbde224feae78f5d03f91153123d912a5
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sat Nov 13 15:26:45 2021 +0000

    Refactors revenants. makes them use UIDS, less istyping (#17059)

    * initial commit

    * I am tired okay?

    * overload lights refactor

    * review

    * Review stuff

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

    * Chaos is a ladder

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

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

commit 65f28dcfa5e03b4ab34fadfe348ae306a526be9c
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sat Nov 13 10:19:01 2021 -0500

    Removes Parallax Animate (#17083)

commit 7802581356a36fcefa677c4412afe602947a4883
Author: Adrer <erwin@lombok.demon.nl>
Date:   Sat Nov 13 16:17:07 2021 +0100

    Fixes invisible lockers/crates on Boxstation AND z1 (so they're no longer invisible) (#17069)

    * Changes icon state of literally one locker on Boxstation

    * Fix invisible abandoned vault

    * Why is this a locker we have cabinets

    * I am going to turn into the joker

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

commit f92f20c74c9426112c314ad4fc2d494d178cfce9
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat Nov 13 16:15:24 2021 +0100

    Fix cult structure stacking exploit (#17091)

commit d94614945655bd7c7b2d622027712e02282d9920
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Sat Nov 13 16:11:03 2021 +0100

    It looks good, okay? (#17090)

commit a7ec0affaa9c97d3629f7699323e887e0b279f57
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat Nov 13 14:22:19 2021 +0100

    And on delta too

commit ae3e56fa8a1355a0fb03d9f7a07d1ebd6829ce62
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat Nov 13 14:20:38 2021 +0100

    Remove communist vendors

commit 45d005f2c78ab3404edc81f4abb1f1dac2529adc
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat Nov 13 13:41:44 2021 +0100

    Fix cursed clown/mime masks (#17087)

commit 3d907490a84773fc2eb38345c01d5f461ec6582e
Author: datlo <quentinkoyote@gmail.com>
Date:   Sat Nov 13 13:37:30 2021 +0100

    Prevent drawing teleport runes in the gateway (#17086)

commit f12251aab0d7bb9c00264b7730f7402914c23286
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sat Nov 13 06:35:16 2021 -0500

    Fixes Jitter Animation (#17085)

commit fd86eba8f6c2840e0bf6cdd7c39b80137d8e1de7
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Sat Nov 13 10:40:42 2021 +0100

    Removes some from borgs too

commit 52c47a071f521dfde2864ae4e696f9e19b593328
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Sat Nov 13 09:35:47 2021 +0100

    Removes some inherited verbs from AIs

commit 370c6742000878d714a65cdc9088a5956193178f
Author: Paulo Elienay II <48896572+paulo-e@users.noreply.github.com>
Date:   Fri Nov 12 11:16:42 2021 -0300

    Cult veil-torn text appears to lobby players  #17009 (#17011)

    * fix: #17009

    * style: requested changes

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

    * fix: requested changes

    * Update code/modules/power/singularity/narsie.dm

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

    Co-authored-by: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
    Co-authored-by: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
    Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

commit ad8cbb129be20fd565d846c2803cae06d715a4a5
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Fri Nov 12 04:39:56 2021 -0800

    Update mechtransport.dmm (#17055)

commit de0853e2a09bffc54be8da830e03f17adeb23e52
Author: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Date:   Fri Nov 12 06:36:57 2021 -0600

    ashstorm mmi fix (#17065)

commit 7285cef65c9a0c1caa4d7e185b66996300a8435e
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Fri Nov 12 03:41:26 2021 -0800

    Gives IA Office Power on DeltaStation (#17067)

    * To quote SteelSlayer: Fuck

    * Double Fuck

commit 41e774ab7f68d1e38fb876b69e9feb6844f351ec
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Nov 12 05:22:30 2021 +0000

    Sling veil now properly updates plasmamans helmet sprites. (#17072)

    * fix

    * fix prt 2

commit 61606630f502e34350ef6788d3bfbd0dab61b9f3
Merge: 8061afa550 f7701c65d6
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Thu Nov 11 16:53:04 2021 -0600

    Merge pull request #17077 from dearmochi/fix-hair-gradient-ipc

    Fixes hair for IPCs

commit f7701c65d63ec5edd11bce6723fcc08f72503a51
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Thu Nov 11 22:52:47 2021 +0100

    Fixes hair for IPCs

commit 8061afa550c2a5a0ddedeaf8b2bd947bd58f685b
Merge: 06df88706f f2ea16f538
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Nov 11 15:40:21 2021 -0500

    Merge pull request #16172 from dearmochi/hair-gradients

    [READY] Port hair gradient customization

commit 06df88706fd1282f3df3b68790a0f39d98c1c5cd
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Nov 11 15:24:02 2021 -0500

    Beginnings of Combat Changes: Ranged Weaponry (#17075)

commit 6ece7187a08f68fdc3112fe15de75966b66f319f
Merge: e2c10ec83d 39a280effd
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Thu Nov 11 14:09:04 2021 -0600

    Merge pull request #17068 from farie82/fuel-tank-bullet-fix

    Shooting fuel tanks now is logged properly and objects that get qdeleted by bullets now only get hit once

commit 7e3420f3d99b1f6c5e9730571b7bd4b788d41115
Author: Vi3trice <vi3trice@yahoo.ca>
Date:   Wed Nov 10 08:57:55 2021 -0500

    Reordered sprites

commit 39a280effdc45055da0726744d73b11027b7d3f9
Author: joep van der velden <farie82@users.noreply.github.com>
Date:   Wed Nov 10 10:23:47 2021 +0100

    Shooting fuel tanks now is logged properly
    objects that get qdeleted are only hit once by bullets

commit 1a9953412547511a126fc459bb1426f38ebe55a8
Author: Vi3trice <vi3trice@yahoo.ca>
Date:   Mon Nov 8 19:37:53 2021 -0500

    Oh fireaxe closet why you so bloated

commit e2c10ec83ddd8b75924c3480a82206a5ea9f0255
Merge: de8b724dda 1e66469676
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 8 14:40:57 2021 -0500

    Merge pull request #16775 from Qwertytoforty/RIP-AND-TEAR-but-not-nightmare-mode

    Nerfs (S)laughter demons

commit de8b724dda0715aa364060cf00eabcf9714a83d1
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Nov 8 09:03:46 2021 +0100

    NanoMap Auto-Update (Mon Nov  8 01:03:16 UTC 2021) (#17061)

    Co-authored-by: NanoMap Generation <action@github.com>

commit 7142adc49735787cb9634626b51f9582929bb599
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 8 02:37:27 2021 -0500

    Fixes Accidental O2 Canister Removal (#17062)

commit 308814c0d9903bb0213c6e1462ee2363f201178a
Merge: 6cfd7e1305 ee55e06309
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sun Nov 7 23:59:18 2021 -0500

    Merge pull request #17025 from matttheficus/DownWithSpeed

    Removes Leg Muscle Stimulus from DNA Vault

commit 6cfd7e13056989f1bc95bf19f28233bbebf319f2
Merge: 8436e60cba b34ad551b6
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 7 18:32:17 2021 -0600

    Merge pull request #17054 from LightFire53/Yet-another-delta-fix

    DeltaStation Tweaks/Fixes

commit b34ad551b61b9f9fa3c4b58d03c26b689c98302e
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 16:09:07 2021 -0800

    Floating on McCloud 9

commit 25a43ba7a63db16aa96c57e1a297e3e63f8ccdcf
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 15:59:33 2021 -0800

    Revert "Let there be lights!"

    This reverts commit eff32802a2046259627d75e8b782621542e5e45b.

commit f6d5b92a7dd74bfc37000933c42cdc8dc2bf8857
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 15:57:19 2021 -0800

    Revert "Lets create some privacy"

    This reverts commit 6431be5ea6b806c86ab1792b918d2470382fa1ac.

commit 6431be5ea6b806c86ab1792b918d2470382fa1ac
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 13:59:44 2021 -0800

    Lets create some privacy

    Also adds to Psych office

commit eff32802a2046259627d75e8b782621542e5e45b
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 13:21:36 2021 -0800

    Let there be lights!

    Also adds a lot more polarized windows since Sean just made a PR that implemented lots more on Box, citing these locations on Delta.

commit e4c8de209ba0fe0e18d13a257f30127e9eb9937e
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 12:25:08 2021 -0800

    Lights, Dimmers, and Stools

commit bfb87654bda76742030531d0a6b7b29295b7c5e2
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 11:49:38 2021 -0800

    Make Maps not Conflicts

commit 8666ff981a3debdb0e0fac4cd241c3c7f03f7848
Merge: 269fad5bfe 8436e60cba
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 11:29:49 2021 -0800

    Merge branch 'master' into Yet-another-delta-fix

commit 269fad5bfef2033877fafe4271c6632b03d48012
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 11:17:40 2021 -0800

    WHO PIPED THIS PLACE

commit a94a41e3027ed40d38e45ac71f9a20f00c8dd38e
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sun Nov 7 10:42:56 2021 -0800

    Pipes and News

commit 8436e60cba196b485670c8cc959a26fb924f80ac
Author: Miraviel <93430361+Miraviel@users.noreply.github.com>
Date:   Sun Nov 7 19:24:43 2021 +0100

    Update vending.dm (#17014)

    Re-adds officer's cap to SecDrobe, alphabetizes the list

commit 1e66469676ea568b02753552b8126786c84a55af
Author: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Date:   Sun Nov 7 12:37:10 2021 -0500

    Adds an event that uses the base slaughter demon, rather than midround

commit 18c061e9daab402d8bb1022358e08272bb5f6a13
Merge: 9f2f9ac45e eafe6b8b10
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 7 10:25:23 2021 -0600

    Merge pull request #17035 from LightFire53/IAA-QOL

    Adjusts DeltaStation IA Office to support two IA Agents and other QoL changes

commit 9f2f9ac45e2bd3bf1f9c0550e027cd5441d4d483
Merge: aec48dd625 ac68ea59df
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 7 10:24:47 2021 -0600

    Merge pull request #17038 from E-MonaRhg/carpet-stuff-two

    The Subsequent Carpet PR: tweaks and tables edition

commit aec48dd6258ac5fafe19a80c0ed7120209e0cc07
Merge: d39299f809 d9f3696811
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Nov 7 10:21:56 2021 -0600

    Merge pull request #17041 from LightFire53/CryoBorg

    Adds Robotic Storage Unit to DeltaStation Mechbay

commit d39299f809419f936cf0a2867f37746d628abd5e
Author: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com>
Date:   Sun Nov 7 03:06:47 2021 -0500

    violin sprite fix (#17053)

commit 126ab0448082282b643532271f800cb742d78f92
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sun Nov 7 08:05:02 2021 +0000

    Fixes krav's animations (#17052)

    * disarm animation

    * combos

commit 2d8f2f75bc0db17f8a65512fcf06336616725800
Author: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com>
Date:   Sun Nov 7 05:02:56 2021 -0300

    Wall-locker fixes (#17051)

    * fixes wall lockers

    * removes invisible locker

commit 524f0d12533adc87b8c61d09c252ff5bca94fff7
Author: VrazzleDazzle <chaypurg@gmail.com>
Date:   Sun Nov 7 09:00:18 2021 +0100

    Vox Sprites™ (#17049)

commit eafe6b8b10423a6d16addb5be96eeae28af96da5
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sat Nov 6 19:47:50 2021 -0700

    Any Requests?

commit afdbd83afceef4c540d3dae1d991bdd1b9494ca3
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sat Nov 6 19:38:07 2021 -0700

    Missed a window, damn it

commit 2bf5626d3691827c60c7c8c0692c0186f7efd507
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sat Nov 6 19:34:37 2021 -0700

    Make your requests

commit e678913dba9bfec65f4cd8e980de596268847ad2
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sat Nov 6 19:14:27 2021 -0700

    Vague Welding Tool Noises

commit 7aae46e0787b4f07bebffc4db106c3bc995b7ae1
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Sat Nov 6 18:02:40 2021 -0700

    Pipes and wires

commit 44c12c6d9d0e42a9d3a582dff7e9a8d72b6ea68a
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Nov 6 20:42:47 2021 +0000

    Fixes open crate sprites (#17050)

    * fakin underscores

    * more crates

    * sneak this one in too

commit 647cff596259324485f1f6a7d0f87c1cef6ec0e2
Merge: 1739f411a2 0cb1f63df6
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Sat Nov 6 15:38:58 2021 -0400

    Merge pull request #17048 from ParadiseSS13/aa/webedit-2021-11-06-1

    Tweaks GBP values

commit 0cb1f63df65b8ee7499b2200405683ee29f595ea
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Nov 6 19:30:37 2021 +0000

    Tweaks GBP values

commit 1739f411a25d46b0a65af55ed7d541f99dd4d7cf
Merge: 9be92cc1e2 44d8d455bf
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sat Nov 6 14:19:14 2021 -0500

    Merge pull request #16823 from S34NW/3/4th-closet

    3/4ths Sprite Project: Closets

commit 9be92cc1e2ca5be4c24043584a99b277438289c8
Merge: e76eb297d5 68a40eb1f3
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sat Nov 6 14:06:06 2021 -0500

    Merge pull request #17045 from AffectedArc07/gbp

    GitHub Balance Points

commit 8e581d06c2745c3f3340de5a88feba394e7dde64
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Sat Nov 6 18:25:21 2021 +0000

    remove don't remove

commit e76eb297d53cda362e161272f984ff6c9d4ff466
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Nov 6 17:22:28 2021 +0000

    Reactive armour now logs any damage done (#17030)

    * fire from reactive incendiary now logs

    * other armours too

commit d9f4553c54d3318283c6cc35841254f636b4f516
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Sat Nov 6 18:22:07 2021 +0100

    Adds attack logging to the rev drain ability (#17036)

commit 68a40eb1f3b3be936c0e057d516b448c4fe6bb46
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Nov 6 16:35:21 2021 +0000

    GitHub Balance Points

commit 2fdcbf85518cc2691a783eb8844b08ab0de21900
Author: SweetBlueSylveon <55075747+SweetBlueSylveon@users.noreply.github.com>
Date:   Sat Nov 6 09:34:17 2021 -0700

    Grey Plushie Get! (#16991)

    * Adds a Grey Plushie

    Adds a grey plushie to the game, putting it as a loadout option, and adding a new sprite.

    * Adds water interaction

    Adds a water_act to the plushie. The plushie will now changed to "grey_singed" when touching water.
    Upon touching water the plushie will scream and go "AAAAAH!" which then puts all text and audio interactions onto a 300 cooldown.
    The plushie can also be hugged to make it go "Ow..." if its icon is set to singed. This is on the same cooldown as vox screams.

    * Minor fixes

    Fixes minor syntax and redundancy problem in the code.

    * Updated sprite

    Adds new sprites for grey_plushie and grey_singed.

    * Converts Cooldown and spawn system to timer.

    Changes the cooldown and spawn system to a timer and callback system.

    * Update code/game/objects/items/toys.dm

    Adds early return.

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

    * Update code/game/objects/items/toys.dm

    Simplifies code, corrects mistakes.

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

    * Complicated

    -Splits the cooldown variable and proc into two, one for hugging one for screaming.
    -Adds more BOOLEAN
    -Properly implements Timer and Callback system.
    -Adds early returns.

    * Revert "Complicated"

    reverts dme changes.

    * Adds an if statement

    Adds an if statement so that the server is not setting the icon and description every time the plushie gets wet.

    * Minor correction

    Fixes the order of the if statement and changes its type.

    * Reverts test change

    Last commit had testing changes I failed to revert before pushing.

    * Changes the sprite.

    -New, smaller icons.
    -Slightly heavier shading.
    (Can be undone and edited further, I still have the other sprites)

    * Another sprite update

    -I learned to use HSL.

    * Small bugfix

    Last code update I wrapped the screaming proc into the "don't set the icon and description if it's already singed" by accident. Swapping them around fixed it, and it will now be able to yell from water every 30 seconds again.

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

commit aa8a63b06066de2a23bda96cef80dcb1b88dd767
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Nov 6 16:34:02 2021 +0000

    The dawn of a new era (#17044)

commit 7afeb9a4f9140bf705b786a023a62db8be9bff54
Author: Charlie <69320440+hal9000PR@users.noreply.github.com>
Date:   Sat Nov 6 14:08:37 2021 +0000

    fix (#17043)

commit 3bff4aba4cf7699017f80b79240571115eac724c
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Nov 6 07:34:55 2021 +0000

    Flourescent Tubes (#17032)

commit 15cf9a2a93455b5861b4d850710226df46873345
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sat Nov 6 08:16:27 2021 +0100

    NanoMap Auto-Update (Sat Nov  6 01:00:54 UTC 2021) (#17039)

    Co-authored-by: NanoMap Generation <action@github.com>

commit d9f36968116a3ca812f3510159dd6a44b20b8e97
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Fri Nov 5 20:29:33 2021 -0700

    Pre-emptive fixes

commit 49070672cff3a8bf65ff1c49ec3e0f103b34e1f0
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Fri Nov 5 20:07:41 2021 -0700

    Do cyborgs dream of electric sheep?

commit 0e64651fe7f7f67dafbeeed97f10a47f13fea03f
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Fri Nov 5 18:40:43 2021 -0700

    Half of these ain't even my fault

    Sean changes

commit ac68ea59df3487ecd2415c44c42a1b05fd264ec1
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Fri Nov 5 19:46:42 2021 +0200

    Carpet and table stuff

commit f11ad29e8d5ba2d821eba7e2b51f38945433c707
Merge: 97a88da9a9 267960fbcc
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Fri Nov 5 08:39:53 2021 -0500

    Merge pull request #16824 from PacifistDalek/burger-tg-sprites

    TG Sprite Porting: BURGERS Edition

commit 97a88da9a9cb565889cd72b7e15aac6c0a2e83d9
Merge: 6102145ded 8af58be3d9
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Fri Nov 5 08:38:30 2021 -0500

    Merge pull request #16895 from lewcc/vomit-comet

    Nutriment Pump Implants make you projectile vomit when EMPed

commit 6102145deda7a67733260e7883ccf0254d8a2c65
Merge: db3a3c8bc2 7a8da30830
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Fri Nov 5 08:37:54 2021 -0500

    Merge pull request #16909 from S34NW/tg_plant_stuff

    Ports better grass and jungle objects used in TG

commit db3a3c8bc2cfd90dda6a47c7244458743ec29cd3
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Fri Nov 5 13:04:49 2021 +0000

    Adds Paradise API support (#16981)

commit 0de8f5a81e6da4040cb2dc9a296fc889c842224c
Author: Paulo Elienay II <48896572+paulo-e@users.noreply.github.com>
Date:   Fri Nov 5 09:30:38 2021 -0300

    docs: adds faster downloads to push too (#17024)

commit 9f67e43493853694c889b38caa23803284cf6add
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date:   Fri Nov 5 05:23:26 2021 -0400

    Prevents usage of martial arts with the passive trait (#16988)

    * Prevent passive mobs from using martial arts

    * Update laser reflection, clean up combo message

    * Silence annoying message

    All martial arts just check if the user is a pacifist or not before executing

commit 3bbe06f3fecac78df5a6ed641b1525e7cdab54a1
Author: Farie82 <farie82@users.noreply.github.com>
Date:   Fri Nov 5 10:18:53 2021 +0100

    Makes it possible to announce the ERT denial to the crew (#16842)

    * Makes it possible to announce the ERT denial to the crew

    * can deny ERT now when sender is KO or has no headset
    refactored the stuff around it

    * Apply suggestions from code review

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

    * Sabre's review
    Message format for the input
    Early return

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

commit d94210031b0114fec908887339fefcb7a1ca7494
Author: datlo <quentinkoyote@gmail.com>
Date:   Fri Nov 5 10:12:09 2021 +0100

    Refactor C4, subtypes, and airlock ex_act (#16995)

    * Refactor C4 and Airlock ex_act

    * update uplink desc

    * Replace ismob by carbon, clarify comment

    * remove unnecessary ismob check

    * replace destroy by qdel, fix comment

    * auto doc comments, add else condition

    * Add comment to shaped c4

    * Shortens shaped boom proc, make airlocks more resistant against light ex

commit 640a20878aa875a3861063282ce99e091bcc5818
Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date:   Fri Nov 5 05:01:58 2021 -0400

    Item attacks send no logs if they have no force (#17029)

    * Hush if no force

    * Move it to the other force check instead

commit 3b7e9fee93eb40124a9ef2a6915b0ce4b85a9098
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Fri Nov 5 08:11:10 2021 +0000

    refactors butchering of humans with chainsaw/meatcleaver (#16812)

    * traits

    * examine

    * I am incapable of writing

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

    * people

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

commit 2c4dc4fccb3e3306e81cdb88ddae7a92e17888f8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Fri Nov 5 08:50:22 2021 +0100

    NanoMap Auto-Update (Fri Nov  5 01:02:17 UTC 2021) (#17031)

    Co-authored-by: NanoMap Generation <action@github.com>

commit 6b9f35cb09bf9f8a92f27e0b5beff477e89c522e
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Thu Nov 4 18:30:10 2021 -0700

    And make it double

commit 61337c27602ad1e8becd222ce2c59b1e2e9c6656
Author: LightFire53 <LightFire53@users.noreply.github.com>
Date:   Thu Nov 4 17:58:01 2021 -0700

    Prepare for trouble

commit 1c3c2c22addb0143fae19d5f915e68f3825271ef
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Thu Nov 4 18:47:31 2021 +0000

    Name Capitalisation Tweaks (Weapons) (#16906)

    * Weapon names

    * Assault rile

    * More #coding_chat tweaks

    Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

    * Missed these

commit 705768abd6c7516ccd040f3fc1eb5c380b69acf1
Merge: 7abc485a78 53d8fe677d
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Nov 4 14:09:34 2021 -0400

    Merge pull request #17010 from S34NW/electrochromic_spawner_thingy

    Passes ID var from window spawners to electrochromic windows

commit 7abc485a780812d7edd4549319311ca2a0dd849e
Author: Paulo Elienay II <48896572+paulo-e@users.noreply.github.com>
Date:   Thu Nov 4 15:00:21 2021 -0300

    Unable to remove solar panel assembly from a bag of holding #17021 (#17023)

    * fix: #17021

    * style: project style

    * refactor: project style

    * refactor: requested changes

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

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

commit 53d8fe677d471219d86368723a649fd043dde07c
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Thu Nov 4 17:50:44 2021 +0000

    Update code/game/objects/effects/misc.dm

commit 4f29cb441f3f5190dd7827bf9e42cb39d2585fac
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Nov 4 17:36:02 2021 +0000

    Hands TGUI ownership over to mochi (#17033)

commit 2684afc85b64fae3212b8654d807694513cca13f
Merge: 4456caf3cb 6f405149f2
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Wed Nov 3 20:08:01 2021 -0500

    Merge pull request #17027 from Sirryan2002/birdsarentreal

    Fixes a spelling mistake in implanter.dm

commit 4456caf3cb5e788cb24f34e546476dbd34bb30d1
Merge: c6465fc014 1660df05ff
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Wed Nov 3 20:07:07 2021 -0500

    Merge pull request #17028 from paulo-e/fix/17016

    Ash Walker wasn't an offstation role #17016

commit 1660df05ff65f110d09a4cc0210dfc875c45a424
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Wed Nov 3 16:55:04 2021 -0300

    fix: requested changes

commit fa503a9fc893e68ee1eab7e2653f254995713b2d
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Wed Nov 3 10:56:20 2021 -0300

    fix: #17016

commit 84a027b2bea4a096c1b87c76cf1c6502d6d02a09
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Wed Nov 3 13:13:48 2021 +0000

    crazylemon suggestion

commit 6f405149f239dbb9bb1f41d4626a0f1582898eb6
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Wed Nov 3 02:02:18 2021 -0400

    spell check

commit c6465fc014eaf9e1cdd7370186d07fcdc6e99212
Merge: 5753d9067f cf5ccab58b
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:32:48 2021 -0500

    Merge pull request #16942 from PacifistDalek/hydroponics-sprites-2

    Whole bunch of Hydroponics Sprite changes (redux)

commit 5753d9067f9d27da8a4af801b57ebd7183217c69
Merge: c59f21e4e0 2d35ca9c7e
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:31:26 2021 -0500

    Merge pull request #16933 from matttheficus/GoodbyeCQC

    Moves CQC to Nukies Only, Adds Combat Gloves Minus

commit c59f21e4e0173a24386e027a2c839b721101f3f0
Merge: 6388bb31bb d22c2601d6
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:30:37 2021 -0500

    Merge pull request #16941 from PacifistDalek/beaker-lids-3

    New Beaker Lids (Redux (Redux ok but for real this time final final.psd))

commit 6388bb31bb8d4bc9702ed760c0cfe6ca761f0575
Merge: 1b04314884 922b2437a5
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:28:28 2021 -0500

    Merge pull request #16837 from S34NW/delta_fixes

    Delta station fixes and minor remap

commit 1b04314884472a53a4ae93a57fc3ae2af2b41a84
Merge: 3c663c12cf 17c46a5755
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:24:35 2021 -0500

    Merge pull request #16783 from Sirryan2002/WinterRuin

    Reworks the Snow Biodome Ruin

commit 3c663c12cfd525e3a3e1532b936dd16ebfa2f5fd
Merge: b527838507 be7ca2e19b
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 23:18:04 2021 -0500

    Merge pull request #16561 from hal9000PR/AHA-guidelines-on-outcome-oriented-resuscitation

    Compression only CPR

commit b527838507d12252bfe573a175f90345a25dc331
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date:   Wed Nov 3 00:07:46 2021 -0400

    Fix abductor closet cloning mats (#16985)

    * Update abductor closet to only drop one alloy

    * Revert, make it just cost two alloy to make

commit ee55e063095ef8dd7ebb021eeef401067242dffe
Author: matttheficus <mickusmatthew@gmail.com>
Date:   Tue Nov 2 17:01:12 2021 -0400

    enforcing a speed limit

commit 568d27a5eed5bd005ffdfaceb9d9aef525f10536
Merge: 74f8aeb61d 431c1fe368
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Tue Nov 2 08:54:53 2021 -0500

    Merge pull request #16994 from lewcc/oof-ow-my-organs

    Improve organ damage feedback

commit 991da9a09bf864479c40f1a302df8768b17cef27
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Mon Nov 1 22:33:34 2021 +0000

    safeties

commit 74f8aeb61d9050e70921aa007841128f67c56516
Merge: 2cefacd9b0 c6a309154d
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 1 18:21:53 2021 -0400

    Merge pull request #16951 from SabreML/swarmer-initialisation

    Fixes swarmers initialising multiple times

commit 2cefacd9b0f11eb731c7e49461540a658615aabe
Merge: 25477245d8 816e478302
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 1 18:03:10 2021 -0400

    Merge pull request #17019 from S34NW/trader_fix

    Fixes keyless sol trader vehicles

commit 25477245d83ea47a6bc4ab4db5bb6294d04d3e91
Merge: b9d322bbbe 696e7ebf4e
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 1 18:02:04 2021 -0400

    Merge pull request #17002 from paulo-e/fix/damage_converter

    fix(damage_converter): updates sprite when healed #16495

commit b9d322bbbe5233801aa384ccd41c961f03b49b10
Merge: 13a749c452 e54d406ffb
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 1 18:01:37 2021 -0400

    Merge pull request #17005 from paulo-e/fix/17003

    Can't dispose abstract items #17003

commit 13a749c45252234cb49afc4a9a5546e0443e8984
Merge: 1c2e065a90 a9ccc59e58
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Mon Nov 1 18:00:52 2021 -0400

    Merge pull request #16976 from SabreML/ipc-damage-overlays

    Fixes IPC damage overlays not updating

commit 1c2e065a9080984f6c253532cb2a89c526ae6fa3
Merge: d2d4ec19b4 203d9c14df
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Mon Nov 1 08:42:32 2021 -0500

    Merge pull request #17006 from paulo-e/docs/clone_faster

    Shows how to clone faster in the docs

commit 44d8d455bf52e801054006b94bf5c6057c78991f
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Mon Nov 1 10:18:51 2021 +0000

    merge conflict part 2

commit 1723e0b5038bf86839d3eff61328565f5aa249f7
Merge: 5dc80d6cba 2d3e44511e
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Mon Nov 1 10:14:41 2021 +0000

    Merge branch 'master' into 3/4th-closet

commit d2d4ec19b4c18f187f11c0263f1d98deef03e0f6
Merge: 9996b7bfa3 25a333274d
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:33:50 2021 -0500

    Merge pull request #16989 from rythenx/add-fax-log

    add a notification when replying to fax

commit 9996b7bfa3b62f71742b0975093313d36ecfc1a8
Merge: 416f330481 a3d515ce4e
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:33:24 2021 -0500

    Merge pull request #16990 from Vi3trice/aperture-shower-curtain

    Adds feedback to the Telegun's target setting, and applies it to the current shot

commit 416f330481f353d89a70714443b6fcac507170e2
Merge: 62d0df33ea 8d5409d4ff
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:26:11 2021 -0500

    Merge pull request #16999 from lewcc/xeno-orbit-menu

    Add xenomorph section to orbit menu

commit 62d0df33eafb932f48fe6b7cc7eb50bd53bf874a
Merge: c0e21aa64e bbf92a4d1a
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:25:16 2021 -0500

    Merge pull request #16998 from lewcc/med-scanner-rads

    Add radioactive message to health analyzer

commit c0e21aa64ebc6015a5b24829ec92c105ff0e2d40
Merge: 538c4ec99f 24459904eb
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:24:31 2021 -0500

    Merge pull request #16996 from hal9000PR/bnuuy

    Adds Bunnies.

commit 538c4ec99f024e25487ca59ac4dec389b062b7c7
Merge: 2d3e44511e c57a612c55
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 31 22:24:08 2021 -0500

    Merge pull request #17012 from AffectedArc07/end-of-an-era

    The end of an era

commit 816e478302ad2844882886b03d4e715c94eb0b49
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Sun Oct 31 21:09:33 2021 +0000

    order of operations moment

commit c57a612c55b3b35d6a02ab9ef388a955c5954037
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Oct 30 17:59:39 2021 +0100

    actually lets keep these

commit 62aabe7401d73db358fc2aa84a60bfb744b2a016
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sat Oct 30 10:47:25 2021 +0100

    The end of an era

commit 3d477b3427453db0c27bbbb3f13d3cfedefa913a
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Oct 29 20:44:11 2021 +0100

    leys you use id on spawners to pass them to windows

commit e54d406ffbf88b2845e077b6551530ef873a73f8
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Fri Oct 29 16:18:49 2021 -0300

    refactor: more requested changes

commit 203d9c14dfa3b3fed2a1f81d593172fc349fd882
Author: Paulo Elienay <paulo@pauloelienay.com>
Date:   Fri Oct 29 06:08:02 2021 -0300

    docs: shows how to clone faster

commit c767d4b6e6f4b3911ab3d7683aece6966f330c72
Author: Paulo Elienay <paulo@pauloelienay.com>
Date:   Fri Oct 29 06:02:53 2021 -0300

    fix: reverts last commit and adds comment

commit e3be4db0070533f46ca23b427bd3da0388d9d55a
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Thu Oct 28 17:57:42 2021 -0300

    refactor: requested changes

commit e0eb271a319f328af0eb5bf2adf1cf3712acf560
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Thu Oct 28 16:16:34 2021 -0300

    fix(disposal): DRODEL items now ignored

commit 8b3680798860deab796611bf08954427b0bd532e
Author: Paulo Elienay <paulo@pauloelienay.com>
Date:   Thu Oct 28 12:47:40 2021 -0300

    fix(17003): can't dispose abstract items

    Abstract items (such as slapper) should't be allow to be disposed away.

commit 696e7ebf4e2845eabad9b7d0835708118ac2749e
Author: Elienay Albuquerque <paulo.albuquerque@mv.com.br>
Date:   Thu Oct 28 08:46:53 2021 -0300

    fix(damage_converter): updates sprite when cured

commit 8d5409d4ffed1dce33178f91c28139a5a7d7a68d
Author: lewcc <luc@aura.dog>
Date:   Wed Oct 27 12:36:15 2021 -0400

    Add xenomorph section to orbit menu

commit bbf92a4d1a78c35b0461256cb2756da5b08b1d5a
Author: lewcc <luc@aura.dog>
Date:   Wed Oct 27 10:05:13 2021 -0400

    to_char -> to_chat

commit f2ea16f5385f28c51128094121f06fa1f259fd98
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Wed Oct 27 13:59:51 2021 +0200

    ugh

commit 5328552423148b77d33d90422553dd6723e6ba77
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Wed Oct 27 13:55:26 2021 +0200

    TGUI the silent killer

commit c7046c0756e454338b6d7e2f236a279bd01e417e
Merge: 2dd4c07c34 2d3e44511e
Author: mochi <1496804+dearmochi@users.noreply.github.com>
Date:   Wed Oct 27 13:33:12 2021 +0200

    Merge branch 'master' into hair-gradients

commit 2d3e44511ee00bfe4ee973876d11b70051c8a977
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Oct 27 11:13:01 2021 +0100

    NanoMap Auto-Update (Wed Oct 27 01:01:00 UTC 2021) (#16997)

    Co-authored-by: NanoMap Generation <action@github.com>

commit 812b58acd72c151160f81cc943cf026a0a6ec29d
Author: lewcc <luc@aura.dog>
Date:   Wed Oct 27 01:40:41 2021 -0400

    Add note for user rad contamination

commit f486448a953e38bfb6e3fa4c4fd2f151a1eca165
Author: PacifistDalek <32213277+PacifistDalek@users.noreply.github.com>
Date:   Tue Oct 26 18:33:03 2021 -0400

    Food Cart Refactor (#16869)

    * Food Cart Refactor

    * delete unused old sprites

    * No longer can be deconstructed or destroyed into smartfridge parts

commit 758908e5ffc8d1004656b3137d9db17b497e136b
Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date:   Tue Oct 26 18:32:38 2021 -0400

    CE closet has an RCD (#16820)

commit 037d695bf8eae50c9d6b6f647f117bd254d5c0c5
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Wed Oct 27 00:32:08 2021 +0200

    Mapped in departmental clothing vendors to boxstation (#16689)

commit 932dc69aa79693a44838c5d402cff498500a2d66
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Tue Oct 26 23:26:53 2021 +0100

    Cyberiad fixes compilation (#16504)

    * cyberiad fixes sweep

    * removes double firedoors

    * pixel_* standardisation for air alarms, fire alarms, nanomeds, lights, intercoms

    * more fixes

    * Wiring cleanup

    * minor tweaks

    * fixes even more wonky wires

    * theres a lot of bloody random wires

    * dorm cam names

    * stool dirs, sink pixel offsets, pews, toxins space loop fix

    * removes the pump

    * xenobio table thingy

    * merge conflict part 2

    * merge conflict part 2

    * reduced maint loot spawns

    * merge conflict part 2

    * further fixes

    * standardise lights and wires

    * fire extinguisher normalisation

    * removes abandoned vault false wall

    * fixed maints areas, cryo pipe trap

    * carpets

    * ssu tweaks

    * merge conflict part 2

commit 945e00e497aee106c56e4599e3004475e6563a04
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Tue Oct 26 23:09:45 2021 +0100

    IAA locker, spare headsets, and general locker cleanup (#16440)

    * Locker + Bookcase tweaks

    * HoS flask

commit 24459904ebea5bf677a1f9ccf822a2ca3a8934ce
Author: hal9000PR <69320440+hal9000PR@users.noreply.github.com>
Date:   Tue Oct 26 21:38:22 2021 +0100

    henk review

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

commit 431c1fe368d6d58b9884df0b777ef001a0cf8f65
Author: Luc <89928798+lewcc@users.noreply.github.com>
Date:   Tue Oct 26 16:03:45 2021 -0400

    Update code/modules/surgery/organs/pain.dm

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

commit cae70b2cb5e8464cf38d7f4c954aeb8dcf58d982
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Tue Oct 26 20:20:39 2021 +0100

    forgot this

commit c516b8ad5d0c693b42349db27609de5700f2cfc7
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Tue Oct 26 20:11:05 2021 +0100

    sprite re-add

commit e5afa54965f20f64383b6c9eb20c644ed7eb2bb4
Merge: f095264807 b87135fcc8
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Tue Oct 26 19:53:15 2021 +0100

    Merge remote-tracking branch 'upstream/master' into bnuuy

commit f09526480788c2e18fff8c16c4318fd6b4272c10
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Tue Oct 26 19:47:41 2021 +0100

    bnuuy

commit 2c20cce54398ad9f569b1577b5cc9e8c6271fd39
Author: lewcc <luc@aura.dog>
Date:   Mon Oct 25 20:04:37 2021 -0400

    Ehhh why not

commit cf5f487ac957a03e460abdb854cad1c4f3b2fe56
Author: lewcc <luc@aura.dog>
Date:   Mon Oct 25 20:01:51 2021 -0400

    Clean up pain messages a bit more

commit f7999fee26d980e296aa13618cf1e76101d474c4
Author: lewcc <luc@aura.dog>
Date:   Mon Oct 25 19:47:58 2021 -0400

    Add more organ pain messages

commit a9ccc59e588d9954c063699d252c9d29c26c28a5
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Mon Oct 25 10:34:12 2021 +0100

    Loop exclusion

    Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

commit 922b2437a55aac7f029246940184b017e64ba1d6
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Sun Oct 24 20:10:22 2021 +0100

    det office lights

commit a3d515ce4ed75035c2f7c4f86326eac4f4e82d62
Author: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Date:   Sat Oct 23 12:25:11 2021 -0400

    Makes the telegun a wee bit more sensible

commit 25a333274dac9c675193889bdd59d97850c78574
Author: rythenx <90358236+rythenx@users.noreply.github.com>
Date:   Sat Oct 23 11:53:08 2021 -0400

    Update code/modules/admin/topic.dm

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

commit 97edcd4e6e2ca9ce1a76ec0232b77b37a04bdd2e
Author: rythenx <90358236+rythenx@users.noreply.github.com>
Date:   Sat Oct 23 10:54:48 2021 -0400

    Update code/modules/admin/topic.dm

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

commit b87135fcc83e7d123c0ec094537ff82f306027a9
Author: S34N <12197162+S34NW@users.noreply.github.com>
Date:   Sat Oct 23 10:53:08 2021 +0100

    Adds server ID to discord webhook messages (#16987)

    * adds server ID to webhooks

    * 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 58d3c21ea855b1ea38da627c70b362d90c371c58
Author: matttheficus <57759731+matttheficus@users.noreply.github.com>
Date:   Sat Oct 23 05:49:20 2021 -0400

    goodbye you annoying spam (#16970)

commit c33d100cbd2c8fe2d5964ba13caff8d0aa17d42b
Author: Shawn Hind <>
Date:   Fri Oct 22 21:30:56 2021 -0400

    add a notification when replying to fax

commit e83e81a8d2547c132a515b2f8a4219541016b499
Author: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Date:   Fri Oct 22 06:26:42 2021 -0400

    bruh (#16983)

commit 34bf2c6b2b80f512b04aa7515588b625b77bb8cb
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Fri Oct 22 01:19:17 2021 +0100

    fixes turret controllers

commit 3addfc5cb3dbebc59044795e0b0f4d60ea569216
Merge: a33cd4325a f1fdaef0cc
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Thu Oct 21 09:45:25 2021 -0400

    Merge pull request #16978 from AffectedArc07/multi-instance-cleanup

    Multi instance cleanup

commit f1fdaef0cc43c63e3e8250c84c83855b184ddd58
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Thu Oct 21 13:32:22 2021 +0100

    Cleanup from multi instance PR

commit a33cd4325aec37fa3ba9f0e338e1cda4a5428946
Merge: 75550c3f8c de48c081bf
Author: Fox McCloud <Fox-McCloud@users.noreply.github.com>
Date:   Wed Oct 20 15:25:26 2021 -0400

    Merge pull request #16560 from AffectedArc07/multi-instance-support

    [READY] Multi instance support

commit de48c081bfbda4753e0e87e9b659b9c3d50a4c1d
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Wed Oct 20 17:50:43 2021 +0100

    Elastic logic

commit c25f250a9166d961079164f4dd8445ae74de7c12
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Wed Oct 20 16:25:23 2021 +0100

    `UpdateDamageIcon()`

commit 7de9371e449e6cf1e55bf61c8c655bca9f9811d6
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Tue Oct 19 20:22:21 2021 +0100

    fixes disposals

commit 3094d081a5092f8a36bc9231d045fe6d5e4d7e99
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Tue Oct 19 15:32:31 2021 +0100

    remove duplicate areas

commit 75550c3f8c1a8950bd8fae2b4e72333f2e523221
Author: matttheficus <57759731+matttheficus@users.noreply.github.com>
Date:   Tue Oct 19 05:45:49 2021 -0400

    runtimes bad (#16972)

commit fd3b0f9e05596f579c4f05ccc792b9a310c38e13
Author: matttheficus <57759731+matttheficus@users.noreply.github.com>
Date:   Mon Oct 18 17:50:20 2021 -0400

    this should do it (#16971)

commit 8af58be3d90624508c7b16a09194a2344e65a825
Author: lewcc <luc@aura.dog>
Date:   Mon Oct 18 16:46:33 2021 -0400

    Move examine text addition to examine proc

commit ab7e8f0f3832540955d7c05a9df9a17002d7b68c
Author: SabreML <57483089+SabreML@users.noreply.github.com>
Date:   Mon Oct 18 17:12:54 2021 +0100

    Fire extinguisher GC fix (#16965)

commit 6e0006a14593473c21d832b589c60093b7a1380a
Author: dearmochi <1496804+dearmochi@users.noreply.github.com>
Date:   Mon Oct 18 17:16:11 2021 +0200

    Fixes fire axe wielded inhand sprite regression (#16967)

commit f9c672ffa24c99b8e4026429cb603abd9cc57834
Author: E-MonaRhg <71735193+E-MonaRhg@users.noreply.github.com>
Date:   Mon Oct 18 17:15:54 2021 +0200

    A lesson in testing your PRs (#16969)

commit e8d4c329becafb4db1b20d2a8f81a84f7c526a28
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Mon Oct 18 13:52:24 2021 +0100

    further fixes

commit a2c31c86fc8683fcbd048a74b25e90595c5c39d7
Merge: 2f73c7d966 9470fd0387
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Mon Oct 18 13:45:55 2021 +0100

    Merge branch 'master' into delta_fixes

commit 2f73c7d96684c82fccbc8af0a0fef498bb323242
Author: S34NW <12197162+S34NW@users.noreply.github.com>
Date:   Sun Oct 17 21:46:43 2021 +0100

    perma cams, rad shielding

commit 4e40353cfa9375bcf2ebd1182e4591663d36fedc
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sun Oct 17 21:06:02 2021 +0100

    Check your conflict resolution people

commit e843d297bf4f00742a3f75400b5abda9d400a780
Merge: 1d750acf78 9470fd0387
Author: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Date:   Sun Oct 17 20:49:07 2021 +0100

    Merge remote-tracking branch 'ParadiseSS13/master' into multi-instance-support

commit 9470fd0387afb480d7469d166fb91e10d88e9025
Merge: 066cd3be7b 26a3dcd48b
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 17 13:57:14 2021 -0500

    Merge pull request #16889 from AffectedArc07/cui-cdl

    Moves CUI entries to CDL

commit 066cd3be7b527274e463031df7daa55577706fea
Merge: ad03268e5a 468ff53ac7
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 17 13:51:00 2021 -0500

    Merge pull request #16932 from matttheficus/TrayQOL

    Serving Tray Quality of Life - 8 Slots

commit ad03268e5a3eb7c0dfcfe254531a3d91933f75f5
Merge: 8d4b75690e 428494386b
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 17 13:49:13 2021 -0500

    Merge pull request #16870 from lewcc/breakable-ssus

    Unpowered Suit Storage Units can now be attacked

commit 8d4b75690e99873aca5821a4edd84185bceddcdb
Merge: 33f408ed02 10e568d937
Author: variableundefined <40092670+variableundefined@users.noreply.github.com>
Date:   Sun Oct 17 13:47:26 2021 -0500

    Merge pull request #16873 from PacifistDalek/ghost-deck-of-cards

    Ghosts can no longer shuffle cards

commit 33f408ed024e8548c9c4223671818a5ea5ff5f6b
Merge: 56003f88ac b2ecacaee9
Aut…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Balance This PR will modify how effective something is or isnt Tweak This PR tweaks something ingame
Projects
None yet
Development

Successfully merging this pull request may close these issues.

NAD cheese