mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-12 08:36:00 +01:00
0bbe65c881
## About The Pull Request The ammunitions workbench is Security's (And some others'!) tool for refilling ammo boxes, magazines and so on. It's one of the pieces of Skyrat kit I actually enjoyed, but it's got some big problems! In its current state it has a number of long-standing faults nobody was doing anything about, a pretty significant one being that it throws a runtime every single time you interact with it. This PR repairs those faults and brings the machine in line with the rest of the station's lathey things. Fixes: - **Runtimes on every interaction.** The machine called `default_deconstruction_crowbar()` with the wrong arguments, so inserting anything (a magazine, an ammo box, a datadisk) threw `Cannot read null.tool_behaviour`. That has been fixed. - **Material handling now matches other lathes.** It previously used a weird old menu. It now uses the standard UI for lathes and shit: workbenches placed on the map connect to the ore silo at roundstart, newly built ones can be linked with a multitool. Additions: - **Recycle function.** A loaded container can be emptied back into materials, mirroring the existing recycler/autolathe, etc. This means no more ugly piles of random bullets on the ground! It also has snazzy previews, jokes and shit built into the tooltips/UI. This is a complete overhaul. - **Emag support.** Emagging the workbench unlocks its full catalogue, consistent with other restricted fabricators. Wire-cutting remains as an option too. (Basically just instant hacking with no electrocution risk) - **Prefilled mapping variant.** `/obj/machinery/ammo_workbench/prefilled` spawns with mid-tier parts and a modest local material stock for away missions, ruins, and custom maps, so it works without also placing loose sheets and a datadisk. I was debating making it spawn with ammo designs already in it. But decided against it. ## Why It's Good For The Game We inherited this machine from Skyrat, and it sucked, behaves unlike any comparable machine on the station; eye searing green UI. It runtimed on every interaction, and was just generally a roach hotel of bugginess. The recycle function is also something nice I've wanted for a long time, and the prefilled variant should come in handy. Also a lot of people gave me the "let it connect to the silo" feedback and nobody told me "no" so here we go. ## Proof Of Testing <img width="931" height="957" alt="image" src="https://github.com/user-attachments/assets/a0fc7acb-30e7-4d54-9e49-7227b86af730" /> <img width="1650" height="1164" alt="image" src="https://github.com/user-attachments/assets/31e8a28b-64bc-4d73-aa48-4b978e122168" /> <img width="913" height="879" alt="image" src="https://github.com/user-attachments/assets/7a2287fd-ee51-42bf-9491-6bbfa7a497cb" /> </details> ## Changelog 🆑 fix: The ammunitions workbench no longer runtimes every time you interact with it. qol: The ammunitions workbench now draws from the ore silo like other lathes, and newly built ones can be linked with a multitool. add: The ammunitions workbench can now recycle a loaded container back into materials. add: The ammunitions workbench can be emagged to unlock its full catalogue. /🆑 --------- Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>