mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-17 02:54:44 +01:00
masterfixes
36 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 necromanceranne
|
2275e1958e |
Adds deep lore to some pistols, and partially rewrites the baton lore. Repaths some items. (#96056)
## About The Pull Request Moves the deep lore proc to the parent for guns. Adds deep lore to some of the pistols. Rewrites the deep lore for the stun baton and contractor baton. Repaths the Liberator pistol to a more sensible path name. Rechambers the Regal Condor to .45, because I was today years old when I learned that the Tiger Cooperative are _[radical Christian extremists](https://github.com/tgstation/common_core/blob/cf1edb9f770e7d3c38ca894e951ab5ac50395a47/Governments%20and%20Organisations/Corporations/The%20Syndicate/The%20Syndicate.md?plain=1#L73)_. I just thought they were nutso about changelings, I didn't know they also think they're God's ubermensch. Anyway, that freak who started the cult would chamber their relic pistol in .45 and you know it. ## Why It's Good For The Game I love dumping large amounts of text into the code base that will rarely, if ever, be noticed by the player. It's also the means by which I can summon forth my good friend Hatterhat to contribute to this codebase. Like a carrot on a stick. If I post enough, one day he'll PR flashforge mines like he promised me. |
||
|
TheRyeGuyWhoWillNowDie
|
98bcf3103e |
Partially moves the iconoclast's repeater behind a knowledge book (#95580)
## About The Pull Request I considered at first moving the siege weapon variant (the thing you use to craft the repeater) behind the crafting book too, but the siege weapon version isn't strong or problematic enough to need it, and that would be basically a soft-removal since nobody would make it except to make the iconoclast's repeater. The iconoclast's repeater (specifically making the handheld version) now requires use of a crafting book to learn how to make, which spawns in maints in the same loot pool as the other "good" improvised weapons. Without it, the welded-on version of the repeater may still be produced. ## Why It's Good For The Game While they are fairly strong and the infinite ammo thing removes the requirement to have weapon rechargers (trivializing antagonists like blobs and xenomorphs) the main issue though is their mass availability. Specifically, you can build autocrafters to make as many as them as you want because of how trivially easy they are to produced. The current "rule" with improvised weapons is if they are on par with cargo ordered/armory stocked weapons, they have to be learned from a maintenance book. This limits how freely they can be made and distributed without nerfing them into the ground in order to make them an occasional occurrence like the heroic laser musket, which I think is probably the best way to handle it. |
||
|
MrMelbert
|
ef28e00690 |
[MDB Ignore] Refactors gauze, adds Tourniquets (#95041)
## About The Pull Request 1. Refactors gauze Removes gauze var from `/stack`, adds a shared parent between tape and gauze. Behavior of "sticking thing on limb" is now a bit more generic, with there being a component to facilitate it and a framework on `/bodypart` Closes #92990 2. Adds Tourniquets A first aid item, when attached to a limb it reduces blood loss from that limb by 90%. However while attached you walk slower (if on a leg), interact slower (if on a arm), and yes, you rapidly die if you put it on your head Paramedic belts have their starting equipment changed again for the 500th time. Surgical tape -> Tourniquet Bone gel -> Bonesetter <img width="604" height="224" alt="image" src="https://github.com/user-attachments/assets/443dd5c0-44a3-4ccb-9f6a-c561bbf2fba9" /> ## Why It's Good For The Game Adds some more variety for field treatment of bleeding wounds, and in the future we can add things like "improvised tourniquets" or "improvised splints" with wooden planks. ## Changelog 🆑 Melbert add: Adds Tourniquets. While attached to a limb, reduces blood loss from that limb by 90%, but makes you walk / interact slower. (Or if you put it on your head, you die.) add: You can purchase Tourniquets from the premium section of the medical vendor add: Paramedic belt setup has changed yet again: Surgical tape replaced with Tourniquet, Bone gel replaced with Bonesetter. add: You can use all forms of tape as splint - like Gauze. Will secure a fracture but won't stop your blood from exiting. refactor: Refactored gauze entirely, report any strangeness with it (or tape, or tourniquets) /🆑 |
||
|
Jacquerel
|
6916730eca |
Ballista adjustments (#94724)
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> |
||
|
Bloop
|
53ed83bb9d |
Makes some more lists lazy (#94388)
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com> Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> |
||
|
KingkumaArt
|
47606e453e |
Siege Warfare: Adds two new craftable emplaced guns, a bigger laser musket, and a new spear for crew-sided mining. (#94102)
<img width="517" height="305" alt="image" src="https://github.com/user-attachments/assets/e8cd8bcd-dd3c-4733-99fe-0cdfb9799182" /> So, been a while, hasn't it? This PR adds three things. First Up: The Ratvarian Repeater.  The Ratvarian repeater is a mounted gun made from bronze, stock parts, and some drinking glasses. it is the emplaced counterpart to the laser musket, as the pipe organ gun is to the crossbow. Being a laser musket derivative, this means it has the benefit of _infinite ammo._ However, this also means to reload it, you turn the crank on the back. My personal headcanon was it works via a spring mechanism not unlike a watch, so naturally, it turned into a clock-cult flavored weapon. Each individual volley per winding shoots 12 laser musket shots in bursts of two. https://github.com/user-attachments/assets/152c3ce8-3560-4c8a-b618-7f2d81fb75a0 However, this isnt the only thing it's capable of. If you prefer your weapons more iconoclastic, you can take a welder to the stand, and carry it around, for the ability to shoot two laser musket shots instead of one per trigger pull... with the price being a decreased movespeed, and the second shot having random spread. Also you cant redeploy the stand, because iconoclasm. Still, the power is there, if you desire it. Overall, the repeater is the "Expensive but reliable" option of the three craftable gun emplacements. It has the most work to get, but once you have it, theres no need for ammo. On the complete opposite side of the coin, we have the Improvised Ballista. https://github.com/user-attachments/assets/16262965-a860-4205-bc3e-eeb8ec593647 This thing is as cheap as it gets - taking iron and wire to make (plus tools), and fires the classic spears greytiders love for 80 damage. This sounds like a lot (and it is), but once the ballista has fired - that's it, and reloading a second spear takes a full six seconds. Of the four emplaced guns, it has the least damage per firing sequence, but has all that damage in one big projectile. The ballista overall is designed to be dirt cheap to make and generally useful, but requiring a lot of work to keep running. And lastly, we have the Giant-killer spear. <img width="417" height="287" alt="image" src="https://github.com/user-attachments/assets/613379aa-379c-40b3-b4fc-ccdaa5ea4678" /> Crafted from titanium, plasteel and seven knives, and then forged by throwing it into lava this monstrously oversized spear is designed to fight monstrously oversized... monsters. While only doing 21 damage when wielded, this damage is multiplied by 3.5 against lavaland fauna, dealing damage equal to a crusher mark detonation. However, despite the ease of use, it lacks the ability to mount trophies like the crusher, so is much more suited to killing basic enemies like legions or goliaths, rather than megafauna. (It still does decently versus them, but youre prone to just dying.) Additionally, due to lacking the requirements of mining access or lavaland monsters, it can be made by the crew at large, providing them a meaningful defense on lavaland/icemoon. It can also be loaded into the ballista, so you can, if you desire, show those ashwalkers how the dark ages were REALLY fought. <img width="202" height="236" alt="image" src="https://github.com/user-attachments/assets/d21a7275-3d9e-427b-ac14-fee080541fb5" /> This PR has been six months in the making, so it feels good to finally get it out. Why its good for the game: Similar logic to my previous improvised weapon prs; I feel the dichotomy of "High tech laser rifle" and "Gun made from stuff lying around" is an interesting one. Of the damage values, the only one that has the potential for a balance issue is the spear, but due to being basically a plastitanium spear that does better versus mining mobs, I don't forsee this becoming a weapon that you can arm an entire revolution with. ## Changelog 🆑 Webcomicartist add: Added the ratvarian repeater, a craftable emplaced crank laser weapon that can be carried by hand, themed after clock cult. add: Added the improvised ballista, the rebar crossbow's bigger brother, that fires spears. Huge damage, terrible fire rate. add: Added the giant-slayer spear, a spear made at a necropolis tendril that does extra damage to lavaland creatures. (Ballista compatible) image: added sprites for the above. qol: The pipe organ gun should be easier to light now. fix: Fixed Pipe Organ Gun firing sprites not always going back to normal after finishing firing. refactor: Mounted guns are now EVEN MORE flexible codewise, now supporting secondary ammo types. /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
necromanceranne
|
d76d2f5438 |
Laser Gun Update: Deep Lore, Gun Variety, Pew Pew (#93520)
## About The Pull Request Updates the laser gun into four proper subtypes: Standard, Pistol, Rifle and Carbine. <img width="229" height="210" alt="image" src="https://github.com/user-attachments/assets/12c03076-8ebf-4d87-8c98-6a8cce6821db" /> Current sprites are pending a palette change. **Standard:** Functions as you would expect. Same as ever. **Pistol**: Lower charge, 20 force, normal sized, recharges faster. **Carbine**: 15 force, 26 mag, two round burst. Projectiles flight slightly faster. Cannot dual-wield. **Rifle**: 20 force. 40 mag. Two round burst. EMP resistant (not immune). Projectiles fly slightly faster. Cannot dual-wield (not that you need to). All but the rifle can be sourced from cargo. You can also buy the sovl version of the laser gun if you're especially nostalgic. ### Armory Changes The Armory now can potentially spawn either pistols, carbines or standard. The weighting leans closer to spawning carbines and standard as opposed to pistols. ### Lore Dump The laser line of weapons now all have lore. That rich, deep lore that every game needs and is totally not important at all to the meat and potatoes of the game. I'm paid by the hour ($0.00) ### Code Tidying Lasers are old and a total mess code-wise so we've tidied up while we're here. ## Why It's Good For The Game Variety is the spice of life and also some of these weapons could have used a face lift. Especially the laser carbine. Both functionaltiy wise and appearance wise. A bit of randomness in the armory means some rounds might have unique outcomes compared to others. Sometimes, items in cargo don't see particularly much use, so peppering in a few random potential deviations can maybe nudge people to utilize variant gear on future rounds. I'm obsessed with writing too much information. I blame Hatterhat. ## Changelog 🆑 add: Three variants of the laser gun; Carbine (replacing the existing one), Pistol and Rifle! Find it (possibly) in your armory today! balance: The armory laser guns might be different variants of the laser gun, rather than always being the standard. The standard is the same as ever, even if it looks different. add: If you care, the sovl version is available as a goodie. And in the hands of pirates... spellcheck: Lore! LORE FOR LASER GUNS! LOOOORE! Examine laser guns closely and you might learn more about them. balance: The new set of laser guns come with brand new sprites. /🆑 --------- Co-authored-by: StaringGasMask <62149527+Exester509@users.noreply.github.com> |
||
|
necromanceranne
|
62190069d0 |
Bow revisit; they hit harder, there are more sprites, there is a new bow made of bone. Really live that ranger fantasy. (#92809)
## About The Pull Request ### Bows deal more damage. Increases the baseline damage of the shortbow to 25, and the divine bow to 30. The divine bow also launches arrows at a higher velocity than normal bows. ### Flaming arrows have sprites now, and deal burning damage. Oh, and actually do reasonable damage.  I'm not at all skilled at animation but at least it has an actual, visible sprite now. I completely overlooked the fact this did 20 damage when I changed bows to use damage multipliers. Oops. ### Ashen Bow and Ashen Arrows Made from sinew, bone and for the bow specifically, leather. The bow is largely identical to a shortbow, but the arrow has mining bane. If you feel like hunting megafauna with a bow, this is your means of doing so. <img width="384" height="128" alt="demonstration_ashen" src="https://github.com/user-attachments/assets/1c4f493c-f694-4b09-a406-c63140628d56" /> Assets partially taken from https://github.com/Skyrat-SS13/Skyrat-tg/pull/5266 Which in of itself took assets from https://github.com/BeeStation/BeeStation-Hornet/pull/1802 The functionality is entirely new. I also did some sprite edits. ### Arrow quivers are made from wood. Iunno, this was really weird to me. Cardboard seems like a poor quiver material. ### Other Stuff Shortbows and ashen bows have the ability to be renamed. ## Why It's Good For The Game Bows are fun, but kind of middling. They're a lot slower to fire than the vast majority of ranged weapons, and don't really have enough oomph in their own right to intimidate people being shot by them. This is even true of the divine bow, which is the chaplain's version. Because of how slowly it fires and how little damage it does, the chances of actually killing someone who poses any real threat to you with it is pretty laughable. This is not true of the nullrod that you sacrificed to get this weapon. 30 damage is within the ballpark of chaplain weapons and their potential damage in some contexts. A slow to attack weapon probably should have a more impactful hit when considering your alternative options. The ashen bow is mostly because I really want to go fauna hunting with entirely bone-based weaponry. Does this mean some ashwalkers might be putting arrows into you from afar? Yes. Does this sound fun? Yes. Is this especially strong? Not really. Miners out damage these bows by a significant margin, and their armor is usually good enough where they're not at risk from arrows sticking into them or hurting them very much. This is also a degree more effort to make than other weapons because of the leather requirement and the need to kill several fauna for the materials. The outcomes should be more fun than the costs. ## Changelog 🆑 balance: Shortbows and divine bows do more damage. The divine bow also launches arrows at a higher velocity than normal bows. image: Flaming arrows now have proper sprites. balance: Flaming arrows now deal BURN damage. And also deal an appropriate amount of damage for an arrow. add: Ashen bows and arrows, made from sinew and bone. And leather for the bow. add: Ashen arrows deal significantly more damage to mining mobs. balance: Arrow quivers are made from wood rather than cardboard. qol: Shortbows and ashen bows have the ability to be renamed. /🆑 |
||
|
necromanceranne
|
a363eece32 | Removes the circular saw tool requirement to make a modular receiver (#92847) | ||
|
Ghom
|
4f6727024d |
Crafting refactor, implementing materials (#89465)
## About The Pull Request My original plan was to just implement materials into crafting so that items would inherit the materials of their components, allowing for some interesting stuff if the material flags of the item allow it. However to my dismay crafting is a pile of old tech debt, starting from the old `del_reqs` and `CheckParts` which still contain lines about old janky bandaids that are no longer in use nor reachable, up to the `customizable_reagent_holder` component which has some harddel issues when your custom food is sliced, and items used in food recipes not being deleted and instead stored inside the result with no purpose as well as other inconsistencies like stack recipes that transfer materials having counterparts in the UI that don't do that. EDIT: Several things have come up while working on this, so I apologise that it ended up changing over 100+ files. I managed to atomize some of the changes, but it's a bit tedious. EDIT: TLDR because I was told this section is too vague and there's too much going on. This PR: - Improves the dated crafting code (not the UI). - replaced `atom/CheckParts` and `crafting_recipe/on_craft_completion` with `atom/on_craft_completion`. - Reqs used in food recipes are now deleted by default and not stored inside the result (they did nothing). - Renames the customizable_reagent_holder comp and improves it (No harddels/ref issues). - Adds a unit test that tries to craft all recipes to see what's wrong (it skips some of the much more specific reqs for now). - In the unit test is also the code to make sure materials of the crafted item and a non-crafted item of the same type are roughly the same, so far only applied to food. - Some mild material/food refactoring around the fact that food item code has been changed to support materials. ## Why It's Good For The Game Improving the backbone of the crafting system. Also materials and food code. ## Changelog 🆑 refactor: Refactored crafting backend. Report possible pesky bugs. balance: the MEAT backpack (from the MEAT cargo pack) may be a smidge different because of code standardization. /🆑 |
||
|
Ghom
|
1b80a34506 |
You can now craft multi-dimensional payloads with dimensional anomalies (#89701)
## About The Pull Request Remember the overpriced, rare bomb core from the black market, the one you can use to convert an area to pizza or plasma? Looking back, I think I should've made it craftable with a dimensional anomaly rather than simply lock it to the back market, that was a real shame to its potential. Another thing, the power of the crafted dimensional bomb core varies with the strength of the gibtonite and if the grenade casings used are of large or advance release variants or not. Using low power gibtonite (deactivated too hastily) results in a radius of 11 (not counting the epicenter) tiles, roughly 70% of what you would get from the blackmarket core (17 tiles). Using a medium power gibtonite results in a radius of 13, or 82% of 17. Using two advanced/large grenades results in a radius of 15, 88% of 17. Using high power gibtonite results in a radius equal to the bm standard. Using both high power gibtonite and advanced/large grenades results in a radius of 19, for a 11.5% increase from 17. This is done so that using the anomaly to its fullest requires some steps beside the refined core itself, kinda in line with other anomaly tech but without filling the techweb with more clutter. ## Why It's Good For The Game This gives an use to the dimensional anomaly core beside the reactive armor and bounties. If it ever becomes problematic, it can be easily tuned later. ## Changelog 🆑 add: You can now craft multi-dimensional payloads with dimensional anomalies. /🆑 --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> |
||
|
Hatterhat
|
0ff75d301e |
SKS interaction tweaks and bolt-action rifle interaction fix (#89760)
## About The Pull Request The SKS was repathed to the bolt rifle subtype in order to make it not eject its entire magazine, and to make it act more like its real counterpart (e.g. you have to keep the bolt open/locked back in order to load more ammo). Also fixes the issue where bolt-actions' interaction blocking was non-functional due to being moved to a different proc, so now you need to open the bolt on bolt-actions (and now the SKS) to load ammo.) ## Why It's Good For The Game Ejecting your entire magazine on-use kind of sucked. The bolt-open-to-load thing is for funsies. ## Changelog 🆑 fix: The Sakhno SKS no longer ejects its entire internal magazine upon interaction. To facilitate this, it now requires the bolt to be open like its bolt-action contemporaries in order to load ammunition. fix: You can no longer force ammunition into Sakhno precision rifles and other bolt-action-likes through a closed bolt. /🆑 --------- Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com> |
||
|
necromanceranne
|
0619c2a21c |
Replaces the surplus rifle from the gang mode era with the Sakhno SKS semi-automatic rifle (#89453)
## About The Pull Request No. Not the Sakhno M2442 Army. It isn't the Sakhno Precision Rifle. I'm talking about the dinky shitty rifle you find in the snow resort away mission. The one with a 3 second cooldown between shots and fires 10mm. The Sakhno SKS semi-automatic rifle fires at the same rate as standard semi-automatic weapons, and fires .310 Strilka caseless rounds. It has a x0.5 damage multiplier (so does 30 damage rather than 60 damage per shot), and has 10 rounds in its internal magazine. Stripper clips come in sets of 5, so you'll need two clips to fully load the rifle.  You can get the Chekhov version of the weapon from the resort, but you can also acquire a parts kit from the black market. Put together with a stock and receiver, you get yourself a (empty) fresh new SKS. You can also acquire the ammo via the black market as well.  ## Why It's Good For The Game This gun is a travesty. It is so ancient that it can be carbon dated to around when our codebase was moved to Github. It actively has the worst statistic of any weapon in the game. And it exists in this strange half-existence in a ruin as, I guess, some purpose that is barely understood or remembered today. The irony of it being called Chekhov's gun yet finding no functional use in the map is either the joke itself, or a failing of the map. Anyway, so I decided to go all out and replace it with an SKS. Because I figured someone would like that. ## Changelog 🆑 add: Replaces the 10mm semi-automatic surplus rifle with the Sakhno SKS semi-automatic rifle. add: You can acquire a SKS parts kit from the black market. /🆑 |
||
|
SmArtKar
|
24cd243730 |
Fixes wooden rifle stock being uncraftable (#89411)
## About The Pull Request Closes #89410 ## Changelog 🆑 fix: Fixed wooden rifle stock being uncraftable /🆑 |
||
|
necromanceranne
|
ad5a70eac6 |
Refactors gun repair and maintenance. Gun maintenance kits; available in cargo or the security equipment vendor (#89205)
## About The Pull Request Misfire chance, gun jamming (currently only on boltaction rifles) and integrity repairs are now handled by gun maintenance kits. Using a kit on a gun resets any misfire chance or jamming, and restores the weapon's integrity back to full. You can find gun maintenance kits in security equipment vendors, or order a crate of them from cargo. You can also make a maint version to retain the improvised nature of the previous cleaning functionaltiy. ## Why It's Good For The Game Firstly, clearing misfires was always a little confusing for most players, as it required a bolt of cloth to fix. That's really on me for making that as confusing as possible. We ended up with multiple firearm degradation mechanics, so consolidating their restoration makes it easier for future code maintenance. I disliked that the kits existed but were mostly only for the sake of an extremely niche interaction. And that interaction was, at best, kind of niche. Expanding out their use to gun maintenance generally is honestly better design. ## Changelog 🆑 refactor: Gun maintenance is now consolidated into a single item, the gun maintenance kit, rather than multiple different item interactions. It is handled on the maintenance kit itself, and not in gun code. qol: You can order maintenance kits from cargo, and get some out of the security equipment vendor. Helpful if someone spilled acid onto your disabler. You can also make a makeshift one from maintenance trash. /🆑 |
||
|
Profakos
|
40c205bd58 | Improvised explosives and pneumatic cannons recipes use the base pipe objects (#89096) | ||
|
Cheshify
|
18ffabca05 |
Laser Musket & Smoothbore Disabler BUFFS (Crank it AND Run) (#86867)
## About The Pull Request This rebalances the Laser Musket and Heroic Laser Musket Replaces glasses with 2 drinking glasses in the crafting recipe Removes 2-handed demand Standard shot damage slightly increased and stamina damage greatly decreased Heroic shot made a 3-round scatter shot, very powerful, damage and stamina damage decreased to compensate Crank-charge weapons, except the thermal revolvers, can be charged while moving Muskets can also be worn on jackets ## Why It's Good For The Game These things were severely underused, and I always kinda wanted them to be crankable while you moved, I just didn't know how. This should also help the Militiamen ERT be less of a joke. I would appreciate balanceposters giving some advice on the numbers if you're seeing this. The heroic musket is incredibly rare, and SHOULD be pretty powerful. ## Changelog 🆑 balance: laser muskets have been rebalanced balance: crank weapons can be charged while moving /🆑 |
||
|
KingkumaArt
|
c4974b63ab |
Bigger Booms: Adds Pipe-Organ Gun and Canister Gatling, two emplaced weapons, along with Mounted Gun code. (#86390)
## About The Pull Request  So, as you may know, I really like the bootleg weaponry this game has, but after dealing with gun code for the crossbow, I wasnt inclined to make more of it. However, when I'm playing ss13 I often have background noise on, and one day I was listening to an age of empires game, which, if you aren't aware, is basically a medival rts, featuring a weapon called an "organ gun". Said organ gun is basically 8 or so muskets stuck together firing at once. And well, given SS13 has pipeguns, also called muskets, I couldnt pass up the pun of "pipe organ gun." And thats why this pr exists. However, as I am noticing I have a habit of doing, I tend to end up coding more than I ever initially planned. So what does it add? Well, lets start with the pipe organ gun. <img width="428" alt="image" src="https://github.com/user-attachments/assets/0cb93fb9-6ed3-4cb1-a340-0b54832ac577"> The pipe organ gun is made from wood, pipes, iron, typical maints weapon stuff. Where it differs is it isn't a handheld object - it's a machine you push and pull around akin to say, the pirate cannons. It can hold up to 8 pipegun shells, and launches them all at once when lit with anything that ignites stuff, like a welder, match, torch, etc. It does a lot of damage, but requires time to reload, and a smart enemy can just lie down and ignore it. Or maybe it'll just roll 8 of the really bad ammo types and do nothing, who knows. https://github.com/user-attachments/assets/5ee1353b-c965-4f47-aa22-4f5cfeb04c51 Initially I planned to use the cannon code as a base, but that presented a lot of issues, as they need to use cannonballs (which arent ammo in the traditonal sense), along with only being single shot among other things. So I made an entire new type of structure called Mounted guns, which are like cannons that can use conventional ballistic ammo, and dont have any of the restrictions, and made to be customizable. You want a gun that takes plasma bars as ammo and launches fireballs? it can do that. You want to have a rebar ballista, that can shoot up to 3 rods at once, but only needs to be loaded once? It can do that too. Hell, you could probably just make full-on gun emplacements with some code changes. If it's a projectile, it can shoot it, and if its an object, it can use it as ammo. A list of the current stuff you can change is below. <img width="510" alt="image" src="https://github.com/user-attachments/assets/107abbc1-a004-4724-9627-a3388f92cd63"> Which leads me to the second gun I added, which is more of an example of what can be done with the mounted_gun class. The canister gatling spawns on the flying dutchman pirate ship, with enough ammo for five shots. <img width="453" alt="image" src="https://github.com/user-attachments/assets/46fdc16e-813a-4e14-b25a-9cf49d245ca6"> Five shots may not sound like much at first - but thats because each shot is a burst of 50 individual shrapnel bullets. It's unable to break any walls or doors except for windows, but against anything that isnt a structure... well, as shown below, they'll have a very bad day. https://github.com/user-attachments/assets/3519c49d-97e6-4095-99cf-ee8039adbaba If people like these concepts, I genuinely might add that engineering rebar ballista. ## Why It's Good For The Game As said above, I'm a big fan of the whole improvised armory concept ss13 has, and the fact the only "big" gun featured is the trash cannon (which is locked behind maint loot) is a shame. I felt the pipe-organ gun was a good compromise - as stated, its just eight pipeguns stuck together, with all the strengths (high damage output) and weaknesses (slow reload, needs to be dragged around, cant hit people on the floor, cant damage walls) that it lacks. As for the canister gatling, I dont forsee it being a massive problem, as it cant breach walls or doors, so it isn't just a better cannon. ## Changelog 🆑 WebcomicArtist add: Added pipe-organ gun: a buildable object akin to trash cannon that takes pipegun rounds, and shoots up to 8 off at once. add: Added The Canister Gatling, a rapid fire but non-destructive cannon for skeleton pirates. Also Canister shot ammo. sound: Added sounds for the above guns. image: Added sprites for the guns as well. code: Added a whole "mounted_gun" class that is basically cannons but you aren't forced to use cannonballs as ammo and load them with gunpowder. /🆑 |
||
|
Redrover1760
|
91d989570f |
Adjust Vortex Core Max and Beam Rifle recipe. (#85878)
## About The Pull Request Vortex cores were set to 1 max in order to specifically limit a beam rifle from ever being made more of in a round. This PR sets the amount of vortex cores needed for the Event Horizon Anti-Existential Beam Rifle to two, and increases the max Vortex cores capable of being made to 3 in order to give leeway to use vortex cores for other things and not have it only capped at 1. ## Why It's Good For The Game Still stops the ability to create multiple black hole rifles, but allows for more vortex cores to be made for other needs. ## Changelog 🆑 balance: Changed max refined vortex cores from 1 to 3. Changed the Event Horizon Anti-Existential Beam Rifle recipe to require 2 vortex cores. /🆑 |
||
|
necromanceranne
|
e4adc1a939 |
Bow Update: Fletching instruction manual, bows using projectile damage multipliers, unhardcoded bow sprites, hot pink death (#84435)
## About The Pull Request Adds a new crate to the Service section of cargo. The Fletching and Bow-Making Starter Kit. Comes with some materials and a fletching instruction manual. The manual teaches you how to make shortbows (18 force from normal arrows utilizing projectile multipliers), arrows, holy arrows (but you need a divine bow to make them), quivers (but they only hold 10 arrows), plastic arrows and violins. For reasons.  ### Fixes Bows now no longer utilize hardcoded sprites for their loaded sprite. Now they use overlays. Bows properly become undrawn once fired. No longer can your bow magically launch arrows by sheer force of will. ## Why It's Good For The Game Initially I just wanted to provide a way for bow wielding chaplains to produce additional arrows for their bow. Running out of those always felt pretty lame. But then I got to thinking; actually, I kind of want to LARP sometimes as an archer. I think that'd be kind of goofy and fun. So I bundled that together into a solution for both. The shortbow is really, really not meant to be a meaningful weapon. It's just kind of silly, and meant to let people pretend to be Robin Hood and occasionally hurt someone in a workplace accident. I'm particularly thinking of clowns being the perfect users for this with their clumsy trait. I will make this weaker if I have too. (I am not, at this moment, redoing flaming arrows okay? I saw the code comment. I know. Not right now. @tralezab, if you have any flaming arrow sprites lying around, please let me know.) ## Changelog 🆑 add: Fletching starter kit! Make your own bow, shoot your friends in an unfortunate workplace accident. Replace all those holy arrows you lost. fix: Bows now properly undraw once they have fired an arrow. code: Bows now utilize overlays in order to display loaded arrows. Unique overlays per arrow. /🆑 |
||
|
ArcaneMusic
|
3512821314 |
Adds a new anomaly core item to Illumination technology, the photon cannon. (#84368)
## About The Pull Request This PR adds a new gunkit to the **Illumination Applications** tech node acquired via BEPIS techs. For years, this funny little tech node has been one of the lamer results from the BEPIS tech pool, only offering constructable unique hardhats and access to a micro RLD. Well, lets just say, badda bing https://github.com/tgstation/tgstation/assets/41715314/bd869d7f-449a-4563-871a-b90f550e0bda The photon cannon is craftable via a lathed gunkit obtained from the security lathe, which fires 4 shots per recharge. Each shot, on direct contact with a mob, acts like a severity 3 flash. The shot also distinctly slows down after traveling, so you can more effectively gauge where it's going to stop moving, as when it reaches it's travel distance, it will perform a weaker AOE severity 1 flash. Direct hits will effect silicons, while the AOE flash will not. Direct hits only deal 5 ***STAMINA* damage. The Gunkit requires a flux anomaly core to be crafted, completing with the tesla gun in this respect. ## Why It's Good For The Game There's been some discussion about how we've hoping to offer higher power features and options to the game at large using anomaly cores, and flux anomalies are currently only used for guns, which is rather unfortunate. The bigger issue, I'd suppose, is that every gun that flux anomalies can produce are considered lethal, with the event horizon gun and tesla gun. And honestly, by comparison, the tesla is not lethal enough to use to any real effect, or practical enough to bother science enough for the core. The photon cannon, however, works as a rather effective crowd control weapon for breaching and incapacitating crewmates, making it ideal for wardens dealing with large tides of crewmates, officers breaking into bases, or ~~the captain trying to burn down your library dnd game, DOUGLAS~~ Overall, it's still a fairly low power weapon, and sits in a niche place somewhere between a dragNET, flashbang-loaded grenade launcher, the flash, and the ion-cannon, with it's versatility coming from core rarity and requiring a BEPIS tech. **I have since updated this PR so that this gun deals stamina damage instead of energy damage, and contact with the energy ball deals a short period of confusion.** ## Changelog 🆑 add: The Illumination Applications technode now includes a gunkit for a new gun, the Photon Cannon. /🆑 |
||
|
Watermelon914
|
0db2a23faf |
Adds a new power storage type: The Megacell. Drastically reduces power cell consumption/storage. [MDB Ignore] (#84079)
## About The Pull Request As the title says. A standard power cell now only stores 10 KJ and drains power similar to how it did before the refactor to all power appliances. The new standard megacell stock part stores 1 MJ (what cells store right now). APCs and SMESs have had their power cells replaced with these megacell stock parts instead. Megacells can only be used in APCs and SMESs. It shouldn't be possible to use megacells in any typical appliance. This shouldn't change anything about how much 'use' you can get out of a power cell in regular practice. Most should operate the same and you should still get the same amount of shots out of a laser gun, and we can look at expanding what can be switched over to megacells, e.g. if we want mechs to require significantly more power than a typical appliance. Thanks to Meyhazah for the megacell icon sprites. ## Why It's Good For The Game Power cell consumption is way too high ever since the power appliance refactor that converted most things to be in joules. It's a bit ridiculous for most of our machinery to drain the station's power supply this early on. The reason it's like this is because regular appliances (laser guns, borgs, lights) all have a cell type that is identical to the APC/SMES cell type. And it means that if we want to provide an easy way to charge these appliances without making it easy to charge APCs/SMESs through a power bug exploit, we need to introduce a new cell type to differentiate between what supplies power and regular appliances that use power. This is primarily what the megacell stock part does. This moves us back to what it was originally like before the power refactor, where recharging power cells wouldn't drain an exorbitant amount of energy. However, it maintains the goal of the original refactor which was to prevent people from cheesing power generation to produce an infinite amount of power, as the power that APCs and SMESs operate at is drastically different from the power that a regular appliance uses. ## Changelog 🆑 Watermelon, Mayhazah balance: Drastically reduces the power consumption and max charge of power cells balance: Added a new stock part called the battery, used primarily in the construction of APCs and SMESs. add: Suiciding with a cell/battery will shock you and potentially dust you/shock the people around you if the charge is great enough. /🆑 --------- Co-authored-by: Watermelon914 <3052169-Watermelon914@users.noreply.gitlab.com> Co-authored-by: Pickle-Coding <58013024+Pickle-Coding@users.noreply.github.com> |
||
|
necromanceranne
|
4739cedebc |
Event Horizon Anti-Existential Beam Rifle. The ultimate conclusion to the arms race and the sniper's art. (#83934)
## About The Pull Request Replaces the Particle Acceleration Rifle, or the Beam Marksman Rifle, with the Event Horizon Anti-Existential Beam Rifle. In short, it shoots black holes. It takes five cores to make. It pretty much kills everything you point it at and their immediate bystanders as well. You can do this from the relative safety of a whole four screens away thanks to it having a scope. There can only ever be one vortex anomaly made in the round. The recipe, however, always requires the maximum number of cores that can be made in a round. If the number goes up for some reason (maybe someone wants to add more vortex items), so does the total number of cores needed to make an AEBR. ## Why It's Good For The Game Firstly; the beam rifle? Awful. Jank code. Bad performance. Ancient balancing considerations. Just too strong to bring out regularly against specifically blobs, but completely fucking useless against anyone else. So I'm hitting all these problems at once. I reduced a 600 line file to less than 60. I've removed all that bad code. I've also made it specifically unable to combat blobs at all because singularities send blobs off to safety. Secondly; this is maybe the first example of 'more cores = bigger power'. The rifle was already utterly trash to have around, and I just didn't think the way it worked currently could really excite anyone enough to go on a big ol' quest to get it. Solution? You will cause a shuttle call if you get this weapon. ## Changelog 🆑 add: Replaces the Particle Acceleration Rifle with the Event Horizon anti-existential beam rifle. It shoots black holes. You can make this in-game. That's right, YOU! balance: Only one vortex anomaly can be made in a round. /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
KingkumaArt
|
ed4ba0d227 |
Adds Atmos-themed Rebar Crossbow Ammo Types (and minor balance changes) (#83310)
## About The Pull Request So this PR comes in two basic parts: the new ammo types and the minor balance changes. I'll go over each separately. **--- NEW AMMO TYPES ---**  -- Metallic Hydrogen Ammo: Made from Metallic Hydrogen, obviously. Has middling damage and no dismemberment chance, but pierces through armor and enemies like they weren't even there. -- Zaukerite Slivers: Made from a zaukerite crystal. Does high toxic damage, and has excellent wounding and embed chances, but lacking in armor penetration. Also gives 1 second of blurry vision if it hits you! -- Paper balls: Crafted from a sheet of paper. Mostly just a throwing joke item, and 99% nonlethal like donksoft. Can be fired from a crossbow, but also could be used if you wanted to have a snowball fight on metastation. -- Healium Crystal Bolts! Crafted (using menu) from the healium grenade item. Heals 30 of brute/tox/burn, but puts who is hit by it to sleep for three seconds, limiting its use in actual combat. -- Supermatter Bolts: Dusts whoever you shoot it at! Absurdly overpowered! Admin only! -- A makeshift quiver, made from cutting a o2 tank in half, to store all the ammo in. **MINOR BALANCE CHANGES** -- For some reason I thought the 357, which the traitor crossbow is a direct competitor to, did 40 damage when making the first version of the PR, instead of the reality of it doing 60. It's been buffed to 55 damage. (The basic engi one still does 35.) -- I've been informed that generally, the stressed rebar crossbow isn't ever used, as the misfire chance isnt worth the extra shot. As such, I felt it was thematic to say that the stressing procedure involves messing with the draw system in the fluff, and the stressed one now takes half as long to rack. **OTHER CRAP** -- The rods now drop themselves if you shoot them at a wall. Hopefully. -- Fixed the the non-bare wound chance on the traitor crossbow not being increased from the base version. -- Has a nice electronic discharge noise on firing. ## Why It's Good For The Game I'm very happy with the reception of the rebar crossbow, and felt that given it was an engi weapon at heart, giving it some engi-related ammunition would fit it very well (and also have a good reason for making zaukerite besides selling it.) The paper balls were more just so the crew could able to shoot their buddies with it and not maim them. As for the balance, I feel the tot crossbow being department restricted is already a strong factor in it being infrequently seen, and if someone is lucky enough to roll traitor in a job slot, it's a shame if their job's items aren't worth it. The stressed variant is a similar case, and I hope it's enough of a buff to encourage its use. ## Changelog 🆑 WebcomicArtist add: Added zaukerite (high damage/embed, low AP) and metallic hydrogen (High AP and piercing, but low embed) crossbow ammo for the rebar crossbows add: Added healium crystal ammo for the crossbow as well, which heals whomever you shoot it at. add: Added admin-only supermatter crossbow bolts that dust you, because why the hell not. add: Added non-harmful paper balls. Can be shot from a crossbow, or thrown at co-workers. add: Added a quiver made from cutting an o2 tank in half, to hold it all. image: added sprites for all the above. balance: Traitor Engineer Crossbow ammo now does 55 damage instead of 45, to make it compete with revolver. balance: Stressed Rebar Crossbow now has a shorter delay required to rack it, but can shoot you in the face on misfire. fix: fixed rebar crossbow shots not dropping items on hitting walls fix: fixed traitor crossbow having worse wound chance than the base one sound: added new crossbow firing sound effect /🆑 --------- Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com> |
||
|
necromanceranne
|
6fd6ebd850 |
Pipegun updates and glowup (#83063)
## About The Pull Request Updates pipeguns with a brand new set of sprites. Also comes with pipe pistols; plinkier versions of the pipegun.    Alters pipeguns away from utilizing shotgun/rifle ammunition towards a bespoke junk round ammo. These shells are crafted similarly to current improvised shells. This also removes improvised shells as a shotgun ammo type. (these new shells aren't shotgun shells to begin with, they're more like rifle bullets) Crafting junk rounds produces an entirely unknown projectile in the shell. You won't know what you get until you fire the gun. Almost in every instance, however, the shot is beneficial towards killing things. And they all do about the same amount of damage, so there is hopefully never a round you didn't want to fire in the gun. Fighting someone with a pipegun is usually predictable for what amount of damage it will do, but any additional effects it might have is going to be an unknown factor. They also brutalize borgs, which is a quality that improvised shells had previously. Pipeguns operate as they did before, and do roughly 40 damage per shot with the majority of their ammo types (less than what they do currently with .310). They only have one shell in the gun at a time, so every time they're fired, they must be reloaded. Pipe pistols do roughly 15 damage per shot, but hold more ammo than the bigger pipegun. However, they're more likely to veer off-course. There are regal versions of each of these weapons, and each are more potent respective of their general rarity. Having one is going to be a lot more noteworthy. ### Minor changes Some more clothing items can carry pipeguns in their suit storage. The icemoon hermit spawns with a heroic laser musket rather than a regal pipegun (partially because it is too difficult for the hermit to get more ammo for their gun, and also because the regal pipegun is a more powerful weapon than previously) ## Why It's Good For The Game It has been a few years since I added the pipegun, and time was never particularly kind to it. There are alternative weapons now with interesting mechanics of their own. The ammunition it used has changed considerably. And it simply didn't ever feel like a 'junk gun' in a way that was fun. The original mechanics added to give it that feeling were just not fun to experience and were removed. So the pipegun has been left as 'a shitty version of X'. Even the regal pipegun was, at the end of the day, a shittier version of either a shotgun or cargo rifle. It didn't feel right not having some kind of unique quality to using these weapons that help them express themselves as unpredictable trash weapons built inside of maintenance. But I expressly didn't want to make it 'unpredictable' in a way that felt unfair on the person getting shot either. So just giving it more damage was right out. As a compromise, I reduced the overall lethality of the weapons while introducing a gimmick that will appeal to those wanting to play out the role of a homeless lunatic with a shitty homemade gun stalking maintenance. A 'chaos gun' so to speak. Maybe that will appeal to people. ## Changelog 🆑 balance: Reworks pipeguns to use an unpredictable 'junk round'. You won't know what you're shooting until you fire it. add: Introduces a pistol version of the pipegun; the pipe pistol. It is inaccurate and does significantly less damage, but more portable and has more ammunition in the gun. image: Updates the visuals of the pipeguns. balance: Also improves the Regal varieties of these weapons. By a lot. balance: More articles of clothing can be used to carry pipeguns in suit storage. balance: The Icemoon Hermit comes with a Heroic Laser Musket instead of a Regal Pipegun. remove: Improvised shells (the shotgun shell) has been replaced with improvised junk shells (which don't work with shotguns but do work with pipeguns). /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
Xander3359
|
e54ecf4b10 |
Fix crafting bypassing checks (#82833)
## About The Pull Request Backport from https://github.com/tgstation/TerraGov-Marine-Corps/pull/15701 Fixes crafting bypassing checks. ## Why It's Good For The Game Closes https://github.com/tgstation/tgstation/issues/82826 ## Changelog 🆑 fix: You can no longer bypass construction restrictions via the crafting menu /🆑 |
||
|
distributivgesetz
|
274eb2a52e |
Removes Clone Damage (#80109)
<!-- 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 Does what it says on the tin. We don't have any "special" sources of clone damage left in the game, most of them are rather trivial so I bunched them together into this PR. Notable things removed: - Clonexadone, because its entire thing was centered around clone damage - Decloner gun, it's also centered around cloning damage, I couldn't think of a replacement mechanic and nobody uses it anyways - Everything else already dealt clone damage as a side (rainbow knife deals a random damage type for example), so these sources were removed <!-- 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 Consider the four sources of normal damage that you can get: Brute, Burn, Toxins and Oxygen. These four horsemen of the apocalypse are very well put together and it's no surprise that they are in the game, as you can fit any way of damaging a mob into them. Getting beaten to death by a security officer? Brute damage. Running around on fire? Burn damage. Poisoned or irradiated? Toxin damage. Suffocating in space? Brute, burn and oxygen damage. Technically there's also stamina damage but that's its own ballpark and it also makes sense why we have a damage number for it. Picture this now: We have this cool mechanic called "clone pods" where you can magically revive dead people with absolute ease. We don't want it to be for free though, it comes at a cost. This cost is clone damage, and it serves to restrain people from abusing cloning. Fast forward time a bit and cloning is now removed from the game. What stays with us is a damage number that is intrinsically tied to the context of a removed feature. It was a good idea that we had it for that feature at the time, but now it just sits there. It's the odd one out from all the other damage types. You can easily explain why your blade dealt brute damage, but how are you going to fit clone damage into any context without also becoming extremely specific? My point is: **clone damage is conceptually a flawed mechanic because it is too specific**. That is the major issue why no one uses it, and why that makes it unworthy of being a damage stat. Don't take my word for it though, because a while ago we only had a handful of sources for this damage type in the game. And in most of the rounds where you saw this damage, it came from only one department. It's not worthwhile to keep it around as a damage number. People also didn't know what to do with this damage type, so we currently have two ways of healing clone damage: Cryotubes as a roundstart way of healing clone damage and Rezadone, which instantly sets your clone damage to 0 on the first tick. As a medical doctor, when was the last time you saw someone come in with clone damage and thought to yourself, "Oh, this person has clone damage, I cannot wait to heal them!" ? Now we have replacements for these clone damage sources. Slimes? Slime status effect that deals brute instead of clone. Cosmic heretics? Random organ damage, because their mechanics are already pretty fleshed out. Decloning virus? The virus operated as a "ticking timebomb" which used cloning damage as the timer, so it has been reworked to not use clone damage. What remains after all this is now a basically unused damage type. Every specific situation that used clone damage is now relying on another damage type. Now it's time to put clone damage to rest once and for all. Sure, you can technically add some form of cellular degradation in the future, but it shouldn't be a damage number. The idea of your cells being degraded is a cool concept, don't get me wrong, but make it a status effect or maybe even a wound for that matter. <!-- 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. --> 🆑 del: Removed clone damage. del: Removed the decloner gun. del: Removed clonexadone. /🆑 <!-- 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. --> |
||
|
distributivgesetz
|
f8b41f9442 |
Changes occurrences of recieve in code to receive (#80065)
## About The Pull Request I've stumbled across this enough to finally go through the entire codebase and fix it. I left out changelogs simply because rewriting history logs is bad. ## Why It's Good For The Game I find it pretty annoying because I stumble across words that are misspelled for a few seconds, and I'm likely not the only one who feels like this. Less spelling mistakes in code are better. ## Changelog 🆑 spellcheck: Occurrences of "recieve" has been changed to "receive". /🆑 |
||
|
KingkumaArt
|
d47c5149d5 |
Emergency hotfix for engi crossbow [NO GBP] (#79606)
Hadnt added these commits when the PR got merged due to not expecting it oops ## Why It's Good For The Game See above, used to make my last pr actually function as intended. ## Changelog 🆑 fix: fixed engi crossbow being able to be used onehanded + ability to craft with sci inducers /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
KingkumaArt
|
ba076e94bc |
Adds engi improvised weapon - rebar crossbow + Engi Exclusive Tot Shop Variant (#78777)
<!-- 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  Engi now has access to a Half Life 2 Inspired rebar crossbow! Made of rods, wire, and an inducer, it shoots sharpened iron rods at a high velocity. High damage and good embed chance, but requires you to reload every shot which requires you to stand still for three seconds to pull the string back. You can also Use a wrench on it to force it to store more rods (read: more than one), but risks it exploding and shooting you instead. The syndicate variant, avaliable to traitor engis, can fire three rounds before needing a reload, and features a scope and better armor piercing ammpo, but costs 10TC. I see it as a sidegrade to the revolver - quieter and has much more widespread ammuniton, but holds less ammo and doesnt have the same burst stopping power. And, to those concerned about the balance of a non-traitor with this item - the AP ammo can only be made by the traitor who bought it, and anyone else has to use normal ammo. GUN STAT JUNK Normal one has 60% embed chance and does 40 damage (against unarmored targetd), but requires you to wait at least 3 seconds not moving to pull the string back. Good alpha strike but not sustainable in a long fight. Its akin to a pipegun. Lacks any AP qualities besides piercing a jumpsuit, because any wound chance it has is due to a bare skin bonus. Generally not a great weapon to fight sec with. Syndie version is generally the above but better. Takes less to pull the string back, slightly higher damage, better fire rate, etc. Doesnt fare well against any armor thats equivalent to sec gear or better due to most having low (relatively) AP and wound chance, but good bare wound bonus. STATS TLDR: Its good against unarmored chumps and greyshirts but anyone in armor that protects against bullets will kick your teeth in. Also, Ammo is crafted from an iron rod. I wanted to have it just fire rods as is, but theyre stacked items which you cant define projectiles or ammo from. ## Why It's Good For The Game I've always felt engi, for as big of a department as it is, is lacking in the "fun weapons" area. Sci has mechs and xenobio, med has chem nades and syringe guns, and cargo has anything the QM will buy - but other than the flamer and shocked doors, engi doesnt have much. Thats why I made this pr. it was originally just a traitor item, as they lacked many traitor items in their shop, but I felt like a worse, bootleg version would suit them. ## 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: Enginenering rebar crossbows + tot kit add: Added a bunch of ammos and crafting junk to make the ammo exist image: added icond for all the above /🆑 <!-- 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: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@gmail.com> |
||
|
necromanceranne
|
053e66b0d3 |
Makes the Regal Condor realistically simulate being shot dead with a high caliber hand cannon by making it HITSCAN (#78674)
## About The Pull Request The Regal Condor come with a magazine and ammo already inside. The recipe for the magazine now no longer needs TC, but does need donk pockets (sponsored murder gear, you see) and a hell of a lot more materials per magazine (you're looking at like 40 sheets of various materials all up). It also needs you to make the Condor first. But it comes preloaded with ammo. The Condor is 1 whole TC more expensive. Also needs some metal. The old recipe is there in spirit. The Regal Condor and the magazines come with 10mm Reaper bullets. They're high damage. They're high AP. They are also hitscan. ## Why It's Good For The Game Apparently people don't like the Condor. Too much effort for not enough reward. After all, revolvers exist. 'It must be a joke' they say! 'It's joke content! I went to all that effort to make it for nothing! That slut Anne tricked us!' **Wrong, bitch.** If you want the Condor to make you shit yourself the moment someone with it appears on the screen, then fine! ### **You get what you fucking deserve.** ## Changelog 🆑 balance: Despite earlier reports suggesting that the famous lethality of the Regal Condor was largely a myth, there has been rumors that the gun has once again started to display its true killing potential on any station that it 'manifests'. /🆑 |
||
|
carlarctg
|
a8edd9004f |
Gun kits don't need cable coil or tools, halved crafting time (#78419)
## About The Pull Request Crafting R&D guns from gun kits no longer requires tools or cable coil. The decloner and energy crossbow still need reagents. Halved R&D gun crafting time. 20->10 seconds. ## Why It's Good For The Game These changes were made a long, long while ago and honestly while I understand gun kits I don't understand why it was made So. Annoying. To make the fucking guns once you got everything ready. It makes it a total annoyance. You spent 40 minutes getting all the tech for it, you shouldn't have to also get tools and cables and wait 20 seconds standing still. Anyone who has played ingame like any time after that change can attest how underused any R&D gun is now. X-ray laser guns still DESTROY blobs but people don't even THINK about them because of the dumb annoying recipe (alongside RnD being a pain now). Simply put this just. Makes life easier for security officers. And reduces tool dependency. ## Changelog 🆑 qol: Crafting R&D guns from gun kits no longer requires tools or cable coil. The decloner and energy crossbow still need reagents. qol: Halved R&D gun crafting time. 20->10 seconds. /🆑 |
||
|
CRITAWAKETS
|
63d6c2e962 |
Adds in the smoothbore disablers. (#76773)
## About The Pull Request This PR adds in a craftable smoothbore disabler, a pistol companion to the lethal laser musket. Unlike the musket, it fires a disabler shot. Singular. Weak in armor too. After you fire it, you've gotta crank it, but only one crank. The good thing about it is that you can simply add more smoothbores to your inventory, and use 4 of them to take down a target. The bad thing is that it's a smoothbore (which for an energy weapon, means no lens is installed). It has 22.5 degrees of inaccuracy. Have fun. Militia Men start with a holster containing two of these, fitting with their equipment. But of course, the Militia General has an upgraded laser musket, so... He needs a better smoothbore too. **INTRODUCING THE ELITE SMOOTHBORE DISABLER** Using ANCIENT TECHNOLOGIES and PURE BLING, you can fire TWO shots, not be weak against armour AND have actual accuracy (and a +5 damage boost because i figured why the hell not). This is the strongest upgraded variant of the shitty maint guns, so the tome to craft it is currently unavailable. I want someone to figure out a creative way to put it somewhere that isn't just a random spawn in maintenance.  The Militia General only has one elite smoothbore. It's too rare and powerful to simply have two. Even though a regular disabler is better in every way. Smoothbore Disabler Recipe: 1x Weapon Stock 5x Cable Coil 1x Pipe 1x Micro-Laser 1x Power Cell 1x Mouse Trap Needs: Screwdriver, Wrench. Takes 10 seconds to make. Elite Smoothbore Disabler Recipe: 1x Smoothbore Disabler 5x Gold Ingots/Sheets 1x Hyper-Capacity Power Cell 10u Tempomyocin Needs: Screwdriver. Takes 20 seconds to make. Recipe requires recipe book. ## Why It's Good For The Game Having a sidearm to go with your laser musket is neat, alongside the fact that it just allows following up on someone. I don't have much to say honestly, I just think it's neat. Also the idea of an assistant going FULL BLACKBEARD, carrying 4 pistols and having to toss them away in order to shoot again cracks me up. Oh and this is the part for coders: I've de-spaghettified some code with the maint gun recipe granters, and the gun crank is now a component. It's likely you could use it on any item that sends the proper signal, so I kind of overbuilt it on purpose. Also the attack_self on guns now returns parent. This should allow it to send a signal alongside putting your grubby fingerprints on the weapon when you switch modes. There could be bugs but they should be easy to fix if they pop up, mode switching on guns works without a fuss. ## Changelog 🆑 add: Added the smoothbore disabler and it's prime variant. You can now craft a disabler with only one shot and terrible accuracy. code: Gun cranking has been made a component and could theoretically be used on more than guns. /🆑 |
||
|
Cheshify
|
b9fa1bc8f4 |
The Laser Musket (2023) (Settlement Helper Edition) (#76231)
## About The Pull Request This adds a craftable laser musket to the game. It's slow and unwieldy, but consistent! I'd be happy to tweak the numbers if it's too good/bad. This PR also adds an independent militia ERT, who travels the spinward sector to help defend stations! TO DO LIST: - [x] Finish worn sprites - [x] Add a crafting recipe on par with the pipegun - [x] Add bayonets - [x] Separate charging into two stages and REDO THE AUDIO AAAA - [x] Clean up code (Needs review, totally) Scrapped: - Possibly add overcharge mechanic (This is just beyond my skill level for now) - Find a unique sound for the weapon firing (We have a unique projectile, and I can't a sound that fits more than the laser gun one)      Inhands by RedSentry27 Suit sprite by Kinnebian Prime Laser Musket sprites by RedSentry27 Balance Considerations (ew): 25 damage (30 on prime) Normal wound 40 Stamina damage (45 on prime) Weak to armour (prime not weak to armor) 2 second charge time, needs to be charged twice No overcharge Requires two hands to hold (like a chainsaw) Crafting Recipe: One rifle stock Fifteen Cable Coils Four Iron Rods One micro laser One capacitor One pair of prescription glasses One drinking glass Craft for 10 seconds with a wirecutter and screwdriver Prime crafting recipe: (REQUIRES READING MAINTENANCE LOOT: "journal of a space ranger") One laser musket Fifteen cable coils Five silver One water recycler Fifteen units of nuka cola Craft for 30 seconds with a screwdriver while wearing cowboy boots and a cowboy hat ## Why It's Good For The Game The idea of assistants and revs forming firing lines in the halls to shoot eachother sounds hilarious. Besides, we need a parallel to the pipegun, and this is the funniest way to do so. ## Changelog 🆑 Cheshify, Kinnebian, and RedSentry27 add: Maintenance engineers have sent out blueprints across the sector for a new laser musket. admin: A new energy-gun toting ERT is available to send to the crew. --------- Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> |
||
|
necromanceranne
|
997dac9616 |
Imports and Contraband: Different! Cargo crates without locks! MEAT! (#74490)
## About The Pull Request ### **Cargo Black Market goods should stay in cargo's hands** #### New Cargo Console Category: Imports This category is explicitly the non-departmental category beyond simply having a Misc category. It is meant for material that nobody is meant to be buying for their departments, and mostly for the odd-ball crates that might show up. It also allows us to maintain contraband as exactly that; contraband that the departments shouldn't have access too whatsoever. If someone is buying from this category, they probably intend to be a cheeky fuck. <details> <summary>The New Changes</summary> #### Baseline Imports MEAT: MEAT (meat backpack you can eat) <details> <summary>MEAT</summary>   </details> Duct Spiders: They're adorable and cause a mess, but that doesn't stop Nanotrasen from importing them from the Australicus sector to your station! Stack of 50 Bamboo Cuttings: Pretty expensive and kind of a premium. Allows for those people looking to make bamboo decorations without hoping botany exists, and are at least willing to pay. Also lets them make horribly dangerous stuff with bamboo, of course. A Single Sheet of Bananium: The problems this will cause I think speak for themselves. (mostly due to a clown fruitlessly attempting to make something actually disruptive while bankrupting cargo) Natural Fish Bait: It isn't cheating, it's homemade. (Really good bait but expensive and obviously drugs) A dumpster...: A corpse in a dumpster, doesn't get more complicated than that. Useful for corpse reasons. Made using some code I borrowed from over here! https://github.com/lizardqueenlexi/orbstation/pull/354 #### Contraband Imports Foam Force Pistols: Same as it ever was with a price reduction. I brought it down because riot darts are like 8 bullets a clip, and do less damage than a disabler using riot darts. It feels like a sidegrade weapon, and even if it technically is a ballistic weapon, it...isn't that strong. I think this is pretty safe. Definitely Not a Duct Spider: It's actually a giant spider in a box. If you want to waste cargo's money while also sending them a mess to deal with, this is the crate for you. Russian Surplus Military Gear Crate: I took this opportunity to futz with boltaction rifles. There are two kinds of mosin nagant you can get in this crate. One of them is the good kind (no jamming). The other is the shit kind (yes jamming), but you get more of them. You can get the good ammo, or you can get the shit ammo. You'll have to pick through it a lot more carefully to make sure you know which ones you've received. Since this dilutes the pool even further, getting a good number of mosins that aren't trash is even more expensive, and even if you do get mosins at all, you might still only get the bad ammunition that doesn't work against actual human threats as well. It also now cannot be purchased through the security cargo supply console, and as to why they could in the first place baffles me. Doesn't have a lock anymore because...it's contraband? Who is locking this stuff? **Side note: _You can make surplus 7.62 in the autolathe as well. It is not very good except to fight fauna or naked assistants._** **Side Side note: _I've killed off the shitty brand_new subtype and brought peace once more to this land._** #### Illegal Imports (Emag) NULL_ENTRY: A journal that suggests how to make a...very interesting weapon. The Regal Condor. Kind of an evolution on some other ideas I've had over the years. This one is basically a secret weapon with a few hurdles to jump through. Very lethal. Very expensive. **Side note: _For reference, it's effectively 19 TC worth of gear to make, but there does exist some methods to acquire this more cheaply if you can get some bits and pieces from world spawns. Given it requires you to get some pieces of equipment that might require additional purchases of contraband, and getting into the captain's office to loot a specific piece of clothing, the stakes more than make up for the effectiveness._** Smuggled WT-550 Autorifle Crate: This is basically the same, but you might have noticed had you recently attempted, like me, to buy these when you emagged them using a personal account and discovered a tragic oversight. You couldn't, because they still needed armory access. This removes that access, because you've already gone to the effort of getting your hands on an illicit firearm through cargo, and if they techs somehow miss the fact that you've purchased a WT-550...all the better for you! Smuggled WT-550 Ammo Crate: Includes AP and Incendiary! **Side note: _You can get WT-550 ammo again via the Illegal Technology node._** Shocktrooper: Replaces the Special Ops crate. Contains a box of EMPs, smoke grenades, a couple of gluon grenades and a couple of frag grenades. Funsies. Special Ops: The NEW Special Ops crate. Contains a chameleon mask, jumpsuit and agent card. And a knife. **Side note: _This is what appears in some cargo loan events._** Refurbished Mosin Nagant Crate: The actual good mosin nagants. There are 6 of them. But they don't come with spare ammo. Hand them out to your techs! </details> #### New Crates - MEAT crate - Standard - Duct Spider crate - Standard - Giant Hostile Spider crate - Contraband - 50 sheets of Bamboo crate - Standard - A single sheet of bananium crate - Standard - Natural (drugs) fish bait - Standard - Dumpster with a corpse in it - Standard - Shocktrooper crate (Grenades) - Emag - Special Ops crate (Disguise) - Emag - Appears in some cargo loan events - Refurbished Mosin Nagant crate - Emag - Regal Condor construction journal (NULL_ENTRY) - Emag #### Changed Crates - Foam Force Pistols (cheaper) - Contraband - Russian Surplus Crate (less reliable, can't be bought by security console) - Contraband - WT-550 crate (more obtainable via personal accounts, thus incriminating, not armory locked) - Emag - WT-550 ammo (includes incendiary and AP) - Emag #### Crates that got moved, unchanged, into Imports - Foam Force Crate - Cosa Nostra Crate - Black Market LTSRBT - 'Contraband' Crate - Biker Gang Crate #### Not crate changes - You can print Surplus 7.62 (same as normal 7.62 but it sucks against armor) from hacked autolathes. - You can get WT-550 ammo from illegal tech. - Removes the redundant Brand New Mosin subtype - Fixes a potential exploit with jamming chance on Mosins. ## Why It's Good For The Game I just think some of the magic of Cargo getting their hands on obviously dangerous equipment and either hording it for themselves or attempting to pawn it off was lost in recent times. A lot of this 'black market' gear, however, suddenly became openly available to the crew anyway. For _free_. Contraband crates and mafia crates could be purchased via the Service budget. Security could just stock up en masse on mosins through their console. And one fairly unfortunate consequence of a few recent changes has made it nearly impossible to actually get illicit gear in the first place, even if you did go to the effort of getting the money for it. On top of this, most of cargo's goods are pretty safe purchases. There isn't much that would be considered 'actually a really bad idea to buy' other than maybe supermatter shards. I wouldn't mind there existing ways for someone to waste cargo's money while also causing them to have to clean up the mess. ## Changelog 🆑 balance: A significant overhaul of various illicit and dubiously legal goods and gadgets available via cargo. balance: Cargo now has an Import category for all non-departmental goods. (And black market goods) balance: Most contraband that already exists has been moved into Imports. adds: Includes several new imports of dubious quality. You get what you pay for. code: Removes the brand new mosin subtype as it is now defunct. fix: Fixes potentially exploitative code in the jamming proc. Cleans up that code while I'm at it. /🆑 --------- Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com> |
||
|
tattle
|
57e88e6091 |
Crafting fireaxe cabinets, mech removal cabinets, and mirrors (#72856)
## About The Pull Request Breaking down #72371 because it's... unreasonably large. So this PR splits the crafting recipe file, and adds 3 new recipes for fireaxe cabinets, mech removal cabinets, and mirrors. ## Why It's Good For The Game Wallening compliance, and more of me on my shit breaking down long files. ## Changelog 🆑 Tattle qol: fireaxe cabinets, mech removal cabinets, and mirrors can now all be crafted /🆑 Co-authored-by: tattle <article.disaster@gmail.com> |
