## About The Pull Request
Title + fixes a bug where cryoing as the suit ai as the original wearer
of the modsuit would then cause the original AI to be stuck in limbo
when deactivating the suit
## Why It's Good For The Game
bugs
## Proof Of Testing

<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
fix: AIs can no long control a host body and themself at the same time
fix: if the original wearer becomes the AI and cryo's, the original AI
will no longer be stuck in limbo
/🆑
## About The Pull Request
As title says, changes the description of nosferatu's examine to make it
obvious they are in fact, a bloodsucker.

## Why It's Good For The Game
People tend to kind of ignore the nosferatu examine, either not
understanding or simply willingly ignoring it, I'd like it to be a bit
more obvious so it's super clear that this is in fact, a bloodsucker, a
nosferatu who willingly gives up any pretense at hiding in return for
their powers
## Proof Of Testing
Text/number changes, not tested
## Changelog
🆑
add: Added new mechanics or gameplay changes
balance: Nosferatu when examined disgust you doubly as much.
add: Changes nosferatu examine to be more clear on what they are
/🆑
## About The Pull Request
Fixes sol quirk having wrong the's
## Why It's Good For The Game
It bothers people when the english is actually engrish.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
fix: Sol quirk should properly use the when appropiate
/🆑
## About The Pull Request
To explain this slightly better than ChromeFoxxity did, this PR edits
all Centcom clothing to match the same color palette with darker greens
and brighter golds. As well, this changes the turtlenecks of Centcom to
have actual turtlenecks, rather than being simple ribbed sweaters.
**THIS DOES NOT INCLUDE THE LOADOUT CHANGES OR ATTEMPTED FORCING OF A
SWORD FOR REPRESENTITIVE.**
### It was tested by him apparently. I'm just remaking his PR
"atomized". If it doesn't work, that is on him for not checking
beforehand.
### Credit for the turtlenecks is to (https://github.com/Ebin-Halcyon).
If Halcyon has any issues with their turtlenecks being used, I will wipe
them from this whole PR and just recolor the existing turtleneck sprite.
### Other sprites that are used or edited for new clothing are from
TGstation.
## Why It's Good For The Game
To quote ChromeFoxxity:
> The uniforms however, looked a little stale, the shading was a little
off, from a dusty, green to a almost pitch black green instantly. This
gives it a more vibrant coloring, while also keeping that classic green
as the primary color. The gold has also been given more vibrancy, to
make it look more like gold instead of just yellow stripes, it may look
odd, but it fits more with the Captain's uniform, which these are based
off of, or look similar to.
So the shorthand answer is visual consistency. All of the existing
centcom uniforms use different shades of greens and golds for some
reason, rather than being consistent like a company's uniform would be.
## Proof Of Testing
Built on my end, so whatever that's good for.

<details>
<summary>Sprites of what changed</summary>
_**Commander's Uniform and Skirt**_

_**Official's Jumpsuit and Turtleneck**_

_**ERT Officer's Turtleneck and Skirtleneck**_

_**Centcom Replica Uniforms**_ (Notice the lack of belt and duller
colors on the pants/skirt)

_**Additional Sprites**_

</details>
## Changelog
🆑
add: Adds different sprites to the CentCom uniforms, and clothing.
add: Adds a CentCom Carapace, and CentCom Gloves that aren't Naval.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
## About The Pull Request
Adds disposal bins to Moon Station arrivals. Trash goes to a conveyor
belt in the maint room, allowing ~~assistants~~ janitors to still filter
it for ~~anything worth stealing~~ lost items before sending onwards.
## Why It's Good For The Game
It's hell trying to keep Moon Station arrivals clean as the hordes
arrive and dump all their starting loadouts on the floor like wild
animals.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
https://github.com/user-attachments/assets/23650fd0-989f-4af9-b9e2-60aac46fc062
</details>
## Changelog
🆑 LT3
map: Moon Station now has disposal bins
/🆑
## About The Pull Request
Yes, yes, the name might sound incorrect with that tag, but what I mean
here is that the icon cutter now checks and works in
`modular_zubbers/icons`! It won't pull templates from there, though, I'd
recommend creating a zubbers folder inside the `icon_templates` folder
instead.
Why did I do this? I have a mid-sized thing I'm working on in the
background, and I'd figure I'd PR anything that makes sense by itself to
reduce the upfront workload of maints when and if the time comes,
provided I get the prototype approved.
Also fixes the malformed moonrock file, I'm not sure exactly what was
wrong, but it had the wrong states in places? Not sure if anyone noticed
in-game.
## Why It's Good For The Game
Makes spriters less sad when they have to sprite icon smoothed stuff,
this is objectively a very good thing,
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>

</details>
## Changelog
Non player facing.
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
## About The Pull Request
This module allows for the at-will body swapping between a suit AI and a
player mob. At face value its not really useful for real mechanical
purposes as, neither player will be able to be able to really do
anything extra that their counterpart couldn't do. I just personally
think its cool and could add some new cool scenarios for when wearing a
suit AI
## Why It's Good For The Game
I've been told its hot and cool. Gives more reason/gameplay to suit AIs
and the people wearing them
## Proof Of Testing

https://github.com/user-attachments/assets/015b9e9d-8f30-482c-ba8a-c41f05fc466a
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
add: adds a new mod module
/🆑
## About The Pull Request
Thankfully not as many bugs or oversights as I previously thought, but
enough to hammer them out all at once. This fixes some incorrect or
missing item descriptions, a few research item names, and a very
important bugfix with the weapon conversion kits.
- Updates description for Renoster shotgun, and Rengo rifle, as they had
the incorrect magazine size listed.
- Adds descriptions for Carbine and Battle Rifle conversion kits.
- Makes the Carbine and Battle Rifle conversion kits not give a full
free mag on crafting.
- Makes the Carbine, Battle Rifle, and Shaytan SMG conversion crafts
require the gun not have a magazine inserted, and the bolt be open to
craft.
- Fixes lathe description and name for Stardust / Advanced Anti Riot
shells, homogenizes name as "Less-Lethal"
- Fixes description on Stardust ammo box.
- Pedantic nitpick renaming WT-550 rubber mags from "Less-Than-Lethal"
to "Less-Lethal", as that was the only use of the term
"Less-Than-Lethal" with any firearm.
- Updates Shaytan gun description to not be a copy of the conversion kit
description. (provided by @Offwrldr / Bangle)
- Updates Shaytan conversion kit name and description in the sec lathe.
- Updates all shotgun ammo boxes to show the proper max ammo count
(which is now 7)
- Reduces cost of Honkshot from 100cr to 25cr (as it now is properly
overridden)
- Standardizes all shotgun ammo boxes to hold 7 rounds (dropping
scatterlaser, hunter, flechette, dragon's breath, hornet's nest,
stardust, pulse slug, and scatter ion from 15 rounds per box, and
honkshot from 35 rounds per box).
## Why It's Good For The Game
As for the descriptions and names, fixing stuff that is blatantly
incorrect or misleading is good. As for the conversion crafts, giving
people free ammo and magazines is anywhere from an unfortunate
oversight, to outright boo-boo-busted.
Consistency for ammo boxes is also good (alongside accurate
descriptions), and I checked with a maintainer in the discord before
updating ammo box values.
## Proof Of Testing
I'm not taking screenshots of descriptions in the lathe, or of items. If
it complies, they're accurate. I do have a video showing the crafts
requiring the guns to have no magazine, and be open bolt though.
https://github.com/user-attachments/assets/9c8313c4-274d-4e7d-9211-7938f595c42f
## Changelog
🆑 Impish_Delights, Bangle
fix: Romulus Carbine, and Romulus Battle-Rifle crafts no longer give
free loaded magazines.
balance: All shotgun ammo boxes now hold 7 rounds. Honkshot is now 25cr
from cargo, down from 100cr.
code: Romulus Carbine, Romulus Battle-Rifle, and Romulus Shaytan kit now
require gun to be empty, and locked open to craft.
spellcheck: Fixes description for Rengo rifle, Renoster shotgun,
Stardust/AAR cartridge box, and Romulus Carbine and Battle-Rifle
conversion kits.
spellcheck: Homogonizes description for Stardust/AAR ammo, and Beanbag
slug ammo as "Less-Lethal"
spellcheck: Changes WT-550 rubber mag to be "Less-Lethal" instead of
"Less-Than_Lethal"
spellcheck: Updates Shaytan SMG description, and conversion kit name and
description in the security lathe.
spellcheck: Updates all shotgun ammo boxes to be accurate.
/🆑
---------
Co-authored-by: Bangle <140950607+Offwrldr@users.noreply.github.com>
## About The Pull Request
Why it was picking the winning map based off the cache instead of the
actual list of choices, it is a mystery.
Closes https://github.com/Bubberstation/Bubberstation/issues/2641
## Changelog
🆑 LT3
fix: Map vote results should no longer randomly decide to ignore what
choice won the vote
/🆑
## About The Pull Request
Buffs the L6 saw ~ 30 percent more damage
## Why It's Good For The Game
The l6 saw has always been left behind for a nukie weapon. This will
help get it to a better state.
- /obj/projectile/bullet/a7mm (normal ammo) 30 --> 39
- /obj/projectile/bullet/a7mm/ap (AP ammo) 25 --> 30
- /obj/projectile/bullet/incendiary/a7mm (Incendiary Ammo) 15 --> 20
- /obj/projectile/bullet/a7mm/bouncy (bouncy ammo) 20 --> 25
## Proof Of Testing
It compiles and works.
## Changelog
🆑
balance: Increases the L6 Saw damage by around 30 percent
/🆑
## About The Pull Request
makes it easier for bloodsucker to level up, setting the percentage to
40% of blood volume
## Why It's Good For The Game
It's kind of really rough to level up as a bloodsucker, hopefully this
helps
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
balance: Bloodsuckers now only need 40% blood to level up.
/🆑
## About The Pull Request
Adds a new sidearm to the selection available to the crew, a small
two-shot derringer chambered in .310 Strilka (same ammo used by the bolt
action rifles) and styled as a companion to the Sakhno rifle. This
offers high point-blank burst damage, but is lacking in both ranged
performance, and sustained damage compared to the other options that are
available from cargo.
The Derringer itself has a 75% damage multiplier, and a ~~5%~~ **10%**
damage drop off (per tile) on projectiles fired from it, but otherwise
can still be used at a moderate range as a deterrent. This means it will
deal 45 damage pointblank (assuming the target has no armor, and using
regular .310 ammo), about 9 damage at a screen's distance away, and has
an absolute maximum range of 10 tiles.
The cargo goody pack is ~~1300~~ **~~700~~ 450** credits, putting it
slightly above the plasma projector firearms, and most melee weaponry.
The pack comes with the derringer, and an ammo box with 10 additional
shots.
As a recent change, the derringer also requires a do_after delay to
load, meaning loading a cartridge takes 3/4ths of a second to perform,
to prevent magdumping and being ready to fire immediately.
In addition, it also adds .310 Strilka rubber ammo boxes to the cargo
import market, allowing acquisition of (less-lethal) ammo for it, and
the Sakhno for the general public. It's 50 credits for 10 shots.
## Why It's Good For The Game
This offers a gun that is more heavily tilted towards self-defense, and
requires a bit more thought towards when to use it due to the slight
ammo scarcity (requiring either a hacked lathe to print weaker surplus
rounds, or an ammo workbench). The low capacity and poor damage at range
stops it from being a pocket sniper, while still giving it enough 'oomf'
to justify carrying it as a non-combat focused role.
While it can fire twice in (relatively) quick succession, the lower
damage makes it unable to crit an unarmored crew member; it still deals
a significant amount and leaves them in a vulnerable state, but requires
reloading and gives the victim a chance to retaliate, rather that being
an instant crit or kill.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
( Screenshots are not upto date in regards to current price, all other
information is correct )








