- 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>
Tears apart the overloaded `/obj/item/mecha_parts` into a few different
paths.
`/obj/item/vehicle_chassis` for the base part that things attach on
(this is the mech construction holder)
`/obj/item/vehicle_part` for things you attach to chassis
`/obj/item/vehicle_component` for integral components
`/obj/item/vehicle_module` for equipment
This is to prepare for further work on mecha as a system, and to get
some of the massive line changes out of the way.
Also:
- tears apart a few files that were just too long to be handled and
groups everything with their mechs
- erases some code reuse
<!-- 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
- 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. -->
<!-- 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

While Clockwork content is currently still InDev™, this doesn't mean we
can't add a few crumbs from them early. This adds a new loot pool, new
tools, and a new crafting recipe.
Clockwork tools: Equal in power (stronger in the welder's case) to the
Alien Versions, with different use sounds, and a description for each.
In addition: The clockwork multitool has wirevision, equal to the alien
multi, and thus, the code has been changed accordingly.
The Replica Clockwork Welder: Looks like the real clockwork welder, but
has half the capacity, and .4 use speed, with no eye protection. It
regenerates on its own, though, and requires an experimental welder to
make. A nice minor upgrade, and not a complete hazard to use.
<!-- 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
These things were bound to make it into the game one way or another, so
why not get that small piece of the bandaid done and over with. We can
corrupt them later when Clockwork Content shifts from InDev, to
something more tangible.
<!-- 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 clockwork tools, replica clockwork welders, and the clockwork
tool spawning pool. Currently, it's hooked up to the rouge miner
generation so they can appear in game, at prob(1)
/🆑
<!-- 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: TheObserver-sys <Gizmomaster777@gmail.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
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>
<!-- 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
Requested by Monara.
## Why It's Good For The Game
N/A
## Changelog
Changelogs are broken.
New meat spawner for Beurang added.
Species roasts, etc, restored, recipes and all.
Probably going to work on this a bit to get things I've missed.
<!-- 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
tin
## Why It's Good For The Game
memory improvements & code efficiency
## Changelog
nah
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

<!-- 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
Kinda cool, plus you can drop them around places where a medkit would be
overkill
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->
## Changelog
🆑
add: Added first aid pouches you might know from bay or polaris
code: Added a single use storage subtype
refactor: MREs are now single_use subtypes
/🆑
<!-- 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: Zandario <zandarioh@gmail.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
Various asset systems I want in before more TGUI work. and also
byond-tracy support... and also light update debugging...
## Changelog
🆑
tweak: Chem Master UI has been reworked slightly.
* Painus
* Yep
* Moar
* Let the agony begin
* text.dm
* scramble.dm
* time.dm
* fix
* unsorted.dm
* job_controller.dm
* _legacy
* computerfiles.dm
* events.dm
* global_iterator.dm
* topic_input.dm
* underwear.dm
* uplink
* periodic_news.dm again
* areas
* genes
Also renamed midget to dwarfism as it's a slur.
* changeling
* Cult
* gamemodes
* machinery
* mecha
* effects
* objects part 1
* Fine I'll commit the YAML
* objects part 2
* moar
* atmos
* ooga
* ahrde
* You can tell my sanity is going down
* Second-To-Last Step
* Almost
* Poggers
* nvm we're not ready for that <.<
* Test
* minor
* Freebird begins playing aggressively.
* Adds the Konigin to the loot pile.
* Corrects issue with underslung weapon.
* Comments out examine for undershotgun.
* Aurora "Taj" gun skin code
* Bringing Pistol Code in Line with Sol-Gov Removal
* Aurora Crank Laser
More Tajara Fluff
* Gun Skin Sprites
* S'rendarr's Hand Cigs
Cigars of a Medicinal Variety
* Add files via upload
Cigars of a Medicinal Variety
* Tajara Lighter and Cigarette Cases
* Tajara Booze
Getting Drunk on Gin Cat Style
* A Drinks and Cocktails For Tajara
* Cocktail For Cat People
* Add files via upload
* Tallow Is a thing
* USDF>JSDF
* Tajaran Cocktail/Bottle Sprites
* Taj Items: Loot Pool Integration
* Integrate Taj Cigs into Contraband
* USDF>JSDF
* Oh dear I made an error
* Fixing a Big Mistake
* Solgov>Origov
* Taj Liquor in the Booze-O-Mat
* Origov>Oricon
* I hate Modular I hate Modular
* Okay hopefully Everything is Fixed
* Re-Updating Clothing Vendors
* Update vending.dm
* Missing Dah Comma
* Inhands Sprites for Taj guns
* Cigar Sprites I Missed
* Tetherport
* sigh
* more fixes
* shields
* more
* woo
* compile
* e
* a
* Tether, compilable and running
not playable tho
* Tether, compilable and running
not playable tho
* Automatic changelog generation for PR #3200 [ci skip]
* why
* EOL
* nukes edited areas. if you had something important in here, you didn't deserve to.
* another folder down
* one more folder
* the refacotring continues
* change those
* okay
* dynamic zlevels
* move stufF
* reorganize that too
* get rid of unneded archives
* move talon too and rename that
* meh
* woop
* fixes
* move those
* fixes
* fix
* Submap Repathing/Reconciliation
* Attempts to fix Gecko invalid variable bug.
* Alright. Let's actually fix every bugged instance.
* Another round of updates. That same turf issue exists.
* Should fix the last of those weird varedits.
* One snuck by?
* Another round of fixes.
* I want to know who put all these var edits in.
* Another batch down.
* Yet another batch.
* A map at a time, at this rate.
* I hope these are the last four, but probably not.
* Hopefully the last, but probably not.
* ANOTHER stealth var_edit that snuck through.
* Manually checked the rest of the map files I found. These were updated.
* Did the same for bad var_edits. Caught these.
* Updates the 140x140.
* Sorts Talon and partially adds Point Defense. Too complex for me.
* tether_turfs
* I think this is it. The last variable bug.
* Telenetwork Delenda Est
* linterS
* fix
* extraneous files
* woo
* mmm
* add that in until reagents hardsync
* woo
* sync
* updates
* t
* weather
* i want to rewrite telecomms
* test
* shift those
* woo
* move that
* FUCK
* Fix
* fix
* or null
* shuffle
* Fixes
* Fixes
* Fix
* fixes
* woo
* that
* facility safety
* that too
* move that out
* fixes
* woops /
* rename those
* those
* woo
* test
* fixes
* woo
* exploration map edits
changes oxygen tanks to o2 jetpacks, co2 jetpack to an o2, adds pathfinder voidsuit, suit cycler for medical, and fixes access restrictions on the PF's office and locker
* mh
* Update fueldepot.dmm
* woo
* woo
* woo
* fix
* utterly fuck you
* Automatic changelog generation for PR #3225 [ci skip]
* test code
* w
* that
* fieldgens
* better
* singulo
* fixes
* fix
* fix
* adds mirrortools, removes backup implants
* why
* Prevents falling through catwalks and lattice,
stolen from Silicons
* Lots of stuff!
* Update talon2.dmm
* Automatic changelog generation for PR #3226 [ci skip]
* Removes Mining Stacker
* Slight remap changes to Deck 3, pending more.
* Automatic changelog generation for PR #3228 [ci skip]
* fix that
* that
* R&D remap.
* Lighting fix and correcting a talon vault issue?
* Conflict clean-up.
* Multi-floor modifications. Chem change. R&D revert. Etc.
* Adds a few extra timeclocks.
* Missed the bioregens. Hooray.
* Re re readjusts R&D to a lobby design. Adds Space Spice. Maybe fixes Captain spawner.
* woo
* fix
* not that
* Xenobotany and Trash Pit adjustments.
* proper
* De-militarizes Talon. Will Trader-ify them when I wake up.
* fix
* fix
* ashet pls
* ashet pls v2
* cleaner
* cleaner
Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
Co-authored-by: CitadelStationBot <citadelstationcommunity@gmail.com>
Co-authored-by: Captain277 <agentraven16@gmail.com>
Co-authored-by: Mag <86886852+MonaraMir@users.noreply.github.com>
Co-authored-by: nik707 <38332985+nik707@users.noreply.github.com>
Co-authored-by: TheLordME <58342752+TheLordME@users.noreply.github.com>
* move phoronlock define
* t
* force rename
* nuke unneeded things
* don't do that
* tgui sync?
* changes
* unit testing module
* backend
* tools update
* aaah
* go and stay go
* path replace
* move everything
* toss out more stuff
* remove
* fine those can stay
* dependencies.sh
* ruin datum move + rename
* level assets why did you guys put the turfs in my atmosphers folder grr
* more moving
* basemap, force stuff
* fix that desync meme
* move more stuff
* move those too
* repath
* get rid of useless initializers
* hacky patchy
* reservations
* alright
* tgui
* changelog example
* checksum
* md5
* errors
* more
* turf empty
* stop
* fix
* bad kwarg
* let's get those in again
* alright
* rid of that
* huh
* newlines
* newlines
* folder
* mood
* woops
* readme
* might as well trim now
* let's go
* fuck it tether isn't being used anyways lol
* ok
* empty files go
* tether is demoted
* sorry but this goes too
* okay
* make that work too
* ok
* wow.
* whew
* Fix
* fixes
* ok
* sigh
* fix
* fix
* aah.
* rust_g logging
* update rust g file
* fix
* funny
* Fix
* map issues
* fix
* initialize hints
* solves some problems
* those too
* ok
* pills
* let's do that.
* hit that too
* runtime
* add that too
* alright
* fix
* fix
* fix
* Fix
* add
* fix
* wildwest, what have they done to you...
* do that too'
git push
* fixes
* fixes
* fixes
* pack this tightly
* let's not have empty files
* sigh
* fix
* FUCK OFF
* fix icon
* rip old mapmerge
* zz
* woo yeah woo yeah
* logging
* fix
* better logs
* GRRRRRR
* last commit??
* awful