Adds swabs and an Emag inventory to the biogenerator #39037
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
PJBot
added
S: Needs Review
|
I feel like 1 swab should be a lot cheaper than 15 biomass. Maybe I'm just a unrobust botanist but I feel like it would be more fun if they only cost 3, or even less. But yeah generating swabs is really cool. |
|
Having it be a more dangerous and exclusive product than mutagen would keep it more in line with other emag inventories. |
|
botanists get mutagen more than tap water why limit it to emagging |
|
15 biomass for 1 swab is ludicrous. They should cost 1 to 3 at most. |
yeah fair enough, I lowered it to 2.
The other bio machine has carp cubes and stuff in its emag. I guess this one could too? The mutagen in the emag inventory is really just trying to make prison botany more interesting. |
VerinSenpai
added
P3: Standard
PJBot
added
the
S: Approved
beck-thompson
approved these changes
Oct 12, 2025
Jellvisk
added a commit
to vermist-sector/vermist-dust
that referenced
this pull request
Oct 20, 2025
* Let gorillas pull things (space-wizards#40700) gorilla pull gorilla bring gorilla Co-authored-by: Jessica M <[email protected]> * Automatic changelog update * Golden Plunger General Fixes & Tweaks (space-wizards#40619) * Plung Plunges * C# solution replaced with yaml solution, made sprite in-line with normal plunger, & alt click works now * Update Resources/Textures/Objects/Specific/Janitorial/janitorial_cart.rsi/meta.json Co-authored-by: āda <[email protected]> * Chameleon Tag Added * a TODO --------- Co-authored-by: āda <[email protected]> * Change Discord round restart text (space-wizards#40584) * discord-notif * grammar * Give mimes their french bread back (space-wizards#40601) * add the nutri-batard * i missed this file smh * add the proper accenting to "bâtard" * Automatic changelog update * Cleanup material_doors.yml (space-wizards#40666) cleanup Co-authored-by: iaada <[email protected]> * (Cleanup) Fix logger obsolete warnings (space-wizards#40553) * Switched obsolete logger usages to use Sawmill Fix the majority of obsolete logger usages outside the engine code. * Fix injection in ChatManager and revert BuildMech changes * Removed extra manual injection * Reduced extra static injection and reverted changes to CommandButton as it needs engine changes. * Removed two more cases of double injection and an extra using * Reverted changes for Inventory Display * Moved sawmill setup outside constructor in Table to resolve test failure * changes the min and max variables in the TargetTemperature clamp to t… (space-wizards#40453) changes the min and max variables in the TargetTemperature clamp to the space heater min and max temperatures * Automatic changelog update * Move BrainSystem and necessary components to Shared (space-wizards#40499) * yowza * Update Content.Shared/Body/Systems/BrainSystem.cs Co-authored-by: slarticodefast <[email protected]> * Update Content.Shared/Ghost/GhostOnMoveComponent.cs Co-authored-by: slarticodefast <[email protected]> * Update BrainSystem.cs * Update Content.Shared/Body/Systems/BrainSystem.cs * Update Content.Shared/Body/Systems/BrainSystem.cs * Update Content.Shared/Body/Systems/BrainSystem.cs --------- Co-authored-by: slarticodefast <[email protected]> * Vox burn into fried chicken (space-wizards#40115) * Sir, this is a KFC. * the curse of multi-parenting * 11 herbs and spices of intrigue * Automatic changelog update * Fix post-mapinit NPC exception (space-wizards#40244) Ensure `NPCBlackboard.Owner` is set during startup * Head of Security's Energy Magnum (and Warden's Energy Shotgun) (space-wizards#40615) * Energy magnum and projectile protos, locker fills, and traitor objective updates. * Fix objective * Objective and .rsi tweaks * Rewrite item description. * Remove energy shotgun self charging and decrease magnum disabler cost. * Bring magnum disabler fire cost in line with regular disabler. * Bunch of sprite improvements including charge status visuals. * whoops * Minor sprite edit for clarity --------- Co-authored-by: SlamBamActionman <[email protected]> * Standardize state names in drinks yml (space-wizards#40316) * drinks_base * drinks_special * drinks_fun * drinks_cans - the holy minus diff * bottles_glass and metamorphic * mugs * Solar's Best Hot Drinks * misc drinks_cups * slight addition to base * lint fix * metamorphic glass --------- Co-authored-by: iaada <[email protected]> * Automatic changelog update * Add log statement for missing guidebook proto (space-wizards#40380) * Add log statement for missing guidebook proto Also removed an unused parameter. * Update Content.Client/Guidebook/DocumentParsingManager.cs --------- Co-authored-by: slarticodefast <[email protected]> * Unpredict MagnetPickupSystem.cs (space-wizards#39988) * unpredict * predict * Cancer Mice Ghostrole Info (space-wizards#40102) * Adjusted Cancer Mouse Ghost Info * Updated Smite Snail * Added ghostrole info * Remove snail info * Update space.yml * Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl * Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Biosuit Suit Slots (space-wizards#39888) * Added Gastank Storage to Biosuits, Weapon/Gas to Sec Biosuit * Fixed Error * Sec Suit no longer Child to General Biosuit * Update cargo_security.yml * Automatic changelog update * New HTN precondition: has status effect (space-wizards#39781) * Create HasStatusEffectPrecondition.cs * Update HasStatusEffectPrecondition.cs * ok now it works * Update HasStatusEffectPrecondition.cs * MRE wrappers / cotton nutri-bâtards are no longer twice as nutritious as nutribricks (space-wizards#40761) * Automatic changelog update * Added Vox Beak Types, New Markings, and Sprite Layering Fixes (space-wizards#40569) * Added more Vox customizations * Adds Vox Head Markings * Update meta.json * stray comma, woe be upon ye * added tiny pixel to visage left and right * Added eyeliner ftl * Removed duplicate FTL how the fuck did this happen * Added cheek marking * Made tip marking look a bit better * Fix eyeliner ID * ok whatever shut up build test. mean to me * changed underbelly to have more flat transparency * didnt like how it looked so i adjusted it * Adjusted base eyeliner color * Fixed inconsistency with nightling head tattoo * Updated V tattoo * Delete chest_v.png * fix yml ITS EVEN FUNNIER THE SECOND TIME * minor sprite fix * Update head.png * Re added stray pixel, added square cere beak * Added hooked beak --------- Co-authored-by: TrixxedHeart <[email protected]> * Automatic changelog update * Added the golden shaker (playtime reward for Bartenders) (space-wizards#40762) * Added a golden shaker (playtime reward for Bartenders) * Removed redundant icon line * Automatic changelog update * Change Energy Shotgun to fit as a Warden weapon (space-wizards#40757) * Initial commit * Fix toggle mode name and also miscalculated charge times oops * Automatic changelog update * Fix- Cobras killing adders (space-wizards#37424) * fixed * adds SimpleHostile to SpaceAdder (the stealth snake) * whoops i branched this off a branch not master This reverts commit fe15625. * Automatic changelog update * Cleanup warnings: CS0414, CS8524 (space-wizards#40776) * Cleanup * CS8524 * Clean up bucket.yml (space-wizards#40772) SMASH that bucket Co-authored-by: iaada <[email protected]> * Automatic changelog update * Slightly re-nerf zombification speed (space-wizards#37445) Initial Commit * Automatic changelog update * cleanup and reorganize belts.yml (space-wizards#40773) commit discipline? Never heard of it Co-authored-by: iaada <[email protected]> * Add disclaimer about AI generated content to Readme.md (space-wizards#39334) * Add disclaimer about AI generated content to Readme.md * Update README.md * rephrase * Fix the temperature gun not reflecting and going through windows (space-wizards#37581) * Fix Temp Gun * Fix mask, muzzle flash --------- Co-authored-by: SlamBamActionman <[email protected]> * Automatic changelog update * Fix: Allow energy shotgun lethal projectiles to hit holos (space-wizards#37920) BulletLaser opaque mask * Automatic changelog update * Added folders and clipboards to trinkets tab (space-wizards#39920) * Added folders to trinkets tab * Fixed loadout grouping * Added plastic clipboards to trinkets * Whoops, forgot to create BoxFolderPlasticClipboardThreePapers prototype * Added regular clipboards as trinkets (1 hour of command required) * Reduced folder bloat * Automatic changelog update * Fix wizard can teleport into the ATS wall (space-wizards#40755) Co-authored-by: opl <[email protected]> * Relic fixes and tweaks (space-wizards#40537) * Various adjustments * More accurate floors * Changes * This should be good * Logic * Automatic changelog update * Removed wardens enforcer from box (space-wizards#40785) box shotgun gone :dejected: * Automatic changelog update * Allow more energy projectiles to hit holo creatures (space-wizards#40782) * Allow more energy projectiles to hit holo creatures. * Disabler SMG * Automatic changelog update * Ungu sound adjustments (impstation#3547) * sound adjustments * ungu laugh back * Automatic changelog update * Wrapped Parcels can be labelled with Papers (space-wizards#40783) * labels * oop * Update Resources/Prototypes/Entities/Objects/Misc/parcel_wrap.yml * Automatic changelog update * Ungufix 1.5 (impstation#3549) lowered asphyx dmg --------- Co-authored-by: starlighthowls <[email protected]> * Automatic changelog update * Remove enforcer from fland (space-wizards#40786) * Automatic changelog update * Fix changeling blindness (space-wizards#40517) fix changeling blindness * Fix terminology (space-wizards#40792) c20r magazine description changed to "SMG" * Predict LungSystem (space-wizards#40729) * Initial edits of files Untested yet. I would like to make sure all is accounted for before moving the files. * trying my best * Revert "trying my best" This reverts commit 9aeece4. * Revert "Initial edits of files" This reverts commit 45c6e23. * an actual meal * Added networking to LungComponent.cs * removed duplicate using * moving GasRagents to SharedAtmosphereSystem.cs * Update Mind Shielding section in Space Law (space-wizards#40647) * Update Mind Shielding section in Space Law * Formatting * Add generic event listener for integration tests (space-wizards#40367) * Add generic event listener for integration tests * cleanup * assert that the entity has the component * comments & new overload * Change whitelist logic for parcel wrap (space-wizards#40800) * init * review * Add slowdown to nocturine, buff duration and minor delay reduction (space-wizards#40797) * Yawn * Remove yawning because it's kind of a nerf tbh * Remove newline * Begone, condition * Automatic changelog update * PRevent the forever sleep. (space-wizards#40366) * Fix * Rejuvenate --------- Co-authored-by: Princess Cheeseballs <[email protected]> * Automatic changelog update * Move Bulldog Drum to Emag (space-wizards#40790) * Move Bulldog Drum to Emag Bulldog drum removed from standard techfab Moved to emag listing * Update Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Fix masks with flash, eye, and damage protection working while being pulled down (space-wizards#40331) Fix * Add missing uranium glass locales (space-wizards#40809) * Migrate revenant and PAI shops to use ActionGrant instead of hardcoding them (space-wizards#40475) * add intrinsic store, replace revenant store with it. * migrate PAI and also move to shared where possible * fix typos and clean up... intrinisic * oops, hopefully fixes test * Move to StoreSystem and ActionGrant * documentation and remove thing * review --------- Co-authored-by: Jessica M <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Lootpool Tweaks Mail/Maints (space-wizards#39892) * Added Claymore to MaintWeaponTable * SyndieBusinessCard+InsulsTable * Added more nitrogen canisters to plasma (space-wizards#40794) * Automatic changelog update * Fix Officer's Handgun Objective (space-wizards#40811) This is like george orwell's book 1984 Co-authored-by: Princess Cheeseballs <[email protected]> * Automatic changelog update * Replaces D&D5e-based paladin lawset with PF2e-based laws (space-wizards#40343) * Replace D&D5e paladin laws with PF2e paladin laws * Truncated law 2 * Automatic changelog update * fix singulo generator triggering failsafe when field is obstructed (space-wizards#39593) fix singulo gen failsafe when field obstructed * Refactor Crayons to use shared charges system and autonetworking. Adds auto recharging crayon. (space-wizards#40575) * Added special crayon with infinite charges for borg usage. * Use battery system to manage charges. * Reverted extra changes * Set charge on init * removed init assignment * Added comments to crayoncomponent * tweaked comments * Working with the new charges component, but at what cost? * Remvoed extra field * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <[email protected]> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <[email protected]> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <[email protected]> * Apply suggestion from @slarticodefast Co-authored-by: slarticodefast <[email protected]> * Fix renamed variables and descriptions in comments * Variable naming, comment cleanup and autonetworking. * Fix for test case, modified on init * Cleaned up/merged charges logic * review --------- Co-authored-by: slarticodefast <[email protected]> * Packed: Replace duplicate security camera router with sci router (space-wizards#40819) On Packed: Replace duplicate security camera router with sci router Co-authored-by: opl <[email protected]> * Add variables to CluwneComponent, allowing for admeme customizing. Also localized two strings. (space-wizards#40466) * Add variables to cluwne component, update to the new style, add unremovable option to setoutfit. * not nullable, shorthand * Add comments, address reviews * why, was i drunk? * Apply suggestions from code review --------- Co-authored-by: Jessica M <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Packed: Fix brig Megaseed vending machine is locked (space-wizards#40821) Co-authored-by: opl <[email protected]> * Automatic changelog update * Packed: Add missing station beacons (space-wizards#40817) On Packed: Add missing station beacons Co-authored-by: opl <[email protected]> * Ninja Bomb Blacklisting: Map Updates (space-wizards#40727) Update Maps * Fix glassbox prototypes (space-wizards#40667) * Fix glassbox prototypes and its construction ghost exception * Oops * Ninja Bomb Blacklisting (space-wizards#40726) * Ninja Bombing moved to blacklist * Added blocker to "Solars" Solars is too generic for a named bombing target. * Change to AllEntityQuery More clear intent * Update migration.yml Add migration to 'null' for removed WarpPointBombing entity * Update NinjaConditionsSystem.cs Undo some tidying * Changed to tag Ninja blocking component is now a tag instead of a new component * Update NinjaConditionsSystem.cs detidying * Update NinjaConditionsSystem.cs Change to efficient enumerator * Move blacklist to component Moved blacklist to spidercharge component * Update migration.yml fixed component reference * Update migration.yml Fixes Saltern. Exo is more complicated. --------- Co-authored-by: ArtisticRoomba <[email protected]> * Automatic changelog update * add event to dna scrambling (space-wizards#39862) add event * Attempt to fix all unlocalized lines (space-wizards#40284) * missing-localization * cmd * fix: fixed patron page throwing exception due to unexpected patron tier in yaml * Revert "fix: fixed patron page throwing exception due to unexpected patron tier in yaml" This reverts commit 28458c7. * review and update * no cmd * fix * fix 99 --------- Co-authored-by: pa.pecherskij <[email protected]> * fixed medical cyborgs not getting movement sprites (space-wizards#39747) the fix * Mindrole trigger condition (space-wizards#40323) * mind role trigger condition * fix * nits --------- Co-authored-by: ArtisticRoomba <[email protected]> * Decouple power sink from tickrate (space-wizards#40789) * Fix typo in `BatterySystem.ChangeCharge`. * Decouple power sink behavior from tickrate. * Fix power sink's price per joule * Fix Error Logged in Graffana for SharedStaminaSystem (space-wizards#40764) * Added Appearance component to MobElementalBase * Added StunVisuals * Changed MobElementalBase to inherit from BaseMob and MobCombat * Fix linted error * Fix damage type * Apply suggestions from code review * Update Resources/Prototypes/Entities/Mobs/NPCs/elemental.yml --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Predict damage examine (space-wizards#40168) * predict damage examine * . * required true * nits --------- Co-authored-by: ArtisticRoomba <[email protected]> * Predict artifact crushers (space-wizards#40180) predict artifact crushers * Remove holopad projection verb on station AI core (space-wizards#39937) Add check for station AI's projector verb on itself * Automatic changelog update * fix NetEntity datafield in JointVisualsComponent (space-wizards#39987) fix netentity datafield * Ice (the reagent) now actually does stuff (space-wizards#40149) * ice now evaporates and quenches thirst * Ice uses BaseDrink as parent instead of Water * Misc ice cleanup * Ice no longer inherits Extinguish reactiveEffect * Test fixes * Deparented Ice from BaseDrink (was causing test fails) * Whoops, forgot to remove the part actually causing the test fails * Added code comments * Automatic changelog update * Very small Shared Storage Optimization (space-wizards#39092) Mildly cheesed Co-authored-by: Princess Cheeseballs <[email protected]> * Fix NetEntity DataField in AnalysisConsoleComponent (space-wizards#39984) * fix analysis console * fix test * totally not a web edit * Automatic changelog update * make nobody supervisor a locale key and cleanup JobPrototype (space-wizards#39102) * make nobody supervisor locale key and cleanup JobPrototype * Update Content.Shared/Roles/JobPrototype.cs --------- Co-authored-by: slarticodefast <[email protected]> * Hop console grant all and revoke all access buttons (space-wizards#39375) * add hop console select and deselect all access buttons * align the buttons right * document code * Automatic changelog update * Adds HugBot (space-wizards#37557) * - hugbot - bdy with two arms because it needs two arms to hug - is constructable from: - box of hugs - proximity sensor - two borg arms - lots of voice lines - kinda like a medibot, it chases you down and then hugs you - except if it's emagged, then it punches you :) - it has a 2m cooldown per person by default - MeleeAttackOperator - Read the doc, but it's an operator which makes the NPC hit a target exactly once assuming it's in range. - Used to make the hugbot attack - RaiseEventForOwnerOperator - Read the doc, but it's an operator which raises an event on the owning NPC. - Used to make the hugbot hug extra code, specifically for the cooldown - Changes to existing code: - `ComponentFilter : UtilityQueryFilter` gets `RetainWithComp` added which, as the name implies, retains entities with the specified comps rather than removing them. Basically, it lets you negate the filter. - `SpeakOperator : HTNOperator`'s `speech` field can use a `LocalizedDataSet` instead of just a locstring now - (I updated all of the existing usages for this) - * two arms * wait what if we just used mimebot arms so it doesn't look awful * smort * Automatic changelog update * Dogs chase couriers (impstation#3543) * courier + dog factions, dog ai attacks * dog stamina attack * oh wait dragons dont attack couriers LMAO * oh also dog should be equal to simple neutral * Automatic changelog update * fax machines send a radio message when they get a fax (impstation#3529) * fax machine radio * few tiny things * Automatic changelog update * Added more Syndie ammo types to EMAG lathe (space-wizards#40822) * Move Bulldog Drum to Emag Bulldog drum removed from standard techfab Moved to emag listing * Update Resources/Prototypes/Recipes/Lathes/Packs/syndicate.yml * Adds more Syndie ammo to EMAG lathe inventory * No more L6 --------- Co-authored-by: Connor Huffine <[email protected]> Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * minor tweak to changelog files, for contributor sanity (space-wizards#40643) deconflict changelog file order * Update Xenoarchaeology Guidebook Page (space-wizards#40621) * Update xenoarch guidebook page * Remove artifact reports from science.yml and word change * Some adjustments * Remove references to artifact reports * fix error and typo * Various changes * typo * THATS NOT BROWN???? * Changed trigger window * Added new section and notes about reagents * Split into sub pages and various changes * Change AnalysisConsole to link to the AnalysisConsole guidebook entry * slight wording change * Replace reagent explanations with reagent embeds --------- Co-authored-by: TrixxedHeart <[email protected]> * Automatic changelog update * Infectious anom sprites for moths and arachnids (space-wizards#39508) * anoms part 1 * frost and tech anoms * grav, rock, meta file changes * rock moth * moth sprites * YAMLLinter fixes * okay make them work now * Automatic changelog update * hugbox tag fix (space-wizards#40833) * HOTFIX Fix pickup effects occurring with verb creation (space-wizards#38705) * fix: don't run pickup effects on verb creation * review * redundant --------- Co-authored-by: slarticodefast <[email protected]> * Prevent mice etc from unwrapping parcels (space-wizards#40838) * init * no wrapping yourself * Revert "no wrapping yourself" This reverts commit d66cb17. * Automatic changelog update * Black Gloves Sprite Tweaks (space-wizards#40825) * Tweaked * Clearer Copyright * Durathread can now be printed by autolathes (space-wizards#40837) * Durathread can now be printed by autolathes * Applied material discount * Automatic changelog update * Don't apply discount to reinforced glass (space-wizards#40839) * commit * arby --------- Co-authored-by: iaada <[email protected]> * Fix visual bug with masks appearing to be pulled down after re-equipping (space-wizards#40332) Fix * Makes droppers printable by autolathes and medfabs (space-wizards#40074) * Made droppers printable by autolathes and medfabs * added glass to recipe * Update Resources/Prototypes/Recipes/Lathes/chemistry.yml --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Reorganize tile StackPrototypes and add inheritance (space-wizards#39491) * atomize from space-wizards#38412 * fix curtains in G menu * re-add marble * commit * re-add xenoborg tiles * re-add new faux * missed tiles --------- Co-authored-by: iaada <[email protected]> * Adds swabs and an Emag inventory to the biogenerator (space-wizards#39037) * adds swab and emag inv to biogenerator * lower swab biomass requirement * add hostile cubes to emag inventory --------- Co-authored-by: Jessica M <[email protected]> * Automatic changelog update * Add Syndicate IDs to the uplink for 1 TC (space-wizards#38381) * syndie ids :3 * Note that the Syndie ID does not copy accesses. * Automatic changelog update * Update Credits (space-wizards#40841) Co-authored-by: PJBot <[email protected]> * Organize StackPrototype with inheritance (space-wizards#38412) * In one commit like an animal * carpet fix * move materials, more bad commit discipline * re-add marble * don't also do materials in the same PR, dude * the return of floor_tile_stacks.yml for atomizing * resolve an old issue * re-add det cable --------- Co-authored-by: iaada <[email protected]> * Automatic changelog update * Brand new hair (space-wizards#39850) * Update human_hair.yml * overeyepigtail * Update meta.json * Update human-hair.ftl * Update meta.json * Update Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml rerun test --------- Co-authored-by: ArtisticRoomba <[email protected]> * Automatic changelog update * Fix train parallax config (space-wizards#40844) Had many layers that were doing absolutely nothing because they were covered by AspidParallaxBG being there twice. This parallax config is only used by the dev main menu, but it can't hurt to fix. * Quieter Meat Kudzu (space-wizards#39304) Init Commit Co-authored-by: Princess Cheeseballs <[email protected]> * Automatic changelog update * Flash immunity examine visibility toggle (space-wizards#40848) * Fix patrons in in-game credits (space-wizards#40840) * Automatic changelog update * Fix species not being ordered alphabetically in the character customization UI (space-wizards#39359) * Fix species not being ordered alphabetically in the character customization UI * Update Content.Client/Lobby/UI/HumanoidProfileEditor.xaml.cs --------- Co-authored-by: slarticodefast <[email protected]> * Automatic changelog update * Super Synth Removal from rng It was decided during the maintainer meeting to remove these. * Revert "Readds Tasers to Security (space-wizards#39087)" This reverts commit 398c8df. This will be pushed into vulture testing for another release cycle due to potencial influence with newmed, we dont have a better way of doing something like this sooo i will just unrevert the revert Taser changelog removal * Add missing changelog * Mark supersynth as admin * Explicitly attribute each state in organs.rsi, exchange CEV-Eris stomach sprite with /tg/station 13 (space-wizards#39753) attribute each state, replace cev-eris stomach sprite with tg * Use PredictedQueueDel in SharedDestructibleSystem.DestroyEntity (space-wizards#40856) feat: predict queuedel in SharedDestructibleSystem.DestroyEntity Co-authored-by: pa.pecherskij <[email protected]> * Automatically add trash tag to spent bullet casings (space-wizards#40829) * Automatically add trash tag to spent bullet casings * Resolving comments * 2 * Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml --------- Co-authored-by: slarticodefast <[email protected]> * Plasma: reduced highly illegal syndicate shark attack rate (space-wizards#40855) reduced highly illegal syndicate shark attack rate to 2 (per space-wizards#39250, space-wizards#39874) * Automatic changelog update * Revert "Add slowdown to nocturine, buff duration and minor delay reduction (space-wizards#40797)" This reverts commit 33c0c46. * Reapply "Readds Tasers to Security (space-wizards#39087)" This reverts commit 90b4386. * Reapply "Add slowdown to nocturine, buff duration and minor delay reduction (space-wizards#40797)" This reverts commit 02b623b. * Now the changelog is fine * Remove nocture changelog from stable * Add experimental to noc changelog * Resprite Maint Hatch + New Syndicate Hatch (space-wizards#38076) * Resprite + New Syndicate Hatch * Add trailing line * Update airlocks.yml * Update base_structureairlocks.yml * Remove Wall IconSmooth for material doors and shutters * revert iconsmoothing removing lol * Update shutters.yml * Update shutters.yml * Revert Regular Hatch * Replace all usages of /bin/bash shebang with /usr/bin/env (space-wizards#40756) Replace all usages of /bin/bash with /usr/bin/env /usr/bin/env is nearly guaranteed to always exist at that location, which can't be said about /bin/bash and /bin/sh. Co-authored-by: opl <[email protected]> * Entity effects ECS refactor (space-wizards#40580) * LOCKED THE FUCK IN * Forgot this little fella * Crying * All entity effects ported, needs cleanup still * Commit * HEHEHEHAW * Shelve for now * fixe * Big * First big chunk of changes * Big if true * Commit * IT BUILDS!!! * Fix LINTER fails * Cleanup * Scale working, cut down on some evil code * Delete old Entity Effects * Accidentally breaking shit by fixing bugs * Fix a bunch of effects not working * Fix reagent thresholds * Update damage * Wait don't change the gas metabolisms A * Cleanup * more fixes * Eh * Misc fixes and jank * Remove two things, add bullshit, change condition to inverted * Remove unused "Shared" system structure * Namespace fix * merge conflicts/cleanup * More fixes * Guidebook text begins * Shelve * Push * More shit to push * Fix * Fix merg conflicts * BLOOD FOR THE BLOOD GOD!!! * Mild cleanup and lists * Fix localization and comments * Shuffle localization around a bit. * All done? * Nearly everything * Is this the end? * Whoops forgot to remove that TODO * Get rid of some warnings for good measure... * It's done * Should make those virtual in case we want to override them tbqh... * Update Content.Shared/EntityEffects/Effects/Botany/PlantAttributes/PlantDestroySeeds.cs Co-authored-by: Pok <[email protected]> * Fix test fails real * Add to codeowners * Documentation to everything * Forgot to push whoops * Standardize Condition names * Fix up metabolism a little as a treat * review * add IsServer checks --------- Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: Pok <[email protected]> * [PRIORITY NEGATIVE ONE/STABLE HOTFIX] ADMIN NOTES CANNOT BE ACCESSED (space-wizards#40863) Co-authored-by: Princess Cheeseballs <[email protected]> Fix logger obsolete warnings (space-wizards#40553)" * Revert "Merge branch 'master' into stable" This reverts commit 3a7c18c, reversing changes made to e917c8e. * yml cleanup * namespace stuff * most skintone stuff * Make some accents free (impstation#3457) * yeppp * more free accents * Automatic changelog update * Xenoarchaeology Unification (impstation#3526) * Revert "Both Old and NEW Xenoarcheology together (impstation#2894)" This reverts commit df98d12 * fixes * xenoarchaeology unification * finished * keb yaml linter * test fails * test fail fix 2 * ui change * first edit * update 2 * yaml linting * yaml linting 2 * my fix * grahhh * it'll work now. it'll work now. * crusher, action, stun comment wording allow crusher to activate current natural artifact node, fix natural artifact self-activate action, fix wording of stun trigger * natural-only triggers and natural successor limiting * natural artifact nodes that don't have at least a parent reached should be hidden * obscured effect descriptions * Reduced chance for station wide destruction - because previously they couldn't show up on depth 4 * imp comments in artifact crusher system * one more comment and usings at bottom * but i love nesting --------- Co-authored-by: TheGrimbeeper <[email protected]> * Automatic changelog update * oh that was easy. * Shamisen, a traditional Japanese string instrument (impstation#3556) * Added the Shamisen, a traditional Japanese string instrument. Created sprite work, a meta.json file, and added the shamisen to the musician loadout, as well as to the purchasable string instrument crate. * Update instruments.yml Added # imp in order to better align with standards. * Automatic changelog update * Disable the animate spell from the wizard store (impstation#3562) * Automatic changelog update * Stun Visuals (impstation#3553) Update to kinetic stun rounds to help differentiate them from lethals a little more while still being obviously not just disabler rounds * Automatic changelog update * Theremin Musical Instrument (impstation#3559) * Added the theremin to the game. Added CC soundfonts of the theremin to the existing space-station-14.sf2 file in order to decrease bloat. Sprited a rotatable theremin structure. Made sure to attribute the source and licease of the soundfont. * Added the theremin to be purchasable via cargo. Price is consistent with other instrument structures. * Removed unintended 2. * Update cargo_fun.yml Removed unintended text * Update cargo_fun.yml Moving to the imp cargo_fun * Moved the theremin to imp's cargo_fun.yml * Automatic changelog update * HoS Shoulder Holster now parents off ClothingBeltSecurity (impstation#3560) * Fixing missing whitelist items on the HoS Shoulder Holster, missing ContentsExplosionResistanceBase component * Now parents off BaseSecurityCommandContraband, ClothingBeltSecurity * Automatic changelog update * Ungufix 2 (impstation#3551) * yayyayyay * oough * whats wrong w this file!!!!! * Update ungu.ftl * this is the only way i know how to fix this * THERE * asphyx * ungufix2 * ungu mime jump * Update misc.yml * Update ungu.yml * Update misc.yml * Update misc.yml * Update misc.yml * Update ungu.yml * foods * Update noodles.yml * Update bread.yml * fix * bwugh * oooughhh..... * fix * souppp --------- Co-authored-by: starlighthowls <[email protected]> * Automatic changelog update * Kodepiia Consume Refactor (impstation#3393) * kodepiia consume code refactor * forgot to alter the damage the little guys do * fixes checking mouth availability * sigh. * damage buffs * Update animals.yml * Update kodepiia.yml * Woah nelly that's a lot of changes * More changes relating to consuming * Requested changes * Whoopsies * wrong base percentage oops * fix mispredict * the wokes are getting me * also remove this (impstation#3565) * yayyayyay * yayayyaa * EVERY TIME --------- Co-authored-by: starlighthowls <[email protected]> * Automatic changelog update * SM damage at extremely low mol values (impstation#3554) * SM will not get to exactly 0 gas by absorbing due to float, add epsilon to fix this * comment * use mathhelper.closeto * Update SupermatterSystem.Processing.cs * Automatic changelog update * Stun Projector and Disabler Carbine (impstation#3548) * The changes it's all yaml baby * Also this change Forgot I wanted to increase the number of Premium Deluxes you get if you're lucky to roll this bag * Two more changes removed the Enforcer double-tap-- it's a tremendous amount of damage in a shotgun shell to throw around, and even with the slow speed it would probably be too good. We'll think of a new way to make the Enforcer interesting. * Revert Hydra Change Reverts the Hydra to its standard rate of fire * Disabler Work Part 1 Changes the Stun Projector to the Magnum Disabler. Still working on the Carbine. * Disabler Carbine and Implementation Final additions before review * Jokes forgot to do this too ha ha ha * Automatic changelog update * Species TLC part 1 (impstation#3539) * first pass: spider organs, blink * sounds are fine, can't load rsi * MOTHS * randomcorpses, functional but inelegant * randomcorpses using randomhumanoid * job loudouts don't work * some moth sounds * sounds misbehaving, corpses reverted * ok it works now * some more * arachnids poisoned * engine update * robust update * MORE SOUNDS + webs edible again * sounds that aren't wrong this time * sounds * horrible no more * attribution cleanup, volumes lowered * it is not my fault you don't recognize the license mr linter * edits * cleanup, tags in upstream files, reptilian sigh removed on request * keb material arbitrage... * stop getting mad please * fine * hitting you with a large rock * backend fixes and organization * preemptive blood names, subject to change * modified documentation * cleanup --------- Co-authored-by: Alex C <[email protected]> * Reimplement expressions into artifacts (impstation#3563) * reimplement expressions into artifacts * more tweak * Update Content.Server/_Impstation/Xenoarchaeology/Artifact/XAT/Components/XATExpressionComponent.cs Co-authored-by: mq <[email protected]> * Update XATExpressionSystem.cs --------- Co-authored-by: mq <[email protected]> * Automatic changelog update * Add lowpop version of heretics (impstation#3567) * Add lowpop version of heretics * minimum players same as traitors * move directories * Automatic changelog update * build * linting * ediblesystem fixes (WHY THE FUCK IS SOUP BROKEN) * YAML LINTED !!!!!!!!! * rummaging fix * add jobs to ghost roles * make dv ghost role antags actually use their mind roles * unroundstart vulps * imp ghost role jobs * misc upmerge fixes * why did i do that * whiteboy fix (again) * fix remove tagged entity construction validation keb first ever csharp code made for my floor lights came back to bite me in the ass... honestly it should be entirely refactored but if it works it works * misc upmerge test fixes * tiles & test fixes * oh maybe i am stupid * fix xenoarch test fail * mech & circuit fixes * Packed updates (impstation#3583) * Scary Dolphin!!!!!! (impstation#3582) * yayyayyay * ooooooooooh * this time im really gonna do it * RAARGH * mime --------- Co-authored-by: starlighthowls <[email protected]> * Automatic changelog update * fork infiltrator (impstation#3572) * Species TLC patch - Arachnid lungs (impstation#3571) * engine update * robust update * metabolism rate modified * i would never forget imp tags --------- Co-authored-by: starlighthowls <[email protected]> * Boar2 (impstation#3570) * engine update * robust update * less meat, less boar * hunger value tweaks, very small chance to be sentience target --------- Co-authored-by: starlighthowls <[email protected]> * Instrument Update (impstation#3577) * For a PR draft. Added acoustic drum kit soundfont to space-station-14.sf2. Created temp drum kit object for testing midis within Imp community. Will add sprite and attribution later. * Decreased theremin volume. Added Dulcimer entity and sprite. Added Hammond Organ entity and sprite. Added Drum Kit entity and sprite. Added attributions for new additions to attributions.yml. Removed temporary drum kit entity within instruments_string.yml. * Forgot to push these with the previous commit. * Added the instruments to cargo's catalog. * Merge branch 'master' into pr/VeeNomine/3577 --------- Co-authored-by: starlighthowls <[email protected]> * Grenade Polishes and Tweaks (impstation#3575) * grenades and bullets tweaks * pyronade make light * flashs and desc tweaks --------- Co-authored-by: starlighthowls <[email protected]> * Automatic changelog update * oops * minor ooc color refactor + fix * how did i delete this on accident --------- Co-authored-by: Jessica M <[email protected]> Co-authored-by: Jessica M <[email protected]> Co-authored-by: PJBot <[email protected]> Co-authored-by: Prole <[email protected]> Co-authored-by: āda <[email protected]> Co-authored-by: GeneralGaws <[email protected]> Co-authored-by: SurrealShibe <[email protected]> Co-authored-by: iaada <[email protected]> Co-authored-by: David <[email protected]> Co-authored-by: Lordbrandon12 <[email protected]> Co-authored-by: Kyle Tyo <[email protected]> Co-authored-by: slarticodefast <[email protected]> Co-authored-by: IProduceWidgets <[email protected]> Co-authored-by: Leon Friedrich <[email protected]> Co-authored-by: Spanky <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: dffdff2423 <[email protected]> Co-authored-by: kosticia <[email protected]> Co-authored-by: FungiFellow <[email protected]> Co-authored-by: Deserty0 <[email protected]> Co-authored-by: Hitlinemoss <[email protected]> Co-authored-by: Mora <[email protected]> Co-authored-by: TrixxedHeart <[email protected]> Co-authored-by: SlamBamActionman <[email protected]> Co-authored-by: Archee <[email protected]> Co-authored-by: B_Kirill <[email protected]> Co-authored-by: UpAndLeaves <[email protected]> Co-authored-by: YoungThug <[email protected]> Co-authored-by: K-Dynamic <[email protected]> Co-authored-by: opl- <[email protected]> Co-authored-by: opl <[email protected]> Co-authored-by: Vortebo <[email protected]> Co-authored-by: ToastEnjoyer <[email protected]> Co-authored-by: Alex C <[email protected]> Co-authored-by: ImpstationBot <[email protected]> Co-authored-by: Centronias <[email protected]> Co-authored-by: starlighthowls <[email protected]> Co-authored-by: starlighthowls <[email protected]> Co-authored-by: Connor Huffine <[email protected]> Co-authored-by: thetuerk <[email protected]> Co-authored-by: ScarKy0 <[email protected]> Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: Princess Cheeseballs <[email protected]> Co-authored-by: Winkarst-cpu <[email protected]> Co-authored-by: blobadoodle <[email protected]> Co-authored-by: qwerltaz <[email protected]> Co-authored-by: MilenVolf <[email protected]> Co-authored-by: ArtisticRoomba <[email protected]> Co-authored-by: Pok <[email protected]> Co-authored-by: pa.pecherskij <[email protected]> Co-authored-by: lunarcomets <[email protected]> Co-authored-by: YotaXP <[email protected]> Co-authored-by: Crude Oil <[email protected]> Co-authored-by: lzk <[email protected]> Co-authored-by: Yesteryear <[email protected]> Co-authored-by: msTheowo <[email protected]> Co-authored-by: PicklOH <[email protected]> Co-authored-by: Errant <[email protected]> Co-authored-by: HTML/Crystal <[email protected]> Co-authored-by: Perry Fraser <[email protected]> Co-authored-by: cloudyskies <[email protected]> Co-authored-by: Super <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Jopogrechkin <[email protected]> Co-authored-by: Pieter-Jan Briers <[email protected]> Co-authored-by: DrSmugleaf <[email protected]> Co-authored-by: Vasilis The Pikachu <[email protected]> Co-authored-by: Fildrance <[email protected]> Co-authored-by: Callmore <[email protected]> Co-authored-by: Coco <[email protected]> Co-authored-by: Ps3Moira <[email protected]> Co-authored-by: Dinner <[email protected]> Co-authored-by: mqole <[email protected]> Co-authored-by: pocl v <[email protected]> Co-authored-by: TheGrimbeeper <[email protected]> Co-authored-by: VeeNomine <[email protected]> Co-authored-by: FancyPlanks <[email protected]> Co-authored-by: DVDPlayerOfDiscordFame <[email protected]> Co-authored-by: Moodotsuki <[email protected]> Co-authored-by: entings <[email protected]> Co-authored-by: Alex C <[email protected]> Co-authored-by: mq <[email protected]> Co-authored-by: Kandiyaki <[email protected]> Co-authored-by: Epic Toast <[email protected]> Co-authored-by: AvianMaiden <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
About the PR
Added individual swabs to the biogenerator for 2 biomass each
Added a new emag inventory with 10u of unstable mutagen for 20 biomass each and the hostile cubes
Why / Balance
Right now there is only 2 sources of swabs outside of the round start boxes in botany, medical supply crates, and the medical lathe. This should also make genpop botany more interesting, especially if someone manages to smuggle in an emag.
Technical details
It's just yaml
Media
Requirements
Breaking changes
Changelog
🆑