This video below shows the reload delay in action (time is 0.8 seconds,
rather than the 0.75 seconds that is committed currently)
https://github.com/user-attachments/assets/d8769a79-6019-4288-bd00-c343a03a3935
<details>
<summary>Old Damage Dropoff @ 5% per Tile</summary>



</details>
In addition to the GIFs above, I did a small series of wound testing and
general purpose utility actions with the derringer. While surplus ammo
suffers from lower wound chance and immensely reduced damage against
armored targets, it still deals full against structures, unarmored, and
simple mobs.
```
20 trials, 3 tiles between shooter and target, aiming chest, firing twice
1: Skin Breakage (Moderate Chest)
2: Open Puncture (Severe Leg)
3: No Wounds
4: No Wounds
5: Open Puncture (Severe Chest)
6: Skin Breakage x2 (Moderate Chest & Leg)
7: No Wounds
8: No Wounds
9: No Wounds
10: Skin Breakage (Moderate Chest)
11: Skin Breakage (Moderate Chest)
12: Skin Breakage (Moderate Leg)
13: Muscle Tear (Moderate Leg) - Survived Wound
14: Open Puncture (Severe Arm)
15: No Wounds
16: No Wounds
17: No Wounds
18: Skin Breakage (Moderate Chest)
19: No Wounds
20: Skin Breakage (Moderate Arm), Open Puncture (Severe Chest)
9 Unwounded
9 Wounded
2 Double Wounded
3/4 to Crit PB (Affected by Determination from Wounds)
5 to Crit with 3 tiles between shooter and target
8 to Crit with 5 tiles between shooter and target
18 to Crit with 8 tiles between shooter and target
Opens secure locker in 8 PB shots
Breaks reinforced window + grille in 6 PB shots
```
</details>
## Changelog
🆑
add: Adds Yinbi Derringer. Sakhno production 2-shot pistol chambered in
.310 Strilka. Available at cargo for 450 credits.
add: Re-adds .310 Strilka Rubber ammo boxes to the company imports tab,
available for 50 credits.
image: Adds sprite for Yinbi Derringer.
/🆑
---------
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
## About The Pull Request
as PR title says
## Why It's Good For The Game
Currently dragon tends to absolutely get bodied almost always, and
dragon depression currently is 100% a death sentence, that is, the
slowdown being far too much for a mainly melee antag to survive.
## Proof Of Testing
tested the slowdown and the other one's just number changes
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
balance: Dragon depression slowdown is now only 2.5, where it used to be
5.
/🆑
<!-- 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
This PR ports a [pull
request](https://github.com/NovaSector/NovaSector/pull/4531) from
Novastation that allows synthetics and Ethereals to produce music via a
synthesizer button.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
For too long our synthetic friends have had to stand by and watch PAIs
produce music without being able to participate in such joys. This PR
allows synths and Ethereals to produce music as would be logically
possible for something that speaks in electricity or has a literal
speaker for vocal cords.
<!-- 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. -->
## Proof Of Testing
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
<summary>Screenshots/Videos</summary>

</details>
## 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 its 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. -->
🆑 AvianAviator & A.C.M.O
add: Added a music synthesizer action to Ethereal and Synthetic species.
Ported from Novastation
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
## About The Pull Request
This has been a long annoyance for me; now, people with the entombed
quirk will no longer take tox damage if they're dead (and their modsuit
is dead).
This shouldn't apply after revival, as they'll no longer be dead.
## Why It's Good For The Game
It doesn't make sense with how the quirk is explained, as the suit is
keeping the person alive. I don't think the suit's pumping toxins into
the user when dead, so this stops that.
## Proof Of Testing
TBD
## Changelog
🆑
fix: Entombed modsuits no longer cause stacking toxin loss if the
entombed is dead.
/🆑
## About The Pull Request
As it says on the pr description
## Why It's Good For The Game
Currently space carp are barely threat, as anyone with any kind of
weapon can easily take them down, it's kind of pitifull really when many
guns take them down in barely 1-2 shots. I'd like them to be a bit more
of a threat, and also buff the space dragon's carp at the same time so
they're actually useful and helpful, instead of always instantly dying
and practically only being food.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
balance: Space carp now have 50 health, up from 25
balance: Dragon's space carp now have 100 health, up from 50
balance: Mega carp now get extra 15-40 health
/🆑
## About The Pull Request
Fixes borer stun ability not working properly, stun and infest abilities
should now properly toggle off when they've been used appropiately,
borer say will no longer sanitize text itself and allows say to sanitize
them to prevent ' being sanitizied into a unreadable mess that lets you
meta borers.
Also fixes the action buttons appearing sort of active sometimes,
hopefully.
## Why It's Good For The Game
Good fixes are always good.
## Proof Of Testing
Thoroughly tested ingame
## Changelog
🆑
fix: Borer stun should no longer randomly fail to work
fix: Borer say no longer badly sanitizes your messages causing issues
with what you say.
fix: Borer action buttons shouldn't stay "active".
fix: Borer Infest will no longer cooldown if you fail to enter a host.
/🆑
## About The Pull Request

