mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +01:00
docker-container
94
Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
 explosivekittyandGitHub
|
7caf78dd25 |
Lets you put nodrop items from uplink glue on and into evidence bags and use it on other people (#5400)
## About The Pull Request Lets you equip items that you used glue on, that's how it worked before tg made it such you cant equip nodrop items, put them into evidence bags so you can pick them up without getting them attached to your hands and also make stuff that other people have equipped nodrop for them to be sprayed with acid if they want to get rid of that thing ## Why It's Good For The Game You no longer have to drag nodrop items to sec, you can just put them in the bags now(if you didn't pick it up in the process) and let's you equip stuff if you applied nodrop before equipping it because that's how it was before tg randomly fixed equipping nodrop items. also gluing bombs and other stuff to people could be funny i think ## Proof Of Testing <details> <summary>Screenshots/Videos</summary> <img width="127" height="240" alt="screen1" src="https://github.com/user-attachments/assets/7ee25f7b-5cbc-42b8-8244-5c17b736a9ee" /> the item selection menu </details> ## Changelog 🆑 add: You can put superglued items into evidence bags fix: You can equip superglued items again like you could before add: You can apply superglue to other people stuff /🆑 |
||
|
|
864fcbef95 |
Greyscale Robotic Limbs + Other Stuff (Nova Port) (#5338)
## About The Pull Request Title. Ports https://github.com/NovaSector/NovaSector/pull/7015 from Nova Sector. ## Why It's Good For The Game Customisation good. Enables creation of robotic versions of some species. ## Proof Of Testing Runs on my machine. Fixed up code with help from Artur and Waterpig (thanks). Organs in robotic torso enabled via augs+ get EMP'd as normal, seems to have no issues. <details> <summary>Screenshots/Videos</summary> <img width="636" height="521" alt="image" src="https://github.com/user-attachments/assets/0c088011-954c-4355-8d86-2f86e38e0357" /> <img width="1867" height="1117" alt="image" src="https://github.com/user-attachments/assets/eddbf9a3-f543-4b20-9363-806ef8bf2f11" /> </details> ## Changelog 🆑 add: Robotic type body parts for the more unique species sprites. Akula, Anthro, Lizard, Moth, Vox, Xenohybrid and Teshari. Please note these are moreso intended for making non-standard synths, as they are identical to the non-robotic versions visually. add: Peg limbs to augs+ add: Default chassis Synth sprites for augs+ image: added E3N sprites for augs+ code: added handling for the new greyscale robotic limbs /🆑 --------- Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com> |
||
|
xPokee
|
312085b95c | Grah | ||
|
xPokee
|
7527fbbeef | Compiling fixes | ||
|
Roxy
|
ebcce8d3fb | Fixes for #91029 | ||
|
RoxyandGitHub
|
5020cec410 |
Fix define sanity linter failures (#3209)
Fix all of the define sanity failures, either by adding an `#undef` where needed or moving them to a file in `code/__DEFINES`  |
||
|
Majkl-J
|
831afcfecc | embed_data -> embedding | ||
|
Majkl-J
|
06fafcc5f1 | Infinite is gone | ||
|
Majkl-J
|
225199e26b | Moves all the organcode down to obj/item/organ | ||
|
WaterpigandGitHub
|
ea02989f38 |
[SKYRAT CLEANUP] Removes / updates all bubber comments in the skyrat modular file as we are no longer their subject (#2330)
## About The Pull Request "I'm going to extend my break" - Me, 2 days ago "Hey I should start cleaning up the Skyrat modular folder" - Me, Today I yet again fall victim to my own hubris Left out some BUBBER TODOs, feel free to do these if you find them manageable ## Why It's Good For The Game We made some old mistakes with some edits (Like commenting out ruins instead of making them unpickable for the ruin system) (This I fixed, admins can now bus them in!) We also made a lot of edits to Skyrat code, a lot of which can be cleanly merged into their code now ## Proof Of Testing If it compiles, it works. Unlike my modularization PR from a year ago this is less fuckupable ## Changelog N/A, not player facing |
||
|
WaterpigandGitHub
|
b8f00860e4 |
Afterattack fixes (#2350)
## About The Pull Request See name, I'm actually going through with it and doing it. ## Why It's Good For The Game Fixes broken item interactions closes #2253 closes #2204 ## Proof Of Testing Worked on my device (So far) ## Changelog 🆑 fix: Phystool and Physgun work correctly again fix: Clockcult slabs can examine again fix: Compostbin is now handled correctly fix: Robohand checks for robohand again /🆑 |
||
|
Majkl-J
|
ae0b926948 | Holy lord no more please | ||
|
StrangeWeirdKitten
|
132f9363e4 |
Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into fuck-fuck-fuck
# Conflicts: # _maps/map_files/Birdshot/birdshot.dmm # _maps/map_files/NorthStar/north_star.dmm # _maps/map_files/VoidRaptor/VoidRaptor.dmm # code/datums/status_effects/debuffs/debuffs.dm # code/game/objects/items/devices/scanners/health_analyzer.dm # code/modules/cargo/packs/imports.dm # html/changelogs/archive/2024-07.yml |
||
|
|
1a492f1342 |
[MIRROR] Updates Strong-Arm implants to be cooldown based, deal entirely lethal damage (but more of it) (#29035)
* Updates Strong-Arm implants to be cooldown based, deal entirely lethal damage (but more of it) (#85012) ## About The Pull Request Strong-Arm implants utilize a five second cooldown between activation (this is per implant, not for both). As a result, the implant does a larger chunk of damage in one blow. It does not do stamina damage anymore. If you strike a mob with either the MOB_BEAST or MOB_SPECIAL biotypes, you inflict additional damage (40 extra). You can fit both a toolset implant and a muscle implant into the same arm. ## Why It's Good For The Game Strong-arms were really weird implants in that they were not locked behind any research progression, but instead could be purchased from cargo. However, they were still not exactly amazing to have, so they only really get purchased by bored medical doctors, since the implant was a medical departmental order option (for some reason). I tried giving them a little extra oomph a while ago, but I never felt like they were in a particularly good space even after that update. Borrowing some ideas from an older PR, I've introduced a cooldown to allow for them to work alongside other unarmed features, but still not allow them to stack with other effects. It makes them exceptionally good as opening attacks, but not to the point of being intrusive. They were also a method of infinite stamina damage, so that has been resolved as well. The mob bonus damage makes them a little fun option for miners, really, that's why I added it. I thought it would be a cute feature, and maybe incentivize a few to get augmented. I don't think they will, since augments aren't super useful for miners, but still. The pairing with toolsets is because they're not quite as useful generally as the toolsets, and since they are a weaker arm implant in the progression, I don't feel it is too extreme to have both, because overall most people will gravitate towards toolsets if they had to choose. ## Changelog 🆑 balance: Strong-arm implants go on cooldown when activated, but deal more overall lethal damage on a single blow. balance: The strong-arm implant does additional damage to fauna and some other dangerous mobs. qol: You can pair toolset arm implants with the strong-arm implants. /🆑 --------- Co-authored-by: Jacquerel <hnevard@ gmail.com> * Updates Strong-Arm implants to be cooldown based, deal entirely lethal damage (but more of it) * fix modular --------- Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Co-authored-by: Jacquerel <hnevard@ gmail.com> Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> |
||
|
Waterpig
|
a3b79bb3b3 | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2407c | ||
|
|
d1aa5f8da1 |
Fixing afterattack issues. (#28822)
* afterattack is dead, aughhhh * Update hyposprays_II.dm * fix stuff * fix stuff2 * Update robot_upgrade.dm * fix stuff3 --------- Co-authored-by: Fluffles <piecopresident@gmail.com> |
||
|
Waterpig
|
7cb3b3f472 | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-24-07b | ||
|
|
f4e244fb49 |
[MIRROR] Refactors embedding to use datums instead of storing data in bespoke elements (#28699)
* Refactors embedding to use datums instead of storing data in bespoke elements (#84599) ## About The Pull Request This refactors embedding elements to make them use singleton datums (similarly to armor) instead being bespoke and creating a new element every time armor values are supposed to be adjusted. Default values have been removed from defines due to now being declared in base class itself. Additionally fixes vending machines and tackling gloves setting generated shards (which they instantly embed into their victim) embed properties to null after running the embedding code, despite said shards having non-null embedding values by default, making them not be able to embed into anyone else, also potentially breaking the pain/jostling code if they somehow get updated. ## Why It's Good For The Game Current embedding system is an unnecessarily complicated mess as bespoke elements are hard to work with, and creating a new element every time you change values is hacky at best. This change should make it easier to read and work with. ## Changelog 🆑 fix: Fixed glass shards generated from falling vending machines or tackling windows not being able to embed into anyone. refactor: Refactored embedding code to use datums instead of bespoke elements and ugly associated lists. /🆑 * Refactors embedding to use datums instead of storing data in bespoke elements * modular fixes * fix c14 * paint -> pain ugggh --------- Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com> Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> |
||
|
Waterpig
|
004e466cea | Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406b | ||
|
|
24151d1228 |
[MIRROR] Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from GLOB to a datasystem (#27561)
* Moves "sprite accessories" (e.g. Hair, Undergarments, Mutant Bits) from `GLOB` to a datasystem * Merge branch 'master' of https://github.com/tgstation/tgstation * Moves everything I can think of to the subsystem * Seems to be working fine now * makes it compile --------- Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Waterpig <wtryoutube@seznam.cz> |
||
|
nevimer
|
45e52eb774 |
Merge remote-tracking branch 'skrat/master' into new-bubbermaster
# Conflicts: # _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm # _maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm # _maps/map_files/Birdshot/birdshot.dmm # _maps/map_files/Deltastation/DeltaStation2.dmm # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/map_files/MetaStation/MetaStation.dmm # _maps/map_files/NorthStar/north_star.dmm # _maps/map_files/VoidRaptor/VoidRaptor.dmm # _maps/map_files/tramstation/tramstation.dmm # _maps/shuttles/pirate_ex_interdyne.dmm # code/__DEFINES/mobs.dm # code/__HELPERS/~skyrat_helpers/is_helpers.dm # code/datums/mood.dm # code/game/objects/effects/spawners/random/random.dm # code/modules/admin/verbs/adminhelp.dm # code/modules/clothing/head/jobs.dm # code/modules/mob/living/brain/brain_say.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png # code/modules/uplink/uplink_items/job.dm # config/lavaruinblacklist.txt # icons/mob/actions/actions_changeling.dmi # icons/mob/clothing/mask.dmi # icons/obj/mining.dmi # modular_skyrat/master_files/code/modules/client/preferences/headshot.dm # modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm # modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm # modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi # modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi # modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/metal_overlays.dmi # modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm # modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm # modular_skyrat/modules/hyposprays/code/hypospray_kits.dm # strings/traumas.json # tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/headshot.tsx |
||
|
WaterpigandGitHub
|
7cee7b6a5b |
Replaces deciseconds in do_after and add_timer in modular files with SECONDS (#27335)
* Bam * meep |
||
|
nevimer
|
9102c49c27 |
Squashed commit of the following:
commit 2abf1c919f05b34cfee752677431a864bc22f12e Merge: c9636f2bea7b |
||
|
|
28abe4d246 |
More nova ports (#26018)
* https://github.com/NovaSector/NovaSector/pull/297 * https://github.com/NovaSector/NovaSector/pull/277 * Space Ruin - Space hotel Pipenet, Powernet and disposal fixes (#253) * stinky * 1 * Updates status (#270) * Updates status * Update world.dm * https://github.com/NovaSector/NovaSector/pull/130 * fex --------- Co-authored-by: Zergspower <Griffinj88@yahoo.com> Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com> |
||
|
|
3658c80e57 |
[MIRROR] Explodes device.dmi [MDB IGNORE] (#25523)
* Explodes device.dmi * Demodularize these * Update traitordevices.dm * Update traitordevices.dm * Modularizes hypnotic flash * Modular dmi repath * Modular dmi repath --------- Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
|
3a400ebc5d |
[MIRROR] Falling down a z-level while standing up can (occasionally) break your legs. Felinids will now always land on their feet (for better or for worse). [MDB IGNORE] (#25407)
* Falling down a z-level while standing up can (occasionally) break your legs. Felinids will now always land on their feet (for better or for worse). * This whole proc needs to be overridden?? * Update living.dm * Delete human.dm --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
lilaandGitHub
|
2493e25677 |
Turns the fake announcement device into a custom announcement device (#25092)
* Turns the fake announcement device into a custom announcement device * dont qdel when out of uses so a player can request more * reviews thank you! |
||
|
|
8d9a35a4fe |
Adds our traits define file to the linter steps (#25134)
* Adds our traits define file to the linter steps * Update check.py * Adds our traits define file to the linter steps * Update check.py * Update ci_suite.yml * Update declarations.dm * Modular traits * Update _traits.dm * Update _traits.dm * Oops * Yes we do * Update sources.dm * Update other_reagents.dm * oOPS * Update for changeling sting pr * Update for changeling sting pr * Update declarations.dm * Oopsies * Add to admin tooling * Update _traits.dm * Apply suggestions from code review Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> * Update code/__DEFINES/~skyrat_defines/traits/declarations.dm --------- Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> |
||
|
|
b237afa316 |
[MIRROR] Mob attackedby / check_block refactor, plus some minor cleanup of attack_x procs [MDB IGNORE] (#25079)
* Mob `attackedby` / `check_block` refactor, plus some minor cleanup of `attack_x` procs * Fix the race condition * Modular * Ooops --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
lilaandGitHub
|
8daa3fcd0d |
[Modular] Adds Syndie Rebar Crossbow, Hook Shotgun, fixes the recharger kit (#24902)
* opfor fix and adds * review * removes unusable cult melees * fixes a magazine being miss-typed |
||
|
|
42d245a4be |
[MIRROR] Basic Guardians/Holoparasites [MDB IGNORE] (#24921)
* Basic Guardians/Holoparasites (#79473) ## About The Pull Request Fixes #79485 Fixes #77552 Converts Guardians (aka Holoparasites) into Basic Mobs. Changes a bunch of their behaviours into actions or components which we can reuse. Replaces some verbs it would give to you and hide in the status panel with action buttons that you may be able to find more quickly. They _**should**_ work basically like they did before but a bit smoother. It is not unlikely that I made some changes by accident or just by changing framework though. My one creative touch was adding random name suggestions. The Wizard federation have a convention of naming their arcane spirit guardians by combining a colour and a major arcana of the tarot. The Syndicate of course won't truck with any of that mystical claptrap and for their codenames use the much more sensible construction of a colour and a gamepiece. This lets you be randomly assigned such creative names as "Sparkling Hermit", "Bloody Queen", "Blue World", or "Purple Diamond". You can of course still ignore this entirely and type "The Brapmaster" into the box if so desired. I made _one_ other intentional change, which is to swap to Mothblocks' nice leash component instead of instantly teleporting guardians back to you when they are pulled out of the edge of their range. They should now be "dragged" along behind you until they can't path, at which point they will teleport. This should make the experience a bit less disorienting, you have the recall button if you _want_ to instantly catch up. This is unfortunately a bumper-sized PR because it did not seem plausible to not do all of it at once, but I can make a project branch for atomisation if people think this is too much of a pain in the ass to review. Other changes: - Some refactoring to how the charge action works so I could individually override "what you can hit" and "what happens when you hit" instead of those being the same proc - Lightning Guardian damage chain is now a component - Explosive Guardian explosive trap is now a component - Added even more arguments to the Healing Touch component to allow it to heal tox/oxy damage and require a specific click modifier - Life Link component which implements the Guardian behaviour of using another mob as your health bar - Moved some stuff about deciding what guardians look and are described like into a theming datum - Added a generic proc which can return whether your mob is meant to apply some kind of damage multiplier to a certain damage type. It's not perfect because I couldn't figure out how ot cram limb modifiers in there, which is where most of it is on carbons. Oh well. - Riders of vehicles now inherit all movement traits of those vehicles, so riding a charging holoparasite will let you cross chasms. Also works if you piggyback someone with wings, probably. ## Changelog 🆑 refactor: Guardians/Powerminers/Holoparasites now use the basic mob framework. Please report any unexpected changes or behaviour. qol: The verbs used to communicate with, recall, or banish your Guardian are now action buttons. balance: If (as a Guardian) your host moves slightly out of range you will now be dragged back into range if possible, rather than being instantly teleported to them. balance: Protectors now have a shorter leash range rather than a longer one, in order to more easily take advantage of their ability to drag their charge out of danger. balance: Ranged Guardians can now hold down the mouse button to fire automatically. balance: People riding vehicles or other mobs now inherit all of their movement traits, so riding a flying mob (or vehicle, if we have any of those) will allow you to cross chasms and lava safely. /🆑 --------- Co-authored-by: san7890 <the@ san7890.com> * Basic Guardians/Holoparasites * Modular --------- Co-authored-by: Jacquerel <hnevard@gmail.com> Co-authored-by: san7890 <the@ san7890.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
lilaandGitHub
|
4ea80a9b92 |
OPFOR Items Reloaded (#24231)
* init * changes akula clothing category to a broader piracy clothing category * please commit this one too * some sorting * more cleaning * dme fix * edits edits edits * adds and edits * finishing the outfit selection * modsuits * mod modules * more stuff! * implants * (many) more edits * all lists filled * strange autosurgeon * bugfix * bugs * arm autosurgeon fix * review * y * nitpicks * fixes theft kits |
||
|
|
c056f4dac9 |
[MIRROR] Nanotrasen basic mobs. [MDB IGNORE] (#24573)
* Nanotrasen basic mobs. (#78917) ## About The Pull Request First and foremost, converts all Nanotrasen simplemobs into basic mobs. To avoid messy and redundant code, or god forbid, making Nanotrasen mobs a subtype of Syndicate ones, I've made Syndicate, Russian, and Nanotrasen mobs all share a unified "Trooper" parent. This should have no effect on their behaviors, but makes things much easier to extend further in the future. While most of this PR is pretty cut-and-dry, I've done a couple notable things. For one, all types of ranged trooper will now avoid friendly fire, instead of shooting their friends in the back. Even the Russians have trigger discipline. I've also created a new AI subtree that allows mobs to call for reinforcements. I've hopefully made this easy to extend, but the existing version works as follows: - A mob with this subtree that gains a target that is also a mob will call out to all mobs within 15 tiles. - If they share a faction, mobs receiving the call will have the target added to their retaliate list, and have a new key set targeting the calling mob. - If they have the correct subtree in their AI controller, called-to mobs will then run over to help out. Sadly, this behavior is currently used only by a few completely unused Nanotrasen mobs, so in practice it will not yet be seen. Finally, I've fixed a minor issue where melee Russian mobs punch people to death despite holding a knife. They now use the proper effects for stabbing instead of punching. ## Why It's Good For The Game Removes 8 more simple animals from the list. As said above, making all "trooper" type mobs share a common parent cuts down on code reuse, ensures consistency of behavior, and makes it much easier to add new troopers not affiliated with these groups. I expect that I'll make pirates share this same parent next. The new "reinforcements" behavior, though extremely powerful, opens up exciting new opportunities in the future. There aren't many existing behaviors that allow basic mobs to work _together_ in interesting ways, and I think adding some enemy teamwork could be fun. ## Changelog 🆑 refactor: Hostile Nanotrasen mobs now use the basic mob framework. This should make them a little smarter and more dangerous. Please report any bugs. fix: Russian mobs will now actually use those knives they're holding. /🆑 * Nanotrasen basic mobs. * Modular --------- Co-authored-by: lizardqueenlexi <105025397+lizardqueenlexi@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
BloopandGitHub
|
c5d494d318 |
[MODULAR] Fixes an old path that never got updated (#23764)
Fixes an old path that never got updated |
||
|
|
30d57e41dc |
[MIRROR] Replaces Camera bug with Camera tablet app [MDB IGNORE] (#23275)
* Replaces Camera bug with Camera tablet app * Modular changes --------- Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
|
39bdedc029 |
[MIRROR] Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs [MDB IGNORE] (#22680)
* Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs (#76973) ## About The Pull Request As the title says, mag type has been split into two variable that do different things: Accepted magazine type handles what magazines that gun will accept, type and any subtypes. If spawn magazine type isnt defined, then it will be made equal to accepted magazine type to prevent having to double define magazines on every gun ever. Spawn magazine type is separate from accepted magazine type, spawn magazine type is what magazine the gun will actually spawn with. This exists because there are a few weapons which are made to spawn with special magazines, that can't use normal magazines anymore. For example, the riot dart pre-loaded donk soft pistol can only ever be reloaded with the riot subtype of donk soft magazines at the moment. This isn't typically something people notice because new magazines are usually not a thing people come by with these specific weapons, but its a problem I noticed while coding some weapons. ## Why It's Good For The Game In short, certain weapons (mostly donksoft weapons, but there's a single traitor pistol subtype that spawns with fire ammo) will no longer be limited to the exact subtype of magazine they spawned with, allowing them to use the normal versions of those magazines as well. ## Changelog 🆑 refactor: The mag_type variable on guns has been split between accepted_magazine_type and spawn_magazine_type, allowing weapons to safely spawn with subtypes of their normal magazines without breaking the weapon fix: Several weapons that spawned with special magazines, the riot dart pre-loaded donk pistol for example, will now be able to accept normal donksoft magazines that don't spawn loaded with riot darts. /🆑 * Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs * merge conflict * merge conflict continued --------- Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com> Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com> |
||
|
BloopandGitHub
|
c17e72f710 |
[MODULAR] Fixes all the bugs with hair (#22543)
Fixes all the bugs with hair, fixes slimes not being transparent |
||
|
ZergspowerandGitHub
|
9371340945 |
[Manual mirror fix] Fixes and includes clothing_under_armor_subtype_check.dm in the unit tests. (#22411)
* Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-merge-76184 * Akula's are angry apparently * Video Search is a liar * wetsuit pain |
||
|
|
9b32596813 |
is this hell? it sure feels like it. - categorizes modular stuff in the techfabs (#21830)
categories :) Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com> |
||
|
|
8314290832 |
[MIRROR] Experimental Mineral Balance PR. [MDB IGNORE] (#21784)
* Experimental Mineral Balance PR. (#75437) Good morning fokes, this PR is going to attempt to tweak around some of the values of mineral costs in-game in the hopes of making the mineral economy more engaging to the base gameplay loop, in the hopes that by making it more self-realized, it would allow for better integration with the rest of the gameplay loop as well as so that it doesn't completely overshadow the credit economy. That said, **this pr only makes changes to mined and station minerals**. So, the base change is as follows: items with designated costs of minerals below 1000 minerals, as designated in #75052 as `SMALL_MATERIAL_AMOUNT`, have been left alone. Any item above 1000 or 2000, from `HALF_SHEET_MATERIAL_AMOUNT` and `SHEET_MATERIAL_AMOUNT` have been adjusted, as sheets will now contain **100 minerals each**. For example, if an object costed 4000 iron, 1000 glass, and 500 diamond with the old numbers, with the changes to these defines, that item would cost 2000 iron, 500 glass, and 500 diamond. * Experimental Mineral Balance PR. * materials * more mats * more mats * Update medical_designs.dm --------- Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> |
||
|
BloopandGitHub
|
fa4f6d9188 |
[MODULAR] Fixes fake traitor captain announcements (#21314)
Fixes fake traitor captain announcements |
||
|
PaxilmaniacandGitHub
|
3fb3c7add2 |
Gun code override unshittening part like, two by this point (#18957)
* this code is so fucking funny it makes me want to merge w/o looking * safety component stuff * safeties should be finished * I loooove safety component * I swear that's all for gun safety * manufacturer component * cant forget this * this is so awful * 1100 line long gun file * ok it actually compiles now * that should not be an addition of any sort * these defines should not be used anymore * why?? the fuck??? are there var edited fire modes on black mesa????? * how did that even happen * maybe ci will shut up now * oh man so many guns are lacking autofire now * probably fixes safety toggling * that should reference the gun not the component * that should probably return * makes it replicate current behavior, defaults safeties to being ON * and that is all i have to say about that * its automagically |
||
|
|
406b6870bd |
[MIRROR] adds atmospheric gloves, small resprite of firefighter gear, repaths stupid glove paths [MDB IGNORE] (#18785)
* adds atmospheric gloves, small resprite of firefighter gear, repaths stupid glove paths (#72736) repaths a lot of gloves off /color because they were incredibly stupid firefighter gear has gotten an update (it doesnt cover hands anymore though, you need something else) firefighter helmets no longer hide your mask or glasses  fixed engine goggles starting with darkness vision to the atmos lockers adds atmospheric gloves, a pair of thick (chunky fingers) gloves that are fireproof and fire protective, slightly shock resistant and let you fireman carry people faster. atmospheric firefighter helmets now are a subtype of welding hardhats, you can enable a welding visor. welding hardhats change mode with right click instead of altclick im not a good spriter but i think this resprite makes them fit nicer with other engi equipment lets me firefighter rp 🆑 add: Atmospheric Gloves, thick gloves that are fully fireproof and fire protective and let you fireman carry people faster. fix: fixes engine goggles starting with darkness vision qol: firefighter helmets can now enable a welding visor qol: welding hardhats change mode with right click instead of altclick balance: firesuits no longer protect your hands /🆑 * Makes shit compile * Updates the digi and snouted stuff to match the new sprites (thanks Halcyon!) * Fixes a whole ton more issues that popped up --------- Co-authored-by: Fikou <23585223+Fikou@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> |
||
|
|
011fefdd81 |
[MIRROR] Refactors armor into dedicated subtypes [MDB IGNORE] (#18291)
* Refactors armor into dedicated subtypes * start * most tg things * pain (#18584) * shit * non-mod changes * compile Co-authored-by: John Doe <gamingskeleton3@gmail.com> * #18291 * compile fix * ??? Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> |
||
|
|
bccf824a6c |
[MIRROR] Turned most syndicate mobs (+ viscerators) into basicmobs [MDB IGNORE] (#18270)
* Turned most syndicate mobs (+ viscerators) into basicmobs (#71871) ## About The Pull Request Turns the syndicate simpleanimals into basicmobs: (+ stormtrooper, + space variants) Base Mob, Knife syndies, pistol syndies, SMG syndies,shotgun syndies, viscerators also changes some instances of the simple_animal path into the basicmob ones Removes civillian syndicates which were useless and also completely unused Also removes mech pilots:  Also, makes the basic targetting datums health check configurable basic attack behavior can now fire in bursts https://user-images.githubusercontent.com/70376633/206766607-cf2e3659-0c5e-4117-9af7-e573e35bdf80.mp4 https://user-images.githubusercontent.com/70376633/206766630-15b4469f-68be-44c7-9394-1f2b6fe07811.mp4 https://user-images.githubusercontent.com/70376633/206766613-69b42457-a03b-449d-a1b8-a5aa556c76e5.mp4 https://user-images.githubusercontent.com/70376633/206766619-5560a178-8d2f-4b22-adf1-22ace6f63a51.mp4 https://user-images.githubusercontent.com/70376633/206766627-e671d064-fd9e-4204-b823-aa2e07f7fc26.mp4 https://user-images.githubusercontent.com/70376633/206766633-108c1574-3554-4bc1-a9ac-8faed0ec4062.mp4 ## Why It's Good For The Game simpleanimal stinks basic mob good syndicate AI was really bad to begin with so here we are ## Changelog 🆑 code: Turned most syndicate mobs into basicmobs, making their AI better and (possibly) more deadlier! del: Removed syndicate mech pilots and syndicate civvies /🆑 Co-authored-by: kawoppi <94711066+kawoppi@ users.noreply.github.com> * Turned most syndicate mobs (+ viscerators) into basicmobs * map * code * Update syndibase.dmm Co-authored-by: jimmyl <70376633+mc-oofert@users.noreply.github.com> Co-authored-by: kawoppi <94711066+kawoppi@ users.noreply.github.com> Co-authored-by: John Doe <gamingskeleton3@gmail.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Tastyfish <crazychris32@gmail.com> |
||
|
|
5c6c91144c |
[MIRROR] Changes the missing food icon test to cover ALL /obj's [MDB IGNORE] (#18139)
* Changes the missing food icon test to cover ALL /obj's * Update implant.dm * Hopefully fixes all the failing integration tests! * Fixes more missing icons * Even more icon fixes * Hopefully that was all of them * Okay now SURELY that's all of them * I'm tired of this shit man * Hopefully that's all, for real this time! Co-authored-by: ShizCalev <ShizCalev@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com> Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com> |
||
|
|
2b800b9a23 |
[MIRROR] Removes tablets (not PDAs) entirely. [MDB IGNORE] (#17880)
* Removes tablets (not PDAs) entirely. * contractor changes * map changes * Update assistant.dm * conflicts Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com> Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com> |
||
|
|
03d42cb507 |
[MIRROR] Unit Tests Overstuffing Reagent Containers with more than their defined volume [MDB IGNORE] (#17578)
* Unit Tests Overstuffing Reagent Containers with more than their defined volume (#71327) ## About The Pull Request Simple Unit Test that seeks to ensure that we don't put too much of a reagent in a container when the container doesn't have enough volume to accept all of it. Nothing bad would happen, but it's just silly really. I also fixed all of the instances that this was broken in. ## Why It's Good For The Game Prevents buggy regressions, such as those found in #71206. ```txt [2022-11-18 03:32:30.736] FAILURE #1: Canned Laughter (/obj/item/reagent_containers/cup/soda_cans/canned_laughter) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 - FAILURE #2: T-Borg's tonic water (/obj/item/reagent_containers/cup/soda_cans/tonic) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 - FAILURE #3: The soda water (/obj/item/reagent_containers/cup/soda_cans/sodawater) has 50 units of reagents, but only 30 units of space. at code/modules/unit_tests/container_sanity.dm:21 ``` ## Changelog 🆑 fix: Canned Laughter, T-Borg's Tonic Water, and Soda Water cans should all come with the expected marketed 50 units of goodness, rather than cheaping out on materials for only 30 units of can volume. /🆑 Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> * Unit Tests Overstuffing Reagent Containers with more than their defined volume * fix SR containers Co-authored-by: san7890 <the@san7890.com> Co-authored-by: Mothblocks <35135081+Mothblocks@ users.noreply.github.com> Co-authored-by: tastyfish <crazychris32@gmail.com> |
||
|
|
07071eef48 |
[BASICALLY MODULAR] Runs grep checks on modular_skyrat and fixes all issues (#17469)
* Runs grep checks on modular_skyrat and fixes all issues * feather * Update modular_skyrat/modules/verbs/code/say.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> * loadout descs * fixes Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> |
||
|
TastyfishandGitHub
|
49827c4dd7 |
[MODULAR] Fixes more bad clothing variation overrides (#17432)
Fixes more bad clothing variation overrides |
