Skip to content

Commit

Permalink
Incoming Cit-RP pull (#3)
Browse files Browse the repository at this point in the history
* Service Borg Drink Fab upgrade (#6121)

Updates Service Borg to have slightly more ingredients, now that more
exotic ones have been added to make bar-tending complicated

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Gives Grenadine and Cream to the borg drink maker
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Grenadine and cream are two broadly used ingredients in drinks, far more
common then some of the ones already available to borgs. We've had a lot
of new niche ingredients added, and there's also still a lot of
specialty ingredients that are a pain for our mechanical bartending
friends to access if we want that artificial difficulty.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added two existing reagents to borg machine
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* fixes hammer heads being called forks (#6128)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: hammer heads are no longer called forks
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* CI: Skipping is native feature (#6125)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Did you know this is pointless to have?


[docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs](https://docs.github.com/en/actions/managing-workflow-runs/skipping-workflow-runs)

* [MDB IGNORE] [IDB IGNORE] atom damage (#5235)

## About The Pull Request

adds generic system for atom health / integrity / damage

everything that isn't flagged with not-bludgeonable can, well, now be
bludgeoned.

## Why It's Good For The Game

more interactive game world through the means of making people able to
break Everything.

## Changelog

:cl:
add: atom damage - (almost) everything is now breakable.
refactor: new /atom level materials system
refactor: a lot of the combat system / click code
refactor: melee attack styles
/:cl:

---------

Co-authored-by: silicons <no@you.cat>

* Replikant Apparel, Armor, Leg Markings and 2nd Gen prosthetics. (#6127)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

This adds several new types of heavily replika-inspired bodysuits, a
uniform with a few variants, a NT patch (designed for use with the
aforementioned uniform), a hat, an alternative type of replikant stilt
leg prosthetic and two pairs of leg markings (designed for use with the
aforementioned alternate stilt legs), as well as loadout Selections for
the uniform bases and bodysuits. Lore on these is simple and somewhat
placeholder while the lore team considers definitive lore
implementations.

Four body-armor items are also added, however there is no way to obtain
these at the moment except for adminspawn, since these warrant more of
an open discussion regarding what the best way to implement them would
be, (sec armor/cargo/cosmetic attachments/etc.)

Thank you to TrojanCoyote for the base LSTR/ARAR/FKLR and armor sprites,
help with descriptions.


Some previews:

Replikant apparel:

![uniformpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/081a3a97-1aaf-4e47-bc2e-444d2a582c84)

Replikant armor:

![armorpreview](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ba900c26-eb51-4cef-a00a-42dc05a93120)

Overview of all uniform parts for "STAR":

![starparts](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/0c62b91f-a656-412b-b28e-b44876a38319)

Sleek Uniform (Skirt base + accessories / Sleeveless base):

![sleekuniform](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/33434925/ab3b7a7f-d3ee-4daa-a79e-e1f116391748)
(Also has a long sleeve version with pants in both male and female
version)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

Beyond the increase of Replikant players recently, who have been having
to resort to a lot of markings and underwear and custom loadout items to
approximate their uniforms, in the future these may serve as an in-game
presence to Replikant lore should they become a minor race (Lore
currently WIP). In which case a second pass on the descriptions should
be expected.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added 8 Replikant bodysuits and side cap.
add: Added 4 Sleek uniforms, a jacket and NT patch.
add: Added 4 variants of Replikant armor.
add: Added Gen 2 Replikant leg prosthetics.
add: Added two pairs of Replikant leg markings.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Tridot body marking (forehead) (#6132)

Marking for a humanoid's forehead that's 3 dots in a triangle. Alternate
version is flipped upside down.

* Replika Armor in Loadout (no defense stats) (#6139)

## About The Pull Request

Adds replika armor to the loadout area as statless accessories.

## Why It's Good For The Game

They can be worn on their own in the suit slot, as an accessory to
undersuits OR normal suits (armor, voidsuits, ect) as well as carry
accessories themselves, when worn alone.

* Adds Replika Specific Body Marking (#6137)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Adds Replika Body/Groin Synthskin Marking.**

## Why It's Good For The Game

1. _Extant Ward Spirit panels insufficient for design, too subtle. Adds
new larger skintone paneling._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Adds Replika specific body markings.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* fixes gpses breaking on flight (#6135)

Move() already calls it, so we were double calling

Co-authored-by: silicons <no@you.cat>

* Removes old duplicate backpack of holding singularity_act (#6130)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Funny enough, it was being overridden by the correct one

https://github.com/Citadel-Station-13/Citadel-Station-13-RP/blob/a5ada8e75e396738fb53a1cad39e7d5122f49f79/code/game/objects/items/storage/backpack.dm#L64-L70

* Destroys the Universe (#6129)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

I kept putting off the gamemode removal (and eventual rewrite). This is
a good way to start

<details>
<summary>POV</summary>


![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/34761877/2dbb9b26-4728-49d3-b066-55a7014fe4f4)


</details>

* Subtypes Corporate Crates, Fixes Mapped Biohazard Crate, Renames Advanced Voidsuit (#6126)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. *Fixes Bug With Corporate Crates, Subtypes Them.*
2. *Removes Varedited Biohazard Bin and Places Normal Biohazard Bin.*
3. *Changes Advanced Voidsuit Name to Advanced Hardsuit.*

## Why It's Good For The Game

1. _I received reports of one specific corporate crate not rendering
properly when opened. As I inspected it, I realized it would be more
efficient to subtype all corporate crates, so I did that. HOWEVER, this
did not repair the initial bug. For some reason the crate was not
rendering its 'aethersecureopen' state, even though all variables and
code seemed to be working properly. No other crate exhibited this issue.
I discovered that by changing the name of the icon state from
'aethersecureopen' to 'aethersecopen', the state began to enforce and
render properly. I suspected it might be a name length issue, but tests
with other equally long icon states in the crate section disproved this
theory. This may warrant further investigation._
2. _This one avoided detection during my initial sweep through. Can't
remember who just went in and tried to varedit bins to fix biohazards,
but hopefully this is the last one they touched._
3. _This has been driving me crazy for a few days, and yesterday
especially. The Advanced Voidsuit is clearly misnamed, as it is in fact
a Hardsuit. When I tried to order these yesterday I overlooked this
cargo entry twice because I was looking for a hardsuit, not a voidsuit.
This just fixes the name._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Adds Corporate Crate Subtype, Reassigns Corporate Crates to It.
fix: Fixes incorrectly mapped biohazard bin.
tweak: Changes Name: Advanced Voidsuit to Advanced Hardsuit.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Adjusts Alarms on Shuttles (#6131)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Remaps Alarms on Multiple Shuttle Submaps.**

## Why It's Good For The Game

1. _Some shuttle submaps are not using hidden alarms. This is gonna take
a little live testing and stuff._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Replaces shuttle submap alarms with hidden variants.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Backpacks in Loadout (#6143)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Puts all the missing backpacks (default versions) into the utility tab
for matrix recoloring. Equipping a backpack from the loadout and setting
yourself to spawn with the same backpack in the main screen will
overwrite, and autoequip the backpack+equipment.

Adds security backpack to role restricted section.

## Why It's Good For The Game

You can now matrix default backpacks automatically at round start.


I would have just made it a selection for all types, but there are some
that aren't meant to be accessed based on role and faction. I don't want
to bloat the role restricted section THAT much, yet.

* Hypokit placeable on Belt Slot (#6141)

## About The Pull Request

Makes hypokits able to be put on the belt slot

## Why It's Good For The Game

First aid kits already do this. If we were worried about abuse via belt
storage we'd prevent kits from accepting vials.

* various fixes + tweaks (#6138)

see files changed:

- fixes lowwalls clickblocking
- pipes are now smaller
- fxies some table stuff
- air alarms
- buffs scrubbers
- buffs protean blob structure damage again are you happy now
@Ghostcoffeee
- both buffs and nerfs metal foam
- nerfs inflatables
- fixes weather

---------

Co-authored-by: silicons <no@you.cat>

* buffs borg lights (#6140)

* minor inv fixes (#6142)

- fixes some grammar issues with nodrop
- fixes messages for 'reconsider xyz' calls

Co-authored-by: silicons <no@you.cat>

* fixes storage not dropping contents on destruction (#6146)

oops

* Objectifies Fish (#6144)

* Updates the Description for CentCom Memorials (#6113)

* Ore Stacking (#6136)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

- All ores have been converted to become stacks.
- Various for loops have been destroyed due to ore stacks now existing.
- Bluespace crystals is detyped from being ores (request of Sili)
- Mining satchels have been recoded to be more like ore boxes (there's
an update I'd like to do to them later that will include even bigger ore
satchels so I decided this was necessary) and their capacity has been
buffed to carrying 200 ores instead of 50. People can now shove up to 7
ore stacks into their backpack with this update, so I decided that made
sense.
- .dm file containing ore box code was renamed.
- fixed a bug that allowed you to dupe ores using the ore box ("take"
was called twice when inserting ores by hand)
- Some minor polishing of ore box code, particularly examine code,
interaction feedback, and allowing you to climb onto boxes.
- Ore boxes when destroyed will drop all of their ores, unless there's
too much ore (up to 200 stacks will be dropped). It'll also drop 5
hardwood planks. People who accidentally shoot their box with their PKA,
rejoice.
- You can craft ore boxes using 5 hardwood planks.

## Why It's Good For The Game

Having ores be stackable will greatly reduce lag. Otherwise, QoL changes
good.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: You can climb ore boxes.
qol: Ore boxes will drop their contents when destroyed. You can also
craft ore boxes using hardwood planks now.
balance: Mining satchels can now carry 200 ores instead of 50.
fix: Ore box examines look proper now.
fix: Fixed a bug that allowed you to dupe ores using the ore box.
imageadd: stacks_ore.dmi was added. It holds ore stack stuff.
code: Orebox DM file renamed to ore_box.dm
code: Bluespace crystals are detyped from being ores.
refactor: Ore is now stackable. This will reduce lag when miners are out
causing havoc or shoving ore onto conveyor belts.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Removes Carpotoxin from Fish-Based Dishes (#6148)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Removes Carpotoxin from Fish-Based Dishes.**

## Why It's Good For The Game

1. _It's easy to forget about this and poison the crew. Carpotoxin in
these foods made sense when we only had poisonous space carp, but now
that we have a broad fishing system it doesn't do anything for us to
have noob trap food items on the menu._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
del: Removes carpotoxin from fish-based dishes.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Fixes Broken Empty Gun Sprites (#6150)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Fixes Broken Empty States for Various Guns.**

## Why It's Good For The Game

1. _Guys please report these when you notice them. I could've fixed all
of these the day after my initial change PR was merged. Fixes empty
states for: p90, wt274, and JSDF battle rifle._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Fixes missing icon sprites for empty ballistics.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Automatic TGS DMAPI Update (#6151)

This pull request updates the TGS DMAPI to the latest version. Please
note any breaking or unimplemented changes before merging.

Co-authored-by: tgstation-server <tgstation-server@users.noreply.github.com>

* kevlar upgrades no longer make you immortal (#6149)

guess who fucked up?

* Fixes Auril Castes not being able to wear hardsuits (#6157)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
idk why they have to use the cycler at all but there we go
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
wearing hardsuits is good, especially when your body type / sprite sheet
is identical to normal humans
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix:auril castes not being able to wear hardsuits
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Skrell Update (#6153)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
@granodd @Keekenox helped a TON in making these sprites! Actually most
of the credit goes to them.

Updates Skrell & Skrell Hair sprites:

![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/50931595-a881-47cb-82c5-303c3d1c2f17)

Adds 3 Skrell-specific markings (feel free to use them on others but
like might be ugly):

![9Al8mjVhRP](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/150b2dd8-7f6e-4bbc-9c26-8147969a249b)

Base mannequin with all markings applied:

![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/8a896c48-7ccf-418f-ae3b-d4d8ac0ae1a0)

This also changes the Skrell stats:
- gives them darksight level 2
- gives them slightly more speed
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
no more androgynous barrel sprites
all hail fidelity
all hail thin waist
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak:skrell sprites
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Makes cups of water not cups of.. what? (#6154)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

As title.

## Why It's Good For The Game

What even is water? Apparently, our characters don't know. Now they do.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
qol: Gave water a cup name so cups of water now appear as "cup of water"
instead of "cup of.. what?"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Mar (Adds *mar emote) (#6147)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Adds a voiced mar emote, ported from
https://github.com/VOREStation/VOREStation/pull/7944. That PR has a
handful of other emotes that we don't have either, if anyone else feels
like porting other new ones too.


https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/25853190/38bb1580-6560-4c53-aa22-5aa46f3f244f

## Why It's Good For The Game

Mar. Good for shadekin.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Mar.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* adds a cropped sweater (#6160)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Adds both a suit and an accessory version of a cropped sweater, sprite
credit goes fully to @Keekenox
Female:

![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/9e9bda1d-7b29-4836-9d89-df471f4432a7)

M*le:

![image](https://github.com/Citadel-Station-13/Citadel-Station-13-RP/assets/11361525/f9eafc2b-7a06-4c9b-bf92-55934e6ab640)

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
it was deemed so
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add:cropped sweater
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* pet peeve solved (#6152)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
I changed the Vodka flavour.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Because it's really silly (stupid) to say it tastes like grain alcohol.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog
\- "taste_description = 'grain alcohol'"
\+ "taste_description = 'potato alcohol'"
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: vodka flavour
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* runtime maploading 2/3: multiz update (#6145)

3/3 is world structs and the fun that comes with that

this pr has:

- transitions
- new multiz system
- lookup optimizations
- misc updates

---------

Co-authored-by: silicons <no@you.cat>

* various bugfixes (#6165)

- test elevator GPS
- weight ignores space noslow (yikes)
- accessories (rings, etc) are still weighing
- hologram offsets
- water breathing collapsed lungs (check vacuum on inside & outside for
collapse check?)
- multitools won't work for circuit debugging
- test fuel rod inhands to make sure it isn't showing the funny nuke
sign

---------

Co-authored-by: silicons <no@you.cat>

* bandaids hypospray (#6159)

bandaid; see comment
i'll fix it proper later

* Reverts reinforced windows dropping metal rods (#6155)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Reverts the change from #5235 that makes reinforced windows drop metal
rods.

## Why It's Good For The Game

Reinforced glass involves metal rods, this is true, but deconstructing
reinforced windows gives you 100% of the reinforced glass back already.
The extra metal rods are free, you can just generate infinite rods this
way. No need for 'em.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Deconstructing reinforced windows no longer gives free rods
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Byond lists start at 1 (#6168)

Genetics DNA bounds were improperly set.
See line 499 for why this is a problem.

This is the reason why toggling genetics powers in the admin player
panel sometimes fails to toggle to on, as well as some other grievances.

* fixes tables & poewrnet (#6170)

see title

Co-authored-by: silicons <no@you.cat>

* small CI system rewrite (#6166)

this fixes mapmerge hooks

---------

Co-authored-by: silicons <no@you.cat>

* Remaps Robotics Again (11/2023) (#6162)

* Renames A Soda Brand (#6167)

* what'soever (#6174)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

makes whatsoever not autocorrect to what'soever

## Why It's Good For The Game

what'soever

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: autocorrect no longer corrects "whatsoever" to "what'soever"
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* downgrades pyhton to 3.9.0 (#6184)

tg did it
this fixes the bootstrap issue

no, we shouldn't do this to fix things
no, i don't care

if someone wants to do it better be my guest i'm not here to do devops
unless it's absolutely necessary for me to do so

* Ports a large snake tail from Skyrat (#6177)

* fixes chaplain alt title 'Counselor' (#6175)

* Buffs Borg'Os (#6173)

* KyoCola Hotfix (#6172)

* adds meatsicles, made by mixing protein and ice (#6178)

* makes it so you can always move through ghosts (#6180)

* tgui reagent guidebook & tgui updates (#6161)

Co-authored-by: silicons <no@you.cat>

* Makes radiation wave decay inverse square instead of exponential (#6044)

* smacks the CI suite with the if: always() (#6183)

* gaia sauna window fixes (#6179)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: fixed the saunas on gaia not using the right windows
fix: fixed all three saunas on gaia using the same Id for tint controll
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Adds a relay spawner that autoconnects to the station comms (#6182)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Added a relay spawner that autoconnects to the station comms
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Fixes black duffelbags not being lightweight (#6186)

* stop drying racks taking more than one sheet of leather at a time (#6188)

* Adds plantpeople physiologies, buffs alraune in snow and water turfs, turf slowdown fixes & additions (#6187)

* Heat pump rebalance (TESTMERGE) (#6164)

Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>

* Makes pronoun selection display the actual pronouns the options give you (#6194)

* Adds a coffee dispenser crate to cargo (#6196)

* Fixes Crab Meat Drop (#6195)

* Jukebox Additions Part Two (#6190)

* shark ear port from virgo (#6192)

* Atlas map bugfix catchup (#6185)

## About The Pull Request

Many mapfixes including but not limited to:
  Gravity in security prep
  Scrubbers/vents in security EVA
  Relabeling core ejection buttons in Engineering
Medical tint control fixes, and glass/electrochromic doors and windows
at reception
Surgery now has tintable windows/doors, and a surgery sign all linked to
the same button(s)
  Nebula Gas Tradeport has its landing zones fixed (hopefully)
  Backup bodycams for sec/exploration
Body/helmet cameras placed into all security/exploration lockers (some
only getting bodycams due to limited access to helmets)
Access fix for exploration bodycams. All exploration roles can view
cameras from tablets/laptops as long as they have pilot access.
  +more

## Why It's Good For The Game

Bugfixes and QOL additions.

* Reduce the amount of mobspawners in trashpiles by 50% (#6200)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
makes it so that trashpiles flip a coin on whether or not to have a
mouse spawner.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Honestly mice are hardly any use in game, aside from the rare character
eating them, and the occasional griefer throwing tonnes of them into the
bar after storing them in backpacks.
Additional I dislike the constant squeeking trying to walk through
maint.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: tweaked trash piles to not always spawn mice
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Gaia floorlighting starts offline (#6198)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
needless strain on the game, to constantly update the lights on the
dancefloor when hardly anyone is ever there
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: tweaked the gaia dancefloor to start inactive, for performance
reasons
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Adds Mimosas (#6203)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Adds Mimosas.**

## Why It's Good For The Game

1. _Player request. Adds a mimosa to the drink recipes._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
add: Adds mimosas.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* fixes traits applying to observers (#6199)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: fixed the game trying to apply traits/autohiss to observers,
causing occasional runtimes
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* A few fixes for bots (#6205)

* Job icon fixes, Job blurb spelling correction (#6204)

* Adds bluespace mining satchels + BS mining satchel upgrade for minerborgs (#6189)

* [TESTMERGE ONLY] Revert "Makes radiation wave decay inverse square instead of exponential" (#6193)

FUCK

* stop large hypovials going in non-advanced hyposprays (#6176)

## About The Pull Request
title

## Why It's Good For The Game
fixes a bug

## Changelog
:cl:
fix: stop large hypovials going in non-advanced hyposprays
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Fixes Borg-O Recipe (#6208)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Fixes Borg-O Recipe.**

## Why It's Good For The Game

1. _The recipe is still using cooking oil. Changed to tallow._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
fix: Fixes Borg-O recipe.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Bump axios from 0.21.4 to 1.6.0 in /tgui (#6134)

Bumps [axios](https://github.com/axios/axios) from 0.21.4 to 1.6.0.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/axios/axios/releases">axios's
releases</a>.</em></p>
<blockquote>
<h2>Release v1.6.0</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>CSRF:</strong> fixed CSRF vulnerability CVE-2023-45857 (<a
href="https://redirect.github.com/axios/axios/issues/6028">#6028</a>)
(<a
href="https://github.com/axios/axios/commit/96ee232bd3ee4de2e657333d4d2191cd389e14d0">96ee232</a>)</li>
<li><strong>dns:</strong> fixed lookup function decorator to work
properly in node v20; (<a
href="https://redirect.github.com/axios/axios/issues/6011">#6011</a>)
(<a
href="https://github.com/axios/axios/commit/5aaff532a6b820bb9ab6a8cd0f77131b47e2adb8">5aaff53</a>)</li>
<li><strong>types:</strong> fix AxiosHeaders types; (<a
href="https://redirect.github.com/axios/axios/issues/5931">#5931</a>)
(<a
href="https://github.com/axios/axios/commit/a1c8ad008b3c13d53e135bbd0862587fb9d3fc09">a1c8ad0</a>)</li>
</ul>
<h3>PRs</h3>
<ul>
<li>CVE 2023 45857 ( <a
href="https://api.github.com/repos/axios/axios/pulls/6028">#6028</a>
)</li>
</ul>
<pre><code>
⚠️ Critical vulnerability fix. See
https://security.snyk.io/vuln/SNYK-JS-AXIOS-6032459
</code></pre>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+449/-114
([#6032](https://github.com/axios/axios/issues/6032)
[#6021](https://github.com/axios/axios/issues/6021)
[#6011](https://github.com/axios/axios/issues/6011)
[#5932](https://github.com/axios/axios/issues/5932)
[#5931](https://github.com/axios/axios/issues/5931) )">Dmitriy
Mozgovoy</a></li>
<li><!-- raw HTML omitted --> <a
href="https://github.com/valentin-panov" title="+4/-4
([#6028](https://github.com/axios/axios/issues/6028) )">Valentin
Panov</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/therealrinku"
title="+1/-1 ([#5889](https://github.com/axios/axios/issues/5889)
)">Rinku Chaudhari</a></li>
</ul>
<h2>Release v1.5.1</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>adapters:</strong> improved adapters loading logic to have
clear error messages; (<a
href="https://redirect.github.com/axios/axios/issues/5919">#5919</a>)
(<a
href="https://github.com/axios/axios/commit/e4107797a7a1376f6209fbecfbbce73d3faa7859">e410779</a>)</li>
<li><strong>formdata:</strong> fixed automatic addition of the
<code>Content-Type</code> header for FormData in non-browser
environments; (<a
href="https://redirect.github.com/axios/axios/issues/5917">#5917</a>)
(<a
href="https://github.com/axios/axios/commit/bc9af51b1886d1b3529617702f2a21a6c0ed5d92">bc9af51</a>)</li>
<li><strong>headers:</strong> allow <code>content-encoding</code> header
to handle case-insensitive values (<a
href="https://redirect.github.com/axios/axios/issues/5890">#5890</a>)
(<a
href="https://redirect.github.com/axios/axios/issues/5892">#5892</a>)
(<a
href="https://github.com/axios/axios/commit/4c89f25196525e90a6e75eda9cb31ae0a2e18acd">4c89f25</a>)</li>
<li><strong>types:</strong> removed duplicated code (<a
href="https://github.com/axios/axios/commit/9e6205630e1c9cf863adf141c0edb9e6d8d4b149">9e62056</a>)</li>
</ul>
<h3>Contributors to this release</h3>
<ul>
<li><!-- raw HTML omitted --> <a
href="https://github.com/DigitalBrainJS" title="+89/-18
([#5919](https://github.com/axios/axios/issues/5919)
[#5917](https://github.com/axios/axios/issues/5917) )">Dmitriy
Mozgovoy</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/DavidJDallas"
title="+11/-5 ()">David Dallas</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/fb-sean"
title="+2/-8 ()">Sean Sattler</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/0o001"
title="+4/-4 ()">Mustafa Ateş Uzun</a></li>
<li><!-- raw HTML omitted --> <a
href="https://github.com/sfc-gh-pmotacki" title="+2/-1
([#5892](https://github.com/axios/axios/issues/5892) )">Przemyslaw
Motacki</a></li>
<li><!-- raw HTML omitted --> <a href="https://github.com/Cadienvan"
title="+1/-1 ()">Michael Di Prisco</a></li>
</ul>
<h2>Release v1.5.0</h2>
<h2>Release notes:</h2>
<h3>Bug Fixes</h3>
<ul>
<li><strong>adapter:</strong> make adapter loading error more clear by
using platform-specific adapters explicitly (<a
href="https://redirect.github.com/axios/axios/issues/5837">#5837</a>)
(<a
href="https://github.com/axios/axios/commit/9a414bb6c81796a95c6c7fe668637825458e8b6d">9a414bb</a>)</li>
<li><strong>dns:</strong> fixed <code>cacheable-lookup</code>
integration; (<a
href="https://redirect.github.com/axios/axios/issues/5836">#5836</a>)
(<a
href="https://github.com/axios/axios/commit/b3e327dcc9277bdce34c7ef57beedf644b00d628">b3e327d</a>)</li>
<li><strong>headers:</strong> added support for setting header names
that overlap with class methods; (<a
href="https://redirect.github.com/axios/axios/issues/5831">#5831</a>)
(<a
href="https://github.com/axios/axios/commit/d8b4ca0ea5f2f05efa4edfe1e7684593f9f68273">d8b4ca0</a>)</li>
<li><strong>headers:</strong> fixed common Content-Type header merging;
(<a
href="https://redirect.github.com/axios/axios/issues/5832">#5832</a>)
(<a
href="https://github.com/axios/axios/commit/8fda2766b1e6bcb72c3fabc146223083ef13ce17">8fda276</a>)</li>
</ul>
<h3>Features</h3>
<!-- raw HTML omitted -->
</blockquote>
<p>... (truncated)</p>
</details>
<details>
<summary>Changelog</summary>
<p><em>Sourced from <a
href="https://github.com/axios/axios/blob/v1.x/CHANGELOG.md">axios's
changelog</a>.</em></p>
<blockquote>
<h1><a
href="https://github.com/axios/axios/compare/v1.5.1...v1.6.0">1.6.0</a>
(2023-10-26)</h1>
<h3>Bug Fixes</h3>
<ul>
<li><strong>CSRF:</strong> fixed CSRF vulnerability CVE-2023-45857 (<a
href="https://redirect.github.com/axios/axios/issues/6028">#6028</a>)
(<a
href="https://github.com/axios/axios/commit/96ee23…
  • Loading branch information
1 parent 6fe3e72 commit ff000c9
Show file tree
Hide file tree
Showing 798 changed files with 182,607 additions and 171,103 deletions.
2 changes: 1 addition & 1 deletion .vscode/settings.json
Expand Up @@ -10,7 +10,7 @@
"**/.pnp.*": true
},
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"files.eol": "\n",
"files.insertFinalNewline": true,
Expand Down
5 changes: 5 additions & 0 deletions _mapload/euthenia.dm
@@ -0,0 +1,5 @@
#ifdef FORCE_MAP
#error Duplicate FORCE_MAP, what are you doing!?
#endif

#define FORCE_MAP "euthenia"
5 changes: 5 additions & 0 deletions _mapload/minitest.dm
@@ -0,0 +1,5 @@
#ifdef FORCE_MAP
#error Duplicate FORCE_MAP, what are you doing!?
#endif

#define FORCE_MAP "minitest"
81 changes: 54 additions & 27 deletions citadel.dme
Expand Up @@ -222,6 +222,7 @@
#include "code\__DEFINES\languages\ids.dm"
#include "code\__DEFINES\languages\legacy.dm"
#include "code\__DEFINES\languages\translation.dm"
#include "code\__DEFINES\machines\airlock_states.dm"
#include "code\__DEFINES\machines\door.dm"
#include "code\__DEFINES\mapping\levels.dm"
#include "code\__DEFINES\mapping\maploader.dm"
Expand All @@ -238,17 +239,20 @@
#include "code\__DEFINES\mining\legacy.dm"
#include "code\__DEFINES\misc\attack_animations.dm"
#include "code\__DEFINES\misc\message_ranges.dm"
#include "code\__DEFINES\misc\nightshift.dm"
#include "code\__DEFINES\mobs\actions.dm"
#include "code\__DEFINES\mobs\biology.dm"
#include "code\__DEFINES\mobs\characteristics.dm"
#include "code\__DEFINES\mobs\grab.dm"
#include "code\__DEFINES\mobs\health.dm"
#include "code\__DEFINES\mobs\intent.dm"
#include "code\__DEFINES\mobs\life.dm"
#include "code\__DEFINES\mobs\mobility.dm"
#include "code\__DEFINES\mobs\mobs.dm"
#include "code\__DEFINES\mobs\organs.dm"
#include "code\__DEFINES\mobs\silicon_privileges.dm"
#include "code\__DEFINES\mobs\sprite_accessories.dm"
#include "code\__DEFINES\mobs\stat.dm"
#include "code\__DEFINES\objects\type_generation.dm"
#include "code\__DEFINES\overmaps\misc.dm"
#include "code\__DEFINES\overmaps\overmap.dm"
#include "code\__DEFINES\power\balancing.dm"
Expand Down Expand Up @@ -605,6 +609,7 @@
#include "code\controllers\subsystem\sound\channel_manager.dm"
#include "code\controllers\subsystem\sound\soundbyte_manager.dm"
#include "code\datums\ability.dm"
#include "code\datums\ability_handler.dm"
#include "code\datums\access.dm"
#include "code\datums\action.dm"
#include "code\datums\ai_law_sets.dm"
Expand Down Expand Up @@ -1192,6 +1197,7 @@
#include "code\game\machinery\fire_alarm.dm"
#include "code\game\machinery\flasher.dm"
#include "code\game\machinery\floodlight.dm"
#include "code\game\machinery\floor_inflatables.dm"
#include "code\game\machinery\floor_light.dm"
#include "code\game\machinery\floorlayer.dm"
#include "code\game\machinery\fossilrevive.dm"
Expand Down Expand Up @@ -1983,6 +1989,7 @@
#include "code\game\turfs\simulated\floor_types\lava.dm"
#include "code\game\turfs\simulated\floor_types\outdoors.dm"
#include "code\game\turfs\simulated\floor_types\outdoors_attackby.dm"
#include "code\game\turfs\simulated\floor_types\river.dm"
#include "code\game\turfs\simulated\floor_types\sky.dm"
#include "code\game\turfs\simulated\floor_types\snow.dm"
#include "code\game\turfs\simulated\floor_types\water.dm"
Expand Down Expand Up @@ -2012,7 +2019,6 @@
#include "code\game\turfs\unsimulated\walls.dm"
#include "code\game\verbs\advanced_who.dm"
#include "code\game\verbs\character_directory.dm"
#include "code\game\verbs\character_profile_verbs.dm"
#include "code\game\verbs\ignore.dm"
#include "code\game\verbs\suicide.dm"
#include "code\game\verbs\who.dm"
Expand Down Expand Up @@ -2346,20 +2352,20 @@
#include "code\modules\catalogue\cataloguer_visuals.dm"
#include "code\modules\catalogue\cataloguer_vr.dm"
#include "code\modules\client\client.dm"
#include "code\modules\client\client_data.dm"
#include "code\modules\client\client_procs.dm"
#include "code\modules\client\connection.dm"
#include "code\modules\client\cutscene.dm"
#include "code\modules\client\legacy.dm"
#include "code\modules\client\perspective.dm"
#include "code\modules\client\player_data.dm"
#include "code\modules\client\security.dm"
#include "code\modules\client\spam_prevention.dm"
#include "code\modules\client\statpanel.dm"
#include "code\modules\client\throttling.dm"
#include "code\modules\client\ui_style.dm"
#include "code\modules\client\viewport.dm"
#include "code\modules\client\wrappers.dm"
#include "code\modules\client\data\client_data.dm"
#include "code\modules\client\data\player_data.dm"
#include "code\modules\client\onboarding\_onboarding.dm"
#include "code\modules\client\onboarding\age_verification.dm"
#include "code\modules\client\onboarding\panic_bunker.dm"
Expand Down Expand Up @@ -2637,42 +2643,53 @@
#include "code\modules\food\recipes_fryer.dm"
#include "code\modules\food\recipes_microwave.dm"
#include "code\modules\food\recipes_oven.dm"
#include "code\modules\food\drinkingglass\drinkingglass.dm"
#include "code\modules\food\drinkingglass\extras.dm"
#include "code\modules\food\drinkingglass\glass1.dm"
#include "code\modules\food\drinkingglass\glass2.dm"
#include "code\modules\food\drinkingglass\glass_boxes.dm"
#include "code\modules\food\drinkingglass\glass_types.dm"
#include "code\modules\food\drinkingglass\metaglass.dm"
#include "code\modules\food\drinkingglass\shaker.dm"
#include "code\modules\food\food\cans.dm"
#include "code\modules\food\drinks\bottle.dm"
#include "code\modules\food\drinks\can.dm"
#include "code\modules\food\drinks\carton.dm"
#include "code\modules\food\drinks\cup.dm"
#include "code\modules\food\drinks\flask.dm"
#include "code\modules\food\drinks\jar.dm"
#include "code\modules\food\drinks\misc.dm"
#include "code\modules\food\drinks\shaker.dm"
#include "code\modules\food\drinks\tea.dm"
#include "code\modules\food\drinks\bottle\alcohol.dm"
#include "code\modules\food\drinks\bottle\dairy.dm"
#include "code\modules\food\drinks\bottle\juice.dm"
#include "code\modules\food\drinks\bottle\misc.dm"
#include "code\modules\food\drinks\bottle\soda.dm"
#include "code\modules\food\food\condiment.dm"
#include "code\modules\food\food\drinks.dm"
#include "code\modules\food\food\ice_cream.dm"
#include "code\modules\food\food\lunch.dm"
#include "code\modules\food\food\sandwich.dm"
#include "code\modules\food\food\snacks.dm"
#include "code\modules\food\food\z_custom_food_vr.dm"
#include "code\modules\food\food\drinks\bottle.dm"
#include "code\modules\food\food\drinks\cup.dm"
#include "code\modules\food\food\drinks\drinkingglass.dm"
#include "code\modules\food\food\drinks\jar.dm"
#include "code\modules\food\food\snacks\meat.dm"
#include "code\modules\food\glass\bottle.dm"
#include "code\modules\food\glass\bottle_vr.dm"
#include "code\modules\food\glass\bottle\robot.dm"
#include "code\modules\food\kitchen\gibber.dm"
#include "code\modules\food\kitchen\icecream.dm"
#include "code\modules\food\kitchen\microwave.dm"
#include "code\modules\food\kitchen\smartfridge.dm"
#include "code\modules\food\kitchen\smartfridge_vr.dm"
#include "code\modules\food\kitchen\cooking_machines\_appliance.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker.dm"
#include "code\modules\food\kitchen\cooking_machines\_cooker_output.dm"
#include "code\modules\food\kitchen\cooking_machines\_mixer.dm"
#include "code\modules\food\kitchen\cooking_machines\candy.dm"
#include "code\modules\food\kitchen\cooking_machines\cereal.dm"
#include "code\modules\food\kitchen\cooking_machines\container.dm"
#include "code\modules\food\kitchen\cooking_machines\fryer.dm"
#include "code\modules\food\kitchen\cooking_machines\grill.dm"
#include "code\modules\food\kitchen\cooking_machines\oven.dm"
#include "code\modules\food\machinery\gibber.dm"
#include "code\modules\food\machinery\microwave.dm"
#include "code\modules\food\machinery\smartfridge.dm"
#include "code\modules\food\machinery\smartfridge_vr.dm"
#include "code\modules\food\machinery\appliance\_appliance.dm"
#include "code\modules\food\machinery\appliance\_cooker.dm"
#include "code\modules\food\machinery\appliance\_cooker_output.dm"
#include "code\modules\food\machinery\appliance\_mixer.dm"
#include "code\modules\food\machinery\appliance\candy.dm"
#include "code\modules\food\machinery\appliance\cereal.dm"
#include "code\modules\food\machinery\appliance\container.dm"
#include "code\modules\food\machinery\appliance\fryer.dm"
#include "code\modules\food\machinery\appliance\grill.dm"
#include "code\modules\food\machinery\appliance\oven.dm"
#include "code\modules\food\structures\icecream_cart.dm"
#include "code\modules\gamemaster\controller.dm"
#include "code\modules\gamemaster\defines.dm"
#include "code\modules\gamemaster\helpers.dm"
Expand Down Expand Up @@ -3406,6 +3423,7 @@
#include "code\modules\mob\living\say.dm"
#include "code\modules\mob\living\status_procs.dm"
#include "code\modules\mob\living\throwing.dm"
#include "code\modules\mob\living\vv.dm"
#include "code\modules\mob\living\bot\assembly.dm"
#include "code\modules\mob\living\bot\bot.dm"
#include "code\modules\mob\living\bot\cleanbot.dm"
Expand All @@ -3426,10 +3444,13 @@
#include "code\modules\mob\living\carbon\carbon_movement.dm"
#include "code\modules\mob\living\carbon\carbon_powers.dm"
#include "code\modules\mob\living\carbon\cpr.dm"
#include "code\modules\mob\living\carbon\damage_procs.dm"
#include "code\modules\mob\living\carbon\give.dm"
#include "code\modules\mob\living\carbon\health.dm"
#include "code\modules\mob\living\carbon\inventory.dm"
#include "code\modules\mob\living\carbon\organs.dm"
#include "code\modules\mob\living\carbon\perspective.dm"
#include "code\modules\mob\living\carbon\physiology.dm"
#include "code\modules\mob\living\carbon\resist.dm"
#include "code\modules\mob\living\carbon\shock.dm"
#include "code\modules\mob\living\carbon\taste.dm"
Expand Down Expand Up @@ -3540,6 +3561,7 @@
#include "code\modules\mob\living\silicon\decoy\death.dm"
#include "code\modules\mob\living\silicon\decoy\decoy.dm"
#include "code\modules\mob\living\silicon\decoy\life.dm"
#include "code\modules\mob\living\silicon\pai\actions.dm"
#include "code\modules\mob\living\silicon\pai\admin.dm"
#include "code\modules\mob\living\silicon\pai\death.dm"
#include "code\modules\mob\living\silicon\pai\defense.dm"
Expand All @@ -3563,6 +3585,7 @@
#include "code\modules\mob\living\silicon\robot\analyzer.dm"
#include "code\modules\mob\living\silicon\robot\component.dm"
#include "code\modules\mob\living\silicon\robot\custom_sprites.dm"
#include "code\modules\mob\living\silicon\robot\damage_procs.dm"
#include "code\modules\mob\living\silicon\robot\death.dm"
#include "code\modules\mob\living\silicon\robot\examine.dm"
#include "code\modules\mob\living\silicon\robot\examine_vr.dm"
Expand All @@ -3586,6 +3609,7 @@
#include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm"
#include "code\modules\mob\living\silicon\robot\drone\_defines.dm"
#include "code\modules\mob\living\silicon\robot\drone\damage_procs.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_console.dm"
Expand Down Expand Up @@ -4694,13 +4718,15 @@
#include "code\modules\tgchat\message.dm"
#include "code\modules\tgchat\to_chat.dm"
#include "code\modules\tgs\includes.dm"
#include "code\modules\tgui\external.dm"
#include "code\modules\tgui\modal_vr_legacy.dm"
#include "code\modules\tgui\client.dm"
#include "code\modules\tgui\datum.dm"
#include "code\modules\tgui\mob.dm"
#include "code\modules\tgui\module.dm"
#include "code\modules\tgui\states.dm"
#include "code\modules\tgui\status_composers.dm"
#include "code\modules\tgui\tgui.dm"
#include "code\modules\tgui\tgui_window.dm"
#include "code\modules\tgui\legacy\modal_vr_legacy.dm"
#include "code\modules\tgui\modals\tgui_alert.dm"
#include "code\modules\tgui\modals\tgui_dynamic_input.dm"
#include "code\modules\tgui\modals\tgui_input_list.dm"
Expand Down Expand Up @@ -4914,6 +4940,7 @@
#include "interface\skin.dmf"
#include "interface\menus\_menus.dm"
#include "interface\menus\main.dm"
#include "maps\euthenia\euthenia.dm"
#include "maps\generic\death_triggers.dm"
#include "maps\generic\map_data.dm"
#include "maps\generic\misc.dm"
Expand Down
15 changes: 0 additions & 15 deletions code/__DEFINES/_flags/atom_flags.dm
Expand Up @@ -29,21 +29,6 @@
/// Does not leave user's fingerprints/fibers when used on things?
#define NOPRINT (1<<12) // TODO: item flag

///CITMAIN FLAG BITMASKS - Completely unused.
/*
/// Early returns mob.face_atom()
#define BLOCK_FACE_ATOM (1<<16)
/// Prevents mobs from getting chainshocked by teslas and the supermatter.
#define SHOCKED (1<<17)
/// Projectiles will use default chance-based ricochet handling on things with this.
#define DEFAULT_RICOCHET (1<<18)
/// For machines and structures that should not break into parts, eg, holodeck stuff.
#define NODECONSTRUCT (1<<19)
/// Prevent clicking things below it on the same turf eg. doors/ fulltile windows.
#define PREVENT_CLICK_UNDER (1<<20)
/// should not get harmed if this gets caught by an explosion?
#define PREVENT_CONTENTS_EXPLOSION (1<<22)
*/
/// We are ticking in materials
#define ATOM_MATERIALS_TICKING (1<<22)
/// Use initial icon/icon state for HTML renders in things like VV
Expand Down
6 changes: 6 additions & 0 deletions code/__DEFINES/ability.dm
Expand Up @@ -7,6 +7,12 @@
/// toggle interact, hot-bindable
#define ABILITY_INTERACT_TOGGLE "toggle"

//? targeting_type - exclusively used for targeted abilities

#define ABILITY_TARGET_ALL "all"
#define ABILITY_TARGET_MOB "mob"
#define ABILITY_TARGET_TURF "turf"

//? ability_check_flags - if you add new ones, make sure to modify available_check() and unavailable_reason().

#define ABILITY_CHECK_CONSCIOUS (1<<0)
Expand Down
14 changes: 3 additions & 11 deletions code/__DEFINES/atmospherics/atmos.dm
@@ -1,6 +1,4 @@
// Math constants.
/// kPa*L/(K*mol).
#define R_IDEAL_GAS_EQUATION 8.31
/// kPa.
#define ONE_ATMOSPHERE 101.325
/// (mol^3 * s^3) / (kg^3 * L).
Expand All @@ -13,10 +11,6 @@
#define TCMB 2.7 //! -270.3 degrees celcius

// Radiation constants.
/// W/(m^2*K^4).
#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8
/// K.
#define COSMIC_RADIATION_TEMPERATURE 3.15
/// W/m^2. Kind of arbitrary. Really this should depend on the sun position much like solars.
#define AVERAGE_SOLAR_RADIATION 200
/// kPa at 20 C. This should be higher as gases aren't great conductors until they are dense. Used the critical pressure for air.
Expand All @@ -27,18 +21,16 @@
#define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04
///m^2, surface area of 1.7m (H) x 0.46m (D) cylinder
#define HUMAN_EXPOSED_SURFACE_AREA 5.2
/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C.
#define MOLES_CELLSTANDARD (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))
/// Percentage.
#define O2STANDARD 0.21
#define N2STANDARD 0.79

/// Moles in a standard cell after which phoron is visible.
#define MOLES_PHORON_VISIBLE 0.7
/// O2 standard value (21%)
#define MOLES_O2STANDARD (MOLES_CELLSTANDARD * O2STANDARD)
#define MOLES_O2STANDARD (CELL_MOLES * O2STANDARD)
/// N2 standard value (79%)
#define MOLES_N2STANDARD (MOLES_CELLSTANDARD * N2STANDARD)
#define MOLES_N2STANDARD (CELL_MOLES * N2STANDARD)
#define MOLES_O2ATMOS (MOLES_O2STANDARD*50)
#define MOLES_N2ATMOS (MOLES_N2STANDARD*50)

Expand All @@ -52,7 +44,7 @@
#define BREATH_MOLES (ONE_ATMOSPHERE * BREATH_VOLUME / (T20C * R_IDEAL_GAS_EQUATION))
/// Amount of air needed before pass out/suffocation commences.
#define BREATH_PERCENTAGE (BREATH_VOLUME / CELL_VOLUME)
#define HUMAN_NEEDED_OXYGEN (MOLES_CELLSTANDARD * BREATH_PERCENTAGE * 0.16)
#define HUMAN_NEEDED_OXYGEN (CELL_MOLES * BREATH_PERCENTAGE * 0.16)
///J/K For 80kg person
#define HUMAN_HEAT_CAPACITY 280000
/// The amount of pressure damage someone takes is equal to (pressure / HAZARD_HIGH_PRESSURE)*PRESSURE_DAMAGE_COEFFICIENT, with the maximum of MAX_PRESSURE_DAMAGE.
Expand Down
14 changes: 13 additions & 1 deletion code/__DEFINES/atmospherics/constants.dm
@@ -1,3 +1,15 @@
//* Physics Constants *//

/// in Kelvin, temperature of cosmic microwave background radiation (used for radiative space cooling)
#define COSMIC_RADIATION_TEMPERATURE 3.15
/// kPa*L/(K*mol).
#define R_IDEAL_GAS_EQUATION 8.31
/// W/(m^2*K^4).
#define STEFAN_BOLTZMANN_CONSTANT 5.6704e-8


/// Volume, in liters, of a single tile. Y'KNOW WHY THIS IS A CONSTANT? WELL FOR ONE, initial_gas_mix IS MOLES, NOT PERCENTAGES OR PRESSURES. IF YOU TOUCH THIS, YOU BREAK *EVERYTHING*. DON'T TOUCH THIS.
/// Exceptions can be made if you're a big boy who knows how this clusterfuck of a ZAS/LINDA hybrid works and have good reason to touch this.
#define CELL_VOLUME 2500
#define CELL_VOLUME 2500
/// Moles in a 2.5 m^3 cell at 101.325 kPa and 20 C.
#define CELL_MOLES (ONE_ATMOSPHERE*CELL_VOLUME/(T20C*R_IDEAL_GAS_EQUATION))
4 changes: 2 additions & 2 deletions code/__DEFINES/atmospherics/environmental.dm
@@ -1,4 +1,5 @@
// CANATMOSPASS
//* CanAtmosPass, CanAtmosPassVertical *//

// make sure it's in this order so we cann use min()
//! these are actual return values, using them in CanAtmosPass results in it always be returned.
/// lets everything through
Expand All @@ -18,7 +19,6 @@
#define CANATMOSPASS(A, O, D) (A.CanAtmosPass > -1? A.CanAtmosPass : (A.CanAtmosPass == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED)))
#define CANVERTICALATMOSPASS(A, O, D) (A.CanAtmosPassVertical == ATMOS_PASS_VERTICAL_DEFAULT? CANATMOSPASS(A, O, D) : (A.CanAtmosPassVertical > -1? A.CanAtmosPassVertical : (A.CanAtmosPassVertical == ATMOS_PASS_PROC? A.CanAtmosPass(O, D) : (A.density? ATMOS_PASS_AIR_BLOCKED : ATMOS_PASS_NOT_BLOCKED))))


/**
* LEGACY BELOW
*/
Expand Down
15 changes: 13 additions & 2 deletions code/__DEFINES/color/lights.dm
@@ -1,4 +1,6 @@
//Some defines to generalise colours used in lighting.
//* Some defines to generalise colours used in lighting.
//* This file also contains powers/ranges, because power really does matter for lighting.

//! ## GENERAL COLORS
//? Important note on colors. Colors can end up significantly different from the basic html picture, especially when saturated!
#define LIGHT_COLOR_WHITE "#FFFFFF" // rgb(255, 255, 255) Pure white.
Expand Down Expand Up @@ -34,4 +36,13 @@
#define LIGHT_COLOR_INCANDESCENT_TUBE "#E0EFF0" // rgb(224, 239, 240) Slightly blueish white.
#define LIGHT_COLOR_INCANDESCENT_BULB "#FFFEB8" // rgb(255, 254, 184) Slightly yellowish white.
#define LIGHT_COLOR_INCANDESCENT_FLASHLIGHT "#FFCC66" // rgb(255, 204, 102) Slightly yellowish white.
#define LIGHT_COLOR_NIGHTSHIFT "#616191" // rgb(97, 97, 145) Dark blue.

/// Nightshift Light Color
/// Used on full-strength light tubes.
#define LIGHT_COLOR_NIGHTSHIFT "#c7c7ff"
/// Nightshift Light Power
/// Used on full-strength light tubes.
#define LIGHT_POWER_NIGHTSHIFT 0.435
/// Nightshift Light Range
/// Used on full-strength light tubes.
#define LIGHT_RANGE_NIGHTSHIFT 7
4 changes: 4 additions & 0 deletions code/__DEFINES/combat/damage.dm
Expand Up @@ -12,3 +12,7 @@
#define DAMAGE_MODE_ABLATING (1<<2) //! pulse lasers, etc, basically blows a crater
#define DAMAGE_MODE_PIERCE (1<<3) //! specifically highly-piercing weapons like bullets, even worse than sharp.
#define DAMAGE_MODE_SHRED (1<<4) //! messy, shredded wounds instead of a clean cut / pierce. strong.
#define DAMAGE_MODE_GRADUAL (1<<5) //! disallow bone breaks, ablation, etc; used for gradual sources like depressurization
#define DAMAGE_MODE_INTERNAL (1<<6) //! coming from internal; used to flag that something isn't coming through the skin. certain defenses don't work if this is set.
#define DAMAGE_MODE_REDIRECT (1<<7) //! if zone doesn't exist / etc, allow redirection
#define DAMAGE_MODE_NO_OVERFLOW (1<<8)//! temporary - re-evaluate when health is reworked. prevents damage from overflowing caps.

0 comments on commit ff000c9

Please sign in to comment.