## Why It's Good For The Game
Ultimately there's not going to be any harm for letting people pick the
thing and it's something that I kind of forgot to do six months ago.
## Proof Of Testing
If it compiles it works
## Changelog
🆑
add: Added the latex catsuit to the loadout
/🆑
<!-- 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
Scream at me if you want a specific outfit from autodrobe or somethin
that isnt in loadouts
So far was added:
Entire pirate outfit
Samurai armor
Bunny tailcoat
Kabuta,
bunny headband and mime version
Centcom turtleneck skirt and pants version
Wheliee shoes
What was requested:
Wheliee shoes
Centcom turtleneck skirt and pants version
What isnt currently working:
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Might aswell have this as an excuse.

<!-- 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. -->
## Proof Of Testing

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
<summary>Screenshots/Videos</summary>
</details>
## 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 its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->
🆑
add: Added outfits into loadouts, those include: A pirate outfit, Bunny
outfit, samurai outfit, wheely-heelies and replica of centcom
turtleneck.
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
## About The Pull Request
I moved all of the modular quirks from SR and Bubber to the same
folder/filepath, previously they were split up in multiple different
places.
## Why It's Good For The Game
It helps people when looking for things while coding or code diving due
to them all being in one place.
## Proof Of Testing
It compiled and ran.
## Changelog
🆑
code: moved a bunch of modular quirk files to the same folder
/🆑
---------
Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
## About The Pull Request
Fixes auspex not matching to ability description, by making it not
wrongly tell you that it lets you sleep people, and makes auspex able to
teleport through walls at level 6 even if you cannot see it, because if
you're that far into a single ability I think it's fair.
## Why It's Good For The Game
It's bad for a ability description to be completely wrong.
## Proof Of Testing
Tested, works
<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
balance: Auspex can now teleport through walls at level 6
fix: Auspex no longer tells you incorrrectly that it sleeps victims.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
## About The Pull Request
Makes the Shotgun two handed to use.
## Why It's Good For The Game
It prevents the abuse of akimbo shotguns, letting you do 60 explosive
damage on station with little investment, while still mantaining the
shotgun as a viable pka.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>
Message when you dont have both hands free:

