## About The Pull Request
This PR includes a few different things mostly revolving around food and
drinks:
1) **BLUD REBALANCE**
Blud has been changed significantly. This change will be accompanied by
an IC bulletin and OOC dev blog post, the changes are as follows:
- Blud can now always be consumed, even when you're starving.
- Blud is now metabolized after ingestion at the same rate as regular
blood (a lot faster than previously).
- Blud's blood_content values have been bumped significantly. 30u of
real Blood restores ~120 nutrition, while 30u of Blud restores 25% less
nutrition, at ~90 (tested in-game).
- Blud boxes now contain 50u instead of 30u. For reference,
regular-sized milk cartons are 50u and mini milk cartons are 30u.
- Cargo's Vetalan Care Package now consists of 5 boxes of Blud MAX and
another 5 boxes of Blud MAX Light, for a total of 250u of real Blood and
250u of Synthblood. Previously it consisted of 3 bags of AB+ which are
200u each for 600u of Blood.
The suit that comes in the care package was also deleted, but it still
comes in a nice coffin.
2) **SEASONAL ITEMS**
All of the items from last year's Christmas testmerge have been re-added
with a few minor updates.
New Halloween themed items have also been added.
These seasonal items are fully functional, but **can't be obtained
currently since they're not taking advantage of the seasonal item
rotation code at this time.**
The full list of items is as follows:
- Two new cigarette varieties, Temperamento Vanilla (Xmas) and Kaiju
Cherry (Halloween)
- Three new types of bottled alcohol, Caramel Whiskey (Xmas), Sour Apple
Schnapps (Halloween) and Candy Corn Flavored Vodka (Halloween)
- Seven new cocktails using seasonal ingredients, Caramel White Russian
(Xmas), Salted Caramel Cider (Xmas), Appletini (Halloween), Sour Apple
Mimosa (Halloween), Sour Apple Fizz (Halloween), Candy Corn Martini
(Halloween) and Halloween Punch (Halloween).
- There is also a "food synthesis" recipe for turning the candy corn
martini into edible jello shots using water and protein.
- Three new snacks, Gingerbread Cookies (Xmas), Stroopwafels (Xmas) and
Holiday Cake (Xmas, Contraband). Halloween snacks will hopefully be
added later down the line.
- Four new soda varieties: Space Cola Cinnamon (Xmas), Space-Up
Cranberry (Xmas), Space Cola Licorice (Halloween) and Dr. Gibb Mystery
(Halloween).
- One new canned coffee variety: Peppermint Mocha (Xmas). Halloween
variety will hopefully come along with the snacks. It's a lot of
spriting work.
3) **ASSORTED FIXES AND QOL IMPROVEMENTS**
- Bar and Cafe vendors now stock canned Pineapple juice year-round, this
is generally useful but especially handy for the halloween vodka
cocktails.
- One new year-round cocktail recipe: The AMF.
- Robust Softdrinks no longer stocks KyoCola, Ocha Midori and Ramune,
since those are already present in the NipponTan vending machines. This
cuts down on that particular menu's bloat a little.
- Temperamento Menthol Company now called Temperamento Tobacco Company
- CC's Hard Rootbeer proof is now calculated as VODKA/2, slightly
lowering it's proof from 50 to 40. This was done because the bottle desc
for this drink states it's regular rootbeer with vodka added.
- BludBox MAX no longer calls donors "free-range", the blood is now
"ethically-sourced" instead.
- The lore entry on Vetalan Outreach Society has been brushed up and
also had typos corrected.
## Why It's Good For The Game
1) Vetalans, Medical and Blud have been in need of addressing for a
while now, and this is the mechanical part of the effort, making
Vetalans less reliant on blood bags.
2) The seasonal item system is here. The groundwork and the first batch
of items are laid out, I just need to figure out how to implement and
test the seasonal rotations.
3) Most of these are QoL and fixes. The AMF came into being very late at
night after the brainworms won.
## Changelog
🆑
add: Added two new brands of seasonal cigarette.
add: Added three new brands of seasonal alcohol.
add: Added four new varieties of seasonal soda.
add: Added seven new varieties of seasonal cocktails.
add: Added one seasonal variety of food synthesis reaction.
add: Added three new varieties of seasonal snack food.
add: Added one seasonal variety of canned coffee.
add: Added one new regular cocktail.
add: Added Pineapple Juice cans to Bar and Cafe vendors.
del: Removed NipponTan drinks from Robust Softdrinks stock.
tweak: Temperamento Menthol Company renamed to Temperamento Tobacco
Company.
tweak: Small changes to the Vetalan Outreach Society advertisement.
tweak: Small changes to BludBox MAX description.
tweak: Blud now always nourishes Vetalans regardless of nutrition
status.
tweak: Blud now metabolizes at the same rate as Blood when ingested.
tweak: Blud now provides Vetalans with 75% the nutritional value
compared to Blood.
tweak: Vetalan Care Package now contains BludBox MAX and BludBox MAX
Light cartons instead of AB+ Blood Packs.
tweak: Vetalan Care Package no longer contains a suit.
tweak: BludBox cartons now hold 50u, up from 30u.
tweak: CC's Hard Rootbeer proof now calculated in a more lore-friendly
manner.
fix: Pineapple juice no longer purple when poured into a metamorphic
glass.
imageadd: added sprites for all item additions listed above.
/🆑
requires #6644
Entirely replaces how (most) belts perform insertion checks.
This pretty much allows belts to hold most things.
Armor vests are next.
Trashbags will also use the systems we use on main.
Closes#7256 and #7435
---------
Co-authored-by: silicons <silicons@silicons.dev>
- all cells in the game are now small, medium, large
- super, hyper capacity cells, device, and weapon cells are all removed
- cells now have standardized variants, some of which are printable by
R&D
- energy weapons rebalanced
- **advanced energy guns and stun revolvers removed** - use the new
modular weapon system and microfission cells.
---------
Co-authored-by: silicons <silicons@silicons.dev>
<!-- 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 heretic themed objects, structures, mobs and more from TG/other
servers heretic code.
Most of the items will probably remain mechanically featureless. Unless
someone's insane enough to port full heretic functionality.
<!-- 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
MORE madness? MORE magic shit? MORE chaos? What's not to love?!
<!-- 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. -->
🆑
add: Heretical stuff. More to come.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
---------
Co-authored-by: Sorrowfulwinds <rockboy3970@gmail.com>
Co-authored-by: silicons <2003111+silicons@users.noreply.github.com>
Co-authored-by: silicons-bot <121360372+silicons-bot@users.noreply.github.com>
Co-authored-by: LordME <58342752+TheLordME@users.noreply.github.com>
<!-- 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
A few fixes ran into messing around with the code, every logical unit is
one commit.
## Why It's Good For The Game
People aren't unable to escape some storage, but not other. (Logic wise,
that probably could be handed further to the object, to have people not
escape something like locked secure briefcases or so, but this is just a
quick fix.)
Vore resisting works again, besides slightly less special logic for it.
Augment cooldown actually works, besides splitting the usability check
from the action proc, less duplication
Fancy boxes don't get/spawn invisible.
Runtime fix for the resonate analyzer (available as augment implant),
technically usable.
Plant analyzer doesn't seem to be bigger than the others, so put into
the same size/weightclass
## 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. -->
🆑
fix: Able to escape every storage
fix: vore resist belly interactions
fix: augment cooldowns
fix: Cigar, chocolate, and crayon/marker/chalk boxes don't become
(partly) invisible
fix: resonate analyzer can be used
tweak: plant analyzer is now small
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
---------
Co-authored-by: MarsMond <no@email>
Co-authored-by: Blubelle <57083662+BlueWildrose@users.noreply.github.com>
<!-- 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 people the option to be directed by someone buckled to them.
Offset gets handled nicer now, resize affects the riding offset, taurs
actually have their center set to it, and not their tail end if 200%, or
infront of them if 25% size.
The code to saddle up actual horses, shanks, and stormdrifter bulls is
fixed, too, as it didn't switch the riding handler, which didn't get
deleted, and such not switching to the controllable part.
A few typos got fixed, stumbled by typoing my own search for the 3 mobs
for their var.
Small rendering tweak to potentially draw bags ontop of tails (required
for saddlebags.)
Saddlebags now include the saddle option, and such makes it easier for
one to hold onto
## Why It's Good For The Game
People do look more like they are carried by the person they are buckled
to. The new option could allow some RP options, synth having a
controller or being just directed by holding some part of the body, or
maybe way to put the jousting compontent to use? The bucking gives an
option to remove someone riding one, as one otherwise has no control
over it. The saddlebag also even works as a saddle now, although that
can be removed if the freeded up hand is deemed too strong.
## 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. -->
🆑
fix: taurs actually get their center calculated correctly, noticeable if
buckled sideways.
tweak: offsets get resized for riding.
fix: horse, shank, stomrdrifter bull saddeling
fix: taur bags actually get drawn over the taur body
add: ability to buck someone off your back
tweak: no riding hand needed if the taur is wearing a saddle.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
---------
Co-authored-by: MarsMond <no@email>
<!-- 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 new handgun platform known as AXHS, it comes in two models:
AX59 is a .45 ACP semi-automatic pistol which loads 12-round
double-stack magazines. It comes with a built in light and lanyard loop
(see #6826 for gun attachment code, which this will rely on). It is
issued to Exploration through a dedicated gun case in the points vendor
for 250 points.
AX99 is a .44 Magnum semi-automatic pistol which loads 7-round
single-stack magazines. It has no attachments. Per fluff it is the PMD's
less gimmicky service weapon alongside the very confusingly named
Service Weapon.
This PR also makes the base a45 magazine unused. M1911-based platforms
now load a45/singlestack magazines and all other 45 pistols now load
a45/doublestack magazines, therefore, every code mention of the base .45
magazine have been changed to one of them (or both in the case of random
drops).
Capacity on 9mm pistol magazines has been bumped up to 15 base and 21
extended after discussion with dev chat.
<!-- 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
Exploration may or may not move away from the infinitely rechargeable
phasers at some point, this is just a means to give players an opt-in
alternative.
Just giving them a pistol felt cheap though, so I wanted to provide
something designed for the department with QoL which are primarily the
attachments.
<!-- 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. -->
🆑
add: Added two new pistols "AX59" and "AX99".
add: Added AXHS Gun Case to the exploration points vendor.
add: Added a new morale poster.
tweak: .45 magazines now split into double-stack (12rnd) and
single-stack (7rnd).
tweak: 9mm pistol magazines now hold 15 rounds (normal) and 21 rounds
(extended)
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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
Title. Updates CI & Linting
Reruns tgm on maps to trim duplicate/unused keys and random whitespaces
<!-- 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. -->
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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
So this was going to be Epsilon Eridani Imports Chapter 1, however, in
spriting the new cigarettes I became so annoyed at the fact that most of
our cigarette boxes are either a recolor or ugly, so I resprited most of
them as well. This also removes nicotine from the Blackstar brand which
is, according to Captain (who added them), not supposed to have it. (I'm
not sure nicotine even has any effects, but I've set it to zero
anyways).
Trans-stellars get to keep the original sprite, since they are the base
cig, however I've still given their open states a tiny facelift to be
in-line with all the others.
Jerichos only have small improvements, their sprite was already fine.
P100s have more noticeable changes, but largely retained the same
appearance.
Here is a visual of all the resprite changes, old on the top, new on the
bottom:
As for the new cigarettes, there are two new brands.
One for lights (theoretically half the nicotine content) called Kyningc
[sic], and one for less exotic herbal cigarettes (for those who want
something less hardcore than Blackstars) called Subrosa.
Both of these are imported from Epsilon Eridani.
I don't feel they deserve to crowd the coin section of the vending
machine, however, so I've added them into regular stock with more
limited supply (two boxes per vending machine) and increased costs
(Kyningc Silvers are the new most expensive box at 27 thaler each) to
reflect their imported nature.
These have unique cigarette sprites. White filters with a gray stripe
and all-sepia brown respectively.
Here's an exceedingly fancy preview to market these fictional products:
The only other change is some changes in the wording for the
descriptions of Carcinoma Angels to be slightly less ridiculous and more
cohesive between the desc and desc_fluff without really changing the
overall story.
<!-- 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
Getting rid of boring recolor sprites is good.
Making Blackstars more mechanically accurate to their lore is good.
Tiny bit of worldbuilding with the new brands, hopefully more to follow
soon.
Carcinoma Angels were always Classic SS13 weird, but now they're a
little more believable.
<!-- 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. -->
🆑
add: Added two new imported cigarette brands to vending machines.
tweak: Updated Carcinoma Angel descriptions.
tweak: Updated or resprited most cigarette box sprites.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
tl;dr refactors supplypacks to a new system
- all access locks yanked from crates other than the ones that actually
need to be locked
- preps system for reworks, translates stuff over to a new format
- adds unified subsystem parsing & support for other descriptors for
cargo crate contents other than typepath
<!-- 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
- You can craft bracelets using materials again.
- Allows rings, bracelets, and necklaces to be put into wallets.
## Why It's Good For The Game
Fix 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. -->
🆑
tweak: Wallets can now hold rings, bracelets, and necklaces.
fix: You can now craft bracelets using material sheets again.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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
- The Officer's Sabre is now a material item, which means it can be
upgraded with better materials. It starts off as plasteel, with a base
damage of around 25 due to funny material calculations. That does mean
the starting damage does get nerfed a little from the original 30. But
it can go up to around 44 if upgraded with durasteel.
- The sabre now has a 60% chance of parrying melee attacks, and a 50%
chance of deflecting projectiles. For reference, the energy sword has a
65% chance of projectile blocking. Should the captain encounter someone
trying to kill them, they can perhaps depend on the sabre to defend
themselves.
- Fixed the sabre not being sharp (now causes bleeding, now can butcher
mobs). Fixed the sabre's sheath not updating their icon.
- Drawing the sabre from a storage (usually the sheathe) plays the
appropriate noise. En-garde!
## Why It's Good For The Game
The sabre isn't really that great of a weapon to use if the facility
director for some reason has to get into a fight. Sure, the FD shouldn't
actively be putting themselves in danger, but it should make things more
interesting should they find themselves in such danger to begin with.
Like getting shot at by Kynde representatives in a meeting room, for
instance.
Central gave the FD a cool sword for some reason. Might as well make it
actually cool.
This probably could also incentivize exploration to try out the colonial
equipment pack some more too, since the sabre does appear in that
equipment pack.
## 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. -->
🆑
balance: The Officer's Sabre is now a material weapon, which means it
can be upgraded. It starts off as plasteel with around 25 damage.
balance: The Officer's Sabre now has a 60% chance to deflect melee
attacks, and 50% chance to deflect projectiles, for as long as you are
facing your enemy.
fix: The sabre sheath updates its icon when removing or adding the
sabre.
fix: The officer's sabre is now sharp like it should be.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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
Give medical a way to produce the standard supplies they might need
during their day to day operations.
<!-- 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. -->
🆑
add: Added minilathe for medical
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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 an MRE vendor
adds sprites for the food vendors
adds MRE vendor to all three station maps, always near the kitchen
adds Food vendor to gaia.
reorganizes vending machine defines into their own seperate files
<!-- 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
The reorganizing helps break down the moloch file that was the vending
file before.
The food vendor was using the boozeomat sprites which made it hard to
recognize.
the MRE vendor offers the crew an means to get a full meal when there is
no kitchen staff.
<!-- 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. -->
🆑
add: adds an MRE vendor
add: adds sprites for the food vendors
add: adds MRE vendor to all three station maps, always near the kitchen
add: adds Food vendor to gaia.
refactor: reorganizes vending machine defines into their own seperate
files
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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
title
<!-- 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
muh immursion!
<!-- 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
🆑
spellcheck: CentComm => Centcom
spellcheck: NanoTrasen => Nanotrasen
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
<!-- 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. -->
🆑
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.
/🆑
<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 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. -->
