## About The Pull Request
ports https://github.com/tgstation/tgstation/pull/68178/files
there's probably some other stuff as i used the latest version of the
file, and made a few small changes like having decaf be its own reagent
they are not mapped in anywhere right now
cafe vendor has 20 creamer/sugar/astrotame packets and 10 coffee cups
you're able to print coffee pots at a lathe and research lets you print
a bluespace version
you can order coffee cartridges from cargo or craft them using coffee
powder and a blank cartridge (printed with plastic)
the coffeemaker itself uses a radial menu to take out the packets / brew
coffee / take out cups
shortcuts: alt click to take coffee pot out, ctrl click to brew
todo:
map it in somewhere
## Why It's Good For The Game
someone asked for it
i like service
## 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: ports coffee makers from TG
/🆑
<!-- 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. -->
yeah turns out gun refactor wasn't done
- adds proper chamber handling
- fixes a lot of ballistic guns
- temporarily disables a lot of bolt handling
- refactors microbatteries
- fixes shotguns
## About The Pull Request
attaches a category & subcategory to lathe designs.
also unfucks a few design names to be more easily searchable (gps, nif)
## Why It's Good For The Game
roadwork to making designs less ass to search through.
also sili asked, thus, i do.
## Changelog
🆑
add: category & subcategory tags for lathe designs.
tweak: a few design names changed to be clearer.
/🆑
<!-- 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
You'd think from the title that this is a 2-line PR, but I've actually
coded + sprited silver versions of a few common magazines that used not
to have them, added some new shotgun shells, redid material costs and
damage numbers, fixed a bunch of bugs and inconsistencies, re-sprited
large bullets and speedloaders, and so on.
<!-- 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
Silver bullets have historically been an unbalanced adminspawn thing
that's never used. Considering lore has been moving in the direction of
plain silver not being the end-all-be-all against the supernatural, it
might be nice to give players the option to actually use specialized
(sidegrade) ammo, after all, printing a bullet out of X or Y metal isn't
exactly difficult.
To reflect this, the description HAS been changed to no longer say these
are blessed or anything of the sort. The door remains open for
specialized non-mass-producible blessed ammo variants if that becomes
necessary.
<!-- 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. -->
## Known Issues
.357 is just generally wonky and broken.
Z8 and Bullpup have icon update issues.
Magazine sprites that show the type of round loaded don't care about
what kind of round is actually loaded.
## 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 several types of printable silver ammo to the autolathe.
add: Added several sprites to support silver-related additions.
add: Re-Added extended 7.62 magazines including a silver variant.
tweak: new sprites for large caliber bullets and speedloaders.
tweak: 10rnd 7.62 magazines now use the correct sprite.
tweak: shortened and fixed most silver bullet descriptions.
tweak: adminspawn wooden stake shotgun slug is now a metal flechette.
tweak: all silver projectiles standardized to work against
MOB_CLASS_DEMONIC & MOB_CLASS_ABERRATION.
tweak: rebalanced material cost and damage of all ordinarily obtainable
silver ammunition.
tweak: removed a couple instances of xenomorphs using
MOB_CLASS_ABERRATION.
fix: bullet sprites now consistent when using correct speedloader.
fix: .44 rubber magazine now specifies it's loaded with rubber on the
name.
fix: .44 rubber magazine no longer prints preloaded with lethals.
fix: small silver bullets (such as .38 and 9mm) no longer invisible.
/🆑
<!-- 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: Shadow <shadowtail117@gmail.com>
Co-authored-by: silicons <2003111+silicons@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
- Adds spray bottles to the autolathe. This also means spray bottle scan
get recycled.
- since various items are being an extension of spray bottle, they also
get a base material that could be used for recycling or whatever else.
- The metamaterial glass, coffee cup, and fitness cup have also been
added to the autolathe.
- The costs of making these glasses have been made cheaper to make it
consistent with the other glasses available in the lathe.
## Why It's Good For The Game
"Hold up, giving people spray bottles seems like a bad idea."
So is a chem sprayer, and you can make those in R&D.
At minimum, people can fill it with water and make water messes. They
can also do that with a fire extinguisher. In order to cause more chaos,
they'd need to have access to touch chemicals, which is only likely if
you're a security officer, or a job that's in the medical or research
department. Which have access to spraying equipment anyways.
Anyways, you can just make another spray bottle if someone stole all the
spray bottles.
Having the capability to make more metaglasses is good otherwise.
## 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: The spray bottle and a few extra glasses have been added to the
autolathe.
/🆑
<!-- 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. -->
## 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
🆑
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
/🆑
---------
Co-authored-by: silicons <no@you.cat>
<!-- 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
Changing some Russian specific calibers out for more appropriate ones
<!-- 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
Fewer /k/ memes from 20 years ago would be nice
<!-- 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. -->
🆑
tweak: tweaked a few things, name wise
/🆑
<!-- 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: Captain277 <agentraven16@gmail.com>
## About The Pull Request
rewrites lathes
they are now embeddable within other interfaces, have unified controls +
queue management, and have support for using
- materials
- reagents
- even using / transforming existing items
rewrites /datum/design to be semi-singletons
adds SSresearch to hold designs
rewrites atom material system a bit
also:
- adds MIT license identifiers to some of my old TGUI work of which I am
the only one on the git history. i'd like to keep the tgui section and
my own code samples in there as MIT instead of AGPL.
- removes vorestation id restorers from maps because they're unused
nowadays
- removes partslathe as they're basically just unused
- Revamps sheetmaterials stylesheet as it really didn't need to just be
stacks.dmi
## Why It's Good For The Game
lathes sorely needed a redo
we want good materials support ontop of that.
also fixes autolathes :)
the "also" part is already covered above.
## Changelog
🆑
refactor: lathes are completely rewritten
fix: autolathe x5 and x10 buttons
del: autolathes can no longer be hacked. all hacked recipes are instead
accessible as normal recipes.
del: partslathes - redundant
del: id restoration consoles - unused / prohibited by server rules
/🆑
---------
Co-authored-by: silicons <no@you.cat>