</details>
## Changelog
🆑
balance: Made the shotgun PKA two handed.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
## About The Pull Request
Changes Tajaran butt sprite on the photocopier from Vulp to Cat
fixes: #2248
## Why It's Good For The Game
Simple little change unless someone wants to make a whole new sprite,
this should be more accurate.
## Proof Of Testing
Spawned in a photocopier, hopped on as a Tajaran. Cat ass.

</details>
## Changelog
fix: Give Tajaran the ass they deserve when photocopying.
<!-- 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
https://youtu.be/pPhfOGnLm08?si=QC2BPGd1pcLCXTc7 <- Updated as of 10/28
This pull request provides a replacement map for the interdyne and
dauntless offstation syndicate maps. It is supposed to be themed as a
landcrawler and features several new roles, (~~The comms operative was
removed~~) and the morale officer (The finest of waffle co. here to
enforce ~~managed democracy~~ syndicate interests. The icebox map is the
same size as the former dauntless map, while the new lavaland version is
slightly bigger to support the turrets and energy shielding.
Speaking of, one major feature of the new maps is a double layer of
energy shielding around the maps. This shielding does not recharge and
is intended to take two hits. An explosion naturally can clear both
layers at once and it is intended to prevent destruction by specific
megafauna (colossus) while also stopping miners from getting shot if
they accidentally find the ship. It does not cover the various entrances
and exits so its still worth while to be careful and if need be it
should be easy enough to attack the ship in a pinch.
**Weapon and armor wise, the ship has the following additions and
removals**
- All makarovs in the armory have been removed.
- One renostar shotgun has been removed from the armory
- Each non command crew member and the comms operative starts out with a
weapon selection beacon providing an option between a makrov, m1911,
mini egun, or energy dagger
- Each command officer barring the MAA starts with a weapon beacon
offering a choice between an ansem pistol (on par with an m1911 iirc), a
stechkin APS, or a c-20r.
- The morale officer has an additional selection of a revolver (for
executing dissidents)
- The MAA has a selection between an m-90gl with only rubber grenades
available, a bulldog shotgun, a c-20r, or a hos revolver
- An infiltrator modsuit has been added minus the psi demoralizer for
the corporate liason
- A honkerative modsuit has been added for the morale officer, it comes
preequipped with a waddle module.
**Power supply**
Per request, the ship now features a syndicate unique power source,
FISH! Make sure to pet them.
closes#2386
## Why It's Good For The Game
It has come to my attention that the interdyne offstation map which
spawns on icebox has become outdated due to the fact that it only spawns
on a single map. Rather than let this continue to be an issue I have
elected to standardize the icemoon and lavaland maps to one single map,
both to cut down further efforts of keeping up the offstation syndicate
map, and to provide a map that going forward will have room for updates.
Additionally, the new map will replace the icebox comms outpost, saving
on space for new ruins while improving (hopefully) spawning off the
offstation syndicate.
On one final note, massive mining rigs are cool and the pumpkin spice
must flow.
<!-- 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. -->
## Proof Of Testing
See the video linked above
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
<summary>Screenshots/Videos</summary>
</details>
## 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 its 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: The Persistence land crawler has been deployed to local mineral
rich areas.
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: nikothedude <simon.prouty@gmail.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
## About The Pull Request
Moves Lizard Full Stub horns to beard because of overlay issues.
The horn option of it would overlay over masks, looking silly.
## Why It's Good For The Game
Fixes good.
## Proof Of Testing
it just werks.
## Changelog
🆑 BurgerBB
fix: Moves Lizard Full Stub horns to beard because of overlay issues.
/🆑
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
## About The Pull Request
Small changes to scrubber overflow. Reduces the amount of reagent by
roughly 30%, Adjustment to ethanol chems.
## Why It's Good For The Game
Flooding people with 120+ units of something has an effect lasting too
long, this should tamper it down a bit. The ethanol dose shouldn't mean
guaranteed liver death or being drunk for a half hour.
## Changelog
🆑 LT3
balance: Minor reduction to the strength of scrubber overflows
/🆑
## About The Pull Request
Lowers the heat variable on a lit cigarette to 415, and fixes the broken
`on_grind()` behavior for dried cannabis.
## Why It's Good For The Game
Currently, the lit cigarette target temperature is 1000K, standard for
most flammable objects. Problematically, THC condenses into dabs at
420K, and space drugs distill into fentanyl at ~700K, so if you're
rolling literally anything other than tobacco you're going to have
trouble after a few seconds, either way.
Additionally, the behavior for dried cannabis creating hash when ground
was handled with the `on_grind()` proc in an exceptionally weird way.
For almost literally anything else, this would be an appropriate proc!
However, the `grind()` proc is overridden for all subtypes of `grown` to
modify reagent quantities based on nutriment production. Since cannabis
doesn't contain any nutriment, `on_grind` never produced any `hashish`
reagent to condense into hash.
## Proof Of Testing
https://github.com/user-attachments/assets/c882ed32-ea00-4338-90cc-5a2cba3e8007
</details>
## Changelog
🆑
balance: Cigarettes only have a heat of 410K. Joints will no longer boil
out their own THC or turn space drugs to fentanyl.
fix: Grinding dried cannabis now makes hash as originally intended.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
## About The Pull Request
This one is bound to come with mostly admin and code facing changes,
players are bound to expect one less ms of runtime and ~~maybe a
different antag cap system~~ (Later).
### Storyteller admin UI
Creates a fresh new ui for the storyteller admin side, making it
significantly easier to use than before, and adds some neat elements
that visualize what's going on.

## Why It's Good For The Game
The code sucks less, the ui sucks less
## Proof Of Testing
The TM has not been met with any major issues from the admins.
## Changelog
🆑
admin: New storyteller admin panel
admin: More logging to the storyteller panel actions and to it spawning
things
/🆑
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
# [ORIGINAL PR
HERE](https://github.com/Bubberstation/Bubberstation/pull/2194)
## About The Pull Request
Recently, a fellow by the name of Cato Christopher made me aware of a
conversion kit within the game that is unimplemented. From what I could
see, it was possibly never completed - the RomTech SMG, a conversion of
the Sindano to make it fully-automatic. The magazine sprite, for
example, was incorrectly aligned with the original sprite. There was
talk in the code about making it researchable. I have taken it in as my
own.
Introducing the _Shaytan_.

Description: A Romulus-produced conversion kit. This kit comes with a
modified sear to enable seamless full-automatic fire - at the cost of
fire-select function. This kit includes an alloy and polymer body, a
proprietary **integrated flashlight**, an **alternate handguard and
modified barrel for the addition of universal suppressors**. Accepts any
standard Sol pistol magazine.
It has been tested. It passed. See performance
[here.](https://github.com/Bubberstation/Bubberstation/pull/2194#issuecomment-2406524916)

BONUS ROUND: I modified my own dono sprite. It works. It is added to the
MultiSec wardrobes. It has identical stats to baseline Sec armors.
EDIT:
The original collared vest:

The new collared vest:


## Why It's Good For The Game
It adds diversity to the Sec weapons pool. To prevent abuse, I made it
pricey to order from Cargo. It also does not show up on the Armory menu
(I think) of Sec's Cargo orders - meaning they have to GO to Cargo to
order it. The fire-rate can also be adjusted to make it work better for
gameplay reasons.
It is intended to be a mid-round option for Security Officers.
## Proof Of Testing


## Changelog
🆑 Bangle
add: Added new mechanics or gameplay changes - added Shaytan SMG
conversion kit to Cargo. Added the BNGL Collared Vest to MultiSec - it
has identical stats and I don't wanna lock it behind a donowall.
add: Added more things - added Shaytan SMG conversion kit
image: added/modified/removed some icons or images - changed a bunch of
the sprites, including my own Collared Vest
spellcheck: fixed a few typos - changed descriptions and renamed my
Collared Vest. I think it's the BNGL Collared Vest now.
code: changed some code - see above.
/🆑
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
that's about it yep
## About The Pull Request
Adds the Zero's plushie. Requested by me, sprited by our dearest
maintainer, [Waterpig](https://github.com/Majkl-J)!
## Why It's Good For The Game
PLUSHIE
## Proof Of Testing

<details>
<summary>Screenshots/Videos</summary>
</details>
## Changelog
🆑
add: Adds the CentCom Synth Fox Plushie
/🆑
## About The Pull Request
Forgot to check if I could make it modular before making pull request,
it can be. Updating a previous PR to be modular where it makes sense.
Some files are left as commented edits where it makes more sense to do
so.
## Why It's Good For The Game
Better follows contribution guidelines.
## Proof Of Testing
Functions the same way/no changes in how it runs, just how code is
structured.
## About The Pull Request
Some maintenance and cleanup for medical jackets.
- Moves the dark jacket from donator locked to general availability
- Corrects the light jacket to be a labcoat subtype so it can hold
medical gear
- Slightly tweaks the color of the light jacket to better match other
medical clothing
- Adds both jacket variants to the MediDrobe
- Places job restriction on the loadout items
- Replaces one of the two orderly security vests with a jacket
## Why It's Good For The Game
The medical jackets should be available in game like other departmental
jackets. It should also hold medical items like the medical winter
jacket.
## Changelog
🆑 LT3
add: Light and dark medical jackets now available in the MediDrobe
add: Dark medical jacket no longer donator ckey locked
qol: Light medical jacket can hold medical gear in the suit slot, same
as medical winter jacket
/🆑
Adds in a new Plush for the silly folks who love having new Plushes
around!
## About The Pull Request
Honestly? Its just a simple Plushie addition, Im none too savvy on using
DREAM code and all that and i wanted to start with something small!
## Why It's Good For The Game
Adds more fun for those plushie lovers that have collections on station
## Proof Of Testing
VSC had headaches but i think that was somethign from my end and not
BYOND's
<details>
<summary>https://www.youtube.com/watch?v=IEFBawJgVnM</summary>
</details>
## Changelog
🆑
Add: Just a Plushie that i have had sitting in the corner.
/🆑
---------
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
## About The Pull Request
Same as the title, its a one line change
## Why It's Good For The Game
Strangely it lacks it, and beret doesnt have mutli variant options.
Extra drip
## Proof Of Testing
One line of change, it works.
## Changelog
🆑
add: Added white sec beret to their clothing vendor.
/🆑
## About The Pull Request
The crate is a bit expensive and has a chance to spawn it with one of
the assorted funny names
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Bored chaplains rejoice, personally I'd say it's fun because I get to
yell at ghosts and take photos at them and the ghosts get to call me an
eye-sore-obvious homosexual with it's help. I think it's a win-win.
## Proof Of Testing
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
I have booted up a private server, ordered it, the crate came, it had
it's contents, I spawned the /weegee and it had random funny names.
</details>
## 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 its 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: Ouija boards can be now ordered from cargo (Séance kit)
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Waterpig <wtryoutube@seznam.cz>
<!-- 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
This adjusts prices and fixes a lot of oversights in my original cargo
PRs, and newly added things from upstream, helping to alleviate some of
the cargo powergame.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Cargo has been the premier site for weapons and armor, and while I don't
want to take away from that, some things like medical supplies take away
from other jobs, and are so cheap as to be widely available. The
paramedics want their work back.
This will restore the balance
<!-- 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. -->
## Proof Of Testing


<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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 its 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. -->
🆑 ReturnToZender
del: Removes the Lanca and Sol LMG completely from cargo orders, leaves
the Sakhno to the mosin order
del: Re-removes the ion carbine from imports (it's in the goodies tab)
del: Removes extra ammunition types for no longer used weapons from
import order
add: Removed company imports added to goodies and security orders
balance: adjusts prices on some company imports to not be essentially
free, such as medical supplies and armor
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
---------
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
## About The Pull Request
Fixes https://github.com/Bubberstation/Bubberstation/issues/2532
## Why It's Good For The Game
Previously alt clicking an item would automatically switch it to the new
form without a way of backing out, and the combitool was missing an alt
form altogether.
## Proof Of Testing
It compiled and ran, the icons switched properly when I tested it.
## Changelog
🆑
fix: fixed reskinning medical items so that you can now back out of
reskinning them
image: added a korve sprite for the combitool
/🆑
Use Regex to be smarter.
<!-- 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
Public logging finds ckeys via regex to remove them from lines now. Not
used for player say, at the moment. Not needed there either, as ckeys
are only used by key_name() and thats passed down as a string. rather
than just edit every instance of the proc, ill just regex them out by
adding identifiers into the ckey blocks in logs and snip them that way.
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->
## Why It's Good For The Game
Public logs are little more private. We want them only to have
characters, no keys.
## Proof Of Testing
<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
## 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. -->
🆑
refactor: public logging uses regex for cases of mechanics now.
/🆑
<!-- 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. -->
<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>