Commit Graph

430 Commits

Author SHA1 Message Date
thegrb93
5f674a2e38 Fix tajaran photocopier sprite (#1732)
## About The Pull Request
Fix runtime caused by upstream changes

## Why It's Good For The Game
Fix bug
<!-- 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

## Changelog

🆑
fix: Tajaran photocopier booty sprite fixed
/🆑
2024-07-04 09:14:14 +02:00
Waterpig
74160953d8 Upstream 24-07a 2024-07-03 23:29:42 +02:00
Waterpig
dd0cef2660 Merge branch 'master' of https://github.com/Bubberstation/Bubberstation into pr/1703 2024-07-02 19:46:32 +02:00
Waterpig
37afcb5004 Loadout update fixes 1 2024-07-02 18:17:39 +02:00
The Sharkening
6c9639cab6 Adds empath override to the .dme (#1713) 2024-07-01 17:27:13 +00:00
Cursor
e202001d47 Organizes the donator loadout stuff into it's own folder. (#1681)
<!-- 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

I also relocked the pocket watch, and made one that's unbroken.

![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/4cf16bb9-2753-4319-950a-71a078f1b19e)
TL:DR Everyone walking around with broken pocket watches set to 7:07pm
makes no sense.
It works and looks exactly the same. The difference is the new one can
tell time as well. So it's kinda an upgrade.



<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Joe Hill's famous last words were "Don't waste any time in
mourning—organize."
Admittedly he meant something entirely different but, still. It makes
everything neater.

## 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. -->

🆑
add: Someone finally repaired the damn pocket watches (may need to check
your loadouts)
spellcheck: Made a few loadout item names headline consistent.
code: Moved ckey locked loadout items to their own folder.
/🆑

<!-- 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>
2024-06-30 09:20:27 +00:00
BurgerLUA
914d56aa6d [Ready] Nerfs Bow because I saw someone die to it once (#1617)
Modular Remake of #1603 

## About The Pull Request

Significantly nerfs all arrows across the board.
Tribals now deal bonus damage with bows to compensate.

## Stat Changes

### Damage
Damage has been reduced significantly, however damage has been increased
for Ashwalkers/Icemoon Dwellers to compensate.

### Damage against armor
The armor rating of foes is now artificially doubled when calculating
attacks. Does not apply if you're an ashwalker.

### Armor Penetration
All non-lavaland arrows now have no armor penetration.

### Wounding
Bows can no longer wound when wearing armor, but they can still wound
with no armor.

### Embedding
All arrows have a 100% chance to embed, however the penalties for
embedding has been significantly reduced.

### Dismemberment
Arrows can no longer dismember/disembowel.

## Why It's Good For The Game


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/25f3b277-0c56-46f8-b770-9350c5e1a478)

## Proof Of Testing

Untested :)

## Changelog

🆑 BurgerBB
balance: Significantly nerfs all arrows across the board.
/🆑

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-30 08:55:36 +00:00
ForrestWick
db2292bf2a [MODULAR] Reduce Empath point cost (#1691)
<!-- 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

Just lowers the cost of the Empath trait by 2 points, down to 4.

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Skyrat already lowered this thing from 8 to 6, but it looks like TG made
some big changes to it since then and now it's basically just a flavor
thing. Personally I'd rather it be 2 points, but I got told 4 would be
best so here we are. Most of the stuff you get from it isn't exactly
powerful enough to warrant a 6 point price.


## 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. -->

🆑
balance: lowered Empath cost from 6 to 3.
/🆑

<!-- 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. -->
2024-06-29 06:18:54 +00:00
pixelkitty286
97c8e48187 Bug fix / refactor-ish to cyborg resting procs (#1657)
<!-- 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

Fixes bug caused by
https://github.com/Bubberstation/Bubberstation/pull/1641 not allowing
non small quad cyborgs to change rest states

Adds missing verbs for some cyborgs back.

<!-- 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

<!-- 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. -->

It fixes a bug I caused sorrwwyy.

## 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. -->

Not sure how to show it working other than saying I compiled it gave the
missing verbs back that were gone.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
del: dogborgs (they are quadrupeds now)
fix: Verbs not being available to both tall and dog borgs to rest
code: See refactor. Removed dogborg procs(commented them out)
refactor: small quadrupeds, large quadrupeds, and Tall cyborgs resting
verb and how it populates
/🆑

<!-- 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. -->
2024-06-28 22:33:26 +02:00
Waterpig
55550cb524 Upstream fixes 2024-06-28 10:02:14 +02:00
pixelkitty286
16f66806de F3-LINE cyborg updates attempt 2 [Modularish] (#1641)
## About The Pull Request

This attempt two of
https://github.com/Bubberstation/Bubberstation/pull/1636

Makes the sprite file resolutions from 64 x 32 to 32 x 32 for cat borgs

Makes 32 x 32 quadruped cybrogs into it's own borg type with it's own
quadruped module of it's own.

Allows only station standard cat borgs to be hold able, non standard can
not be held.

Adds code for cyborgs to indicate when they are being held.

Makes cyborg that are being held unable to interact items around them,
they can still break free any time.

This does not allow cyborgs with shape shifting to be picked up it only
allows the REAL model to be held.

A slight change from the last PR is the addition of a cargo variant of
cat borg.

<!-- 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

<!-- 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. -->

I've always wondered why can't I make cat borgs hold able and also make
it so it don't have sweeping mechanical changes to the game so I came up
with a way to allow them to be held disabling their abilities to
interact with much wile being in a held state and being almost
unbaggable.

Cargo cat borg was added since there was no variant.

Making the sprites 32 x 32 means they won't look so offsetted when using
things quite as often.

Cent Com don’t want you to know this but the the cat borgs on space
station 13 are free you can take them home I have 458 cat borgs at home.

## 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. -->


![dreamseeker_wBPMde6WO5](https://github.com/Bubberstation/Bubberstation/assets/78038207/8830cb9f-a281-44d0-9527-3b4bba8320c1)


![dreamseeker_xTFBOmZHyJ](https://github.com/Bubberstation/Bubberstation/assets/78038207/4dd933b8-e431-4d1a-9a98-18265c50be8e)


![sc19jFbsn7](https://github.com/Bubberstation/Bubberstation/assets/78038207/95c9e0af-bd0d-4c9f-948a-c4f101f892b4)


![dreamseeker_mmNECEkkUe](https://github.com/Bubberstation/Bubberstation/assets/78038207/cf0f743d-7b78-49eb-b833-10c58d369853)

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: holding code for cyborgs
del: Old 32x32 F3-LINE sprites
image: 32x32 F3-LINE sprites and a cargo variant
code: preventive flags to indicate when held
admin: Two robot traits added to the trait list
/🆑

<!-- 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. -->
2024-06-16 11:31:08 +02:00
Cursor
f08329fe41 Crewimov is printable now. (#1644)
<!-- 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


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/590ecd3f-c1ab-46b6-b0e2-eba9fa859dcd)

![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/9c4db521-f463-425c-9610-ce0e67b1391b)

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

We should probably have stuff that's in the code usable outside of
bussing.

## Proof Of Testing

See above.
## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Crewimov related modules are printable 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. -->
2024-06-15 13:17:10 -04:00
GooglyFox
a5c56c6f54 Integrates TG Station High-Vis Security Officer Jacket [MODULAR] (#1639)
## About The Pull Request

Adds the High-Vis TG Station jackets, made by DrTuxedo, as well as also
a Peacekeeper variant. Purely for style choices.

## Why It's Good For The Game

This is only for the people who like different kinds of style then what
they have currently.

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/114542226/c4cf08c7-121f-42c5-9724-e29313382fef)

## Changelog

🆑
add: Adds Security High-Vis Jacket Red and Blue variant.
image: Added icons of both variants.
code: Added code for both variants.
/🆑

Example of what it would look like.

![image](https://github.com/Bubberstation/Bubberstation/assets/114542226/8bb6d019-06c5-47d5-a191-79f0b560ca0d)
2024-06-15 04:46:27 -05:00
pixelkitty286
ec08538e05 Re-adds the blues space RPED for engineering cyborgs (#1642)
<!-- 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

<!-- 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. -->

As the tin says

## Why It's Good For The Game

<!-- 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. -->

BRPED was removed on accident from a change that was not noticed because
it was not modularized I have since modularized the change.

## 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. -->

Tested locally it compiled and made sure it did as intended

## 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. -->

🆑
fix: engineering borg BRPED upgrade re-added
/🆑

<!-- 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. -->
2024-06-13 01:28:49 -04:00
Cursor
33aeffd25b Killing the Module Folder with a Chainsaw and taking it's skin for a mask. (#1624)
## About The Pull Request

Title. This WILL break shit. Probably. Help me sweet Jesus.

## Why It's Good For The Game

House of Leaves is less confusing than our file structure.

## Proof Of Testing


## Changelog

🆑
fix: MASSIVE File Structure clean-up.
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-12 18:59:14 +02:00
Waterpig
b27fbfd53c Adds more information to the storyteller stack trace and fixes the flaky runtime (#1630)
## About The Pull Request

My guess is that it's the objective track or roundstarts but still
better fix it now than never.

## Why It's Good For The Game

Should give us the green checkmark

## Proof Of Testing

N/A

## Changelog

🆑
code: The storyteller failed to pick events runtime now includes more
information
/🆑
2024-06-12 10:39:48 +02:00
Cursor
9980e3c92e Improves the server by adding more Marge (#1578)
## About The Pull Request




![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/d1b4d8c8-6ba0-4f8b-a9f2-4c2a4a1fa8f7)

## Why It's Good For The Game


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/46f76e71-2f3d-4a61-bc60-c27217a3e221)
By using a team of expert analyticians they all agreed on two things;
One, if I left without causing any further trouble they wouldn't call
Security, and two, Bubberstation is lacking a severe amount of Marge.
This PR will hopefully improve Marge statistics by 15.6% in the next
quarter.

## Proof Of Testing


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/dcef8d50-782d-4cd4-9daa-1eca71e2761f)


## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Marge has breached containment.
/🆑

<!-- 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. -->
2024-06-11 16:17:36 +02:00
Cursor
bc44b8e3c5 [Hot Fix] WHY WERE THEY USING THE ONBJ FOR BOTH AAAA (#1620)
WHY
WHO DONE THIS
WHY WERE THEY BOTH USING THE SAME DMI FOR ONMOB AND OBJ
## Changelog

🆑
fix: Drill Hats ACTUALLY work.
/🆑

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-10 16:18:43 +02:00
BurgerLUA
dacfdcbbd4 Increases the chances of the Wizard Die of Fate event running. (#1586)
## About The Pull Request

Increases the chances of the Wizard Die of Fate running from a weight of
1 to a weight of 3.
For reference, Blob has a weight of 10.

## Why It's Good For The Game

I've personally never seen this event actually trigger because it's so
rare.

## Proof Of Testing

Untested :)

## Changelog


🆑 BurgerBB
balance: Increases the chances of the Wizard Die of Fate event running.
/🆑

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-10 09:09:05 +00:00
pixelkitty286
7f6cddac52 Adds Research cyborgs [Modularish] (oh no) (#1407)
## About The Pull Request

This PR added a new module for cyborgs it also ~~replaces the
malfunctioning AI cyborg factory~~ with the ability when hacked to
manufacture cyborgs manually (Cyborg building CO-OP) Malfunctioning AI
cyborg factory was added back.

The PR also adds a research cyborg exclusive jaunting module, much like
the ninja energy sword and hierophant, when they are emagged or hacked.

An alterative way was added to remove cells on cyborgs to allow for
cyborgs to upgrade ONLY cells. Other upgrades are restricted to balance
them.

This comes with a few base sprites for the research cyborgs more will be
added later or in a future PR.

## Why It's Good For The Game

I've always wondered why the research department never had cyborgs of
their own, but own them.

Research cyborgs are for a dedicated cyborg type assisting the research
department.

~~Disabling the robot factory was done because the printer would just
shit 3 to 4 cyborgs at once and make them out of nothing.~~

It was added with and optional Cyborg CO-OP to encourage the cyborgs and
the AI to make cyborgs them self if they wish for more cyborgs.

Research cyborgs were given jaunting and a stun arm to hopefully allow
them to evade capture. In other words they are to run when hunted as
they are mostly defenseless (fighting back is a bad idea.)


## Proof Of Testing


NOTE: These images taken were during development and may be missing a
few items. Also some items may have been removed wile testing.

LIST OF ITEMS REMOVED:
Dropper
Syringe
Mech gripper

Stock

![dreamseeker_zPm0yyoOZC](https://github.com/Bubberstation/Bubberstation/assets/78038207/267bb6d8-6042-451b-9678-7d7907f53bd0)


Fully upgraded

![dreamseeker_qyG5Oq1cav](https://github.com/Bubberstation/Bubberstation/assets/78038207/a53dffb1-2d75-4e0f-95f5-5971403c2c7d)


Emagged

![dreamseeker_nQcm41bycd](https://github.com/Bubberstation/Bubberstation/assets/78038207/2618afe6-8d04-40fe-a8bf-e8550e3e4fcf)
Note: NO EMAG

![dreamseeker_tNIapvYTHM](https://github.com/Bubberstation/Bubberstation/assets/78038207/98f76dcf-d042-474f-94f7-2d1923755524)



## Changelog

🆑
add: Research cyborgs
add: ability to pry cyborg cells out 
del: ~~disabled malf cyborg factory~~
qol: made an alt method removing cells
balance: rebalanced cyborg making
image: Sprites for research cyborgs
code: what ever needed to get the cyborgs working
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
2024-06-10 10:53:57 +02:00
nevimer
a6db77b79f We need glasses (or a linter)
weh
2024-06-09 16:31:52 -04:00
nevimer
8aa2bac44c add blovy loadout entry 2024-06-09 14:01:04 -04:00
Cursor
7eecfbe992 E (#1619)
<!-- 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


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/9bf81b26-ef25-4423-a753-05c49573906b)


<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

We aren't Skyrat, and words should be spelled right.

## Proof Of Testing

Trust is a fine thing.
## 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. -->

🆑
spellcheck: Removed a reference to Skyrat, and a spelling mistake in the
Credits.
/🆑

<!-- 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. -->
2024-06-09 14:36:09 +02:00
Waterpig
9b7c5e1065 Merge branch 'master' into upstream-2406b 2024-06-09 11:16:35 +02:00
Cursor
ed25c7269a Campaign Trail: Fixes the obj sprites of some hats. (#1604)
<!-- 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

Title.
I also fixed an oversight from my last PR.

I also merged another loadout folder into the main one because holy shit
we need to start cutting down on that and organizing it.

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Objs should be clickable.
File structures should be easy to use.

## Proof Of Testing

TBD

## Changelog

🆑
del: Tiny loadout folder is now annexed into the bigger one.
qol: Drill hats are clickable and are in the command vendor. (Thanks to
F13 for the OBJ sprite.)
/🆑

<!-- 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. -->
2024-06-09 01:44:57 +02:00
Waterpig
ea0c979e66 upstream-2406b 2024-06-08 18:43:30 +02:00
gavla
221aa5f7b3 small fix to the donator items (#1597)
## About The Pull Request

This fixes a few things in my last PR
(https://github.com/Bubberstation/Bubberstation/pull/1537).

-The ckey restriction for a loadout outfit set was fixed.
-Ringing bell collars chime less often reduced from 5 steps to 10 steps.
-And ringing bell collars are now in the dorms/lustwish vendor under the
restraints tab.
-Pink clown dress set is accessible for all to the loadout.
-Adds a squeakless version of the pink clown heels to the loadout.

## Why It's Good For The Game

the total happiness in the world will go up.

## Proof Of Testing

Tested on local. No Errors.

## Changelog

🆑
fix: fixed a few donator items.
/🆑

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
2024-06-07 19:26:59 +00:00
BurgerLUA
e24003bc16 Adds a damage threshold + RNG requirement for EMPs affecting heads and torsos, as well as organs inside those two. (#1424)
## About The Pull Request

Adds a damage threshold + RNG requirement for EMPs affecting heads and
torsos, as well as organs inside those two.
For every point of damage on the bodypart (or if you're an organ, the
bodypart you belong to), there is a +2% chance for that bodypart (or
organ) to trigger the effects of EMP. This chance is doubled if it's a
heavy EMP.

Example, if your torso has 25 damage, and you were affected by an EMP,
your torso has a 50% chance to suffer the default effects of EMP. All
your organs inside your torso will EACH roll the 50% chance to be
affected by the EMP, regardless if your torso was EMP'd or not.

Graph here: https://www.desmos.com/calculator/7sdtn22uda

**Note that some effects can still trigger, such as stun and blindness,
regardless of damage. This is intentional.**

## Why It's Good For The Game

EMPs are super strong against synths. Perhaps unreasonably strong. This
PR nerfs this by making it so that you actually have to do some damage
to the synth before you can EMP them for an instant win. The
justification for this is below:


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/2b05fca7-df59-451d-a88e-eb59f51af478)

TL;DR, if your electronics are enclosed in steel, it won't suffer the
effects of EMP unless there are holes (damage).

## Proof Of Testing

Draft because untested.

## Frequently asked questions

### Synth main????
I have never played synth because I am not sexually attracted to metal.

### Does this affect cyborgs?
This PR does not change cyborg EMP behavior.

### Does this affect legs and arms?
This PR does not change leg and arm EMP behavior, since they're jointed.

## Changelog

🆑 BurgerBB
balance: Adds a damage threshold + RNG requirement for EMPs affecting
heads and torsos, as well as organs inside those two.
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-04 18:23:46 +02:00
Cursor
f438413b8c Halo, for angel characters. (#1591)
<!-- 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


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/2898deea-47c3-450a-8268-eb8896954efa)

The Sprite is from Aurora, though I found it in the Virgo base.
<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Demonic-like characters are pretty popular. Their unfallen counterparts
on the other hand? Not so much.
I think having a halo might help with some of that. 

As a note, I couldn't get the behind sprite to look right. If you know
how to fix that. Free GBP.

Why horns? I had no idea what else fit.  I felt ears were too much.

## 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. -->

🆑
add: A Halo is a new 'horn' option for angel characters. 
/🆑

<!-- 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>
2024-06-04 11:27:20 +02:00
Cursor
7167f96c37 Sending in the Clowns: More Clown outfits. (#1576)
<!-- 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


![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/45ad0260-6914-4003-ac7e-03fd20f09846)

![image](https://github.com/Bubberstation/Bubberstation/assets/102828457/3cb9ecf5-397a-421c-b705-e29906d885ea)
Credits are in the files.

## Why It's Good For The Game

I like Clowns, a lot of users like clowns.
Other than the weird fact that there's orange/red/blue/etc uniforms but
no matching masks, the other two outfits allow variety.

Or something.
I also re-added clown cryto as...We aren't Skyrat, and they removed it
during the Clown Purge. Barely anyone does cryto. If this ends up being
trouble, it can be reverted.

Oh and thank you to
https://github.com/Bubberstation/Bubberstation/pull/848 for the vending
code.

## Proof Of Testing

See the screenshots.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Added various clown clothing into the autodrobe.
add: Clown Cryto is back.
code: Modular Vending code from Skyrat, but for us.
/🆑

<!-- 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: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
2024-06-04 00:22:43 +02:00
Arturlang
b29c74c3c9 Prompt for favorite vassal (#1596)
## About The Pull Request
Becoming a special vassal now gives you a popup that you have to refuse
or deny if you want to actually become one.

## Why It's Good For The Game
People don't like being becoming unconvertable without their input.

## Proof Of Testing
Tried it, tested refusing and accepting, victim become a special vassal

## Changelog

🆑
qol: Becoming a special vassal will now ask the vassal in question if
they wish to become it, and only go through if you accept it.
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
2024-06-03 18:10:37 +02:00
nevimer
ba2b366c7d Storyteller port from horizon [DNM] (#456)
<!-- 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
Ports storyteller from horizon, who deleted their repo. 

### How it works

_Written by Majkl-J_

Basically, the storyteller runs several "Tracks" that slowly fill up
with points. Upon reaching their set limit, an event is chosen and
spawned, and the storyteller takes a somewhat-random amount of points
from that track.


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/23b6f7ba-4d5a-45dc-9ed6-e88ed02ee019)

In this example, the moderate track will soon spawn an event.

Each track has its own sets of events it can spawn, sorted by intensity
(Roleset is midround and roundstart antags). Every event also has little
tags that the storyteller can be made to prioritize.

As with dynamic, events have a certain weight that determines the chance
they roll. Prioritized events get a multiplier to this weight.


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/136374ac-feb0-408f-89bf-c862167e2d47)

In this example, we can see some of the tags. Some storytellers can be
made to increase/decrease the weight of these events.

#### Extra stuff it does

Keeps track of med, engineering, and sec players. Whilst this still has
no actual usage, it is good to know it is capable of this.

## Why It's Good For The Game

Storyteller is an alternate event controller, in my opinion, superior to
dynamic.

## 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. -->

🆑 Nevimer, Majkl-J, BurgerBB, Azarak
add: Ported the storyteller event system from horizon
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: iero <>
Co-authored-by: Waterpig <wtryoutube@seznam.cz>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Return <donwest947@gmail.com>
Co-authored-by: BurgerLUA <8602857+BurgerLUA@users.noreply.github.com>
2024-06-03 17:24:04 +02:00
gavla
97cc8c86cf Every donator request. Finally. (#1537)
## About The Pull Request

This PR is meant to add toys, clothes, markings and more cosmetics
requested by donators of Bubberstation.
This was a task I assigned myself to take on for a long while. I decided
to push this out in a PR to track progress.

Artists: Crumpaloo, Casey/Keil, Wolf751, bitsynapse.

<details>
<summary>Full list of additions</summary>
<br> -Blovy's plush, bottle, and suit. ✓
<br> -Farren's markings, hair, tail, wings, more. ✧ (semi-complete. but
mostly good to go.)
<br> -Astroturf's plush. ✓
<br> -exfil's wings. ✓
<br> -patriot210's clothing set ✓
<br> -detrender's in-hand item ✓
<br> -ironknight060's clothing set and item. ✓
<br> -Gavla's birthday plush ✓
<br> -Big deer hand sprites ✓
<br> -Andrew Mower's plush ✓
<br> -Ringing bell collars (needs more modularization) ✓
<br>
<br>
<br>ignore the commits from May 1, 2024. I am bad at github.
</details>

## Why It's Good For The Game

Supporters of the server should receive in-game things as thanks.

## Proof Of Testing

Every commit is tested on my local beforehand before it is pushed. 



https://github.com/Bubberstation/Bubberstation/assets/96078776/833dbf4b-b63b-4205-8299-65ec7f170e81



https://github.com/Bubberstation/Bubberstation/assets/96078776/48ba3d2d-24ff-4535-b7d4-4b4f644627f2



https://github.com/Bubberstation/Bubberstation/assets/96078776/2b4ba30c-d7f4-4b6c-92d2-dcf5df7c78b2



![image
(6)](https://github.com/Bubberstation/Bubberstation/assets/96078776/c86c45de-661c-433a-a7fd-cb5a0ecb06e7)


## Changelog

🆑 Shayoki, Crumpaloo, Keila, Wolf751, bitsynapse.
add: Donator toys and clothes have arrived.

---------

Co-authored-by: Otome <darkwolfinsanity@gmail.com>
Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Swiftfeather <jackwars4@gmail.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
2024-06-03 08:45:16 +00:00
Waterpig
04484b817f Adds prefloading to bitrunning (#1551)
## About The Pull Request

Adds a new disky to bitrunning, which allows you to load any of your
prefslots in, and then spawn in the domain as that character.

Also, I asked the admins about this, believable character rules wont
apply inside bitrunning domains. So you can bring your meme chars there
as well.

## Why It's Good For The Game

People keep bullying me to add sex to bitrunning and who am I to say no

## Proof Of Testing

It seemed to work without deleting my prefs

## Changelog


🆑
add: Adds prefloading to bitrunning
/🆑

---------

Co-authored-by: Cyprex <35031555+Cyprex@users.noreply.github.com>
2024-06-03 10:30:32 +02:00
Waterpig
cdeeefccac Upstream 2406a 2024-06-02 13:39:31 +02:00
Boviro
a632d13ec5 Adds the Bobr 12 Gauge Revolver to the Goodies category in cargo (#1472)
<!-- 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
Note: I am working at the request of Aeri on discord, the "Good for the
game" category is her reasoning.
Adds the Bobr 12 gauge revolver to cargo under the Goodies category, it
costs 2000 credits, and comes with a box of shotgun shells to load it
with.
I believe 2000 credits (2x the price of the Sol pistols) is a fair price
for it, but I encourage others to weigh in on that value.
<!-- 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
Because it's enjoyable to use and not overpowered, so there's not much
reason not to.
<!-- 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
No major changes were made, just adding a new supply pack. It has been
tested locally and worked as intended.
<!-- 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. -->

🆑
add: Adds the Bobr shotgun revolver to cargo as a goody.
/🆑

<!-- 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: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: nevimer <foxmail@protonmail.com>
2024-05-31 00:33:42 -04:00
Return
90c7fdc1aa Releases some new genders (#1566)
<!-- 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 adds Transmasc and Transfem to the list of available genders in
the Character Directory list, because sometimes you need to know the
body type
<!-- 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
Enhances the ERP experience by differentiating between types of trans
<!-- 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
It do compile
<!-- 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. -->

🆑 ReturnToZender
balance: Releases two new genders, Transmasc and Transfem, for use in
the Character Directory.
/🆑

<!-- 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>
2024-05-27 16:52:37 +00:00
Kyogon
a30408bb5a New horn sprite - Biter's Horns (#1555)
## About The Pull Request

Adds in a new set of horns to character customization, the Biter's
Horns.
This is a very self indulgent addition, as these are Kyo's true horns
that I decided to sprite and add on a whim due to the lack of anything
fitting for her.

That's it, it's just those new horns.

## Why It's Good For The Game

I've needed proper horns for Kyo for a while, so I made them myself.
They'll be publically available too, so hey, anyone else who wants to
use Kyo's horns can!

## Proof Of Testing

Tested and the menu shows it, sprite is visible. Very minor addition,
not much room for error.

![image](https://github.com/Bubberstation/Bubberstation/assets/30851775/bd0b7439-347f-4192-a90a-777240dc1fff)

![image](https://github.com/Bubberstation/Bubberstation/assets/30851775/3cfc1ac6-30b0-4487-b6ac-063b55afc406)


## Changelog
🆑
add: Adds Kyo's true horns, named Biter's Horns.
/🆑
2024-05-24 09:12:26 +02:00
Return
54b8f5547f Moffington Actually Maintains His PRs: The Tired First Episode (#1482)
<!-- 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 does some misc. fixes to my PRs, particularly Waddle, to prevent
them from throwing errors and make them work properly.

<!-- 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
Bugfixes make the world go around
<!-- 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
TBD
<!-- 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. -->

🆑
fix: Fixed some indentation issues in tajaran.dm, adjusted some lines of
examine code to prevent runtimes, borg names show up on the examine
panel now instead of nothing
refactor: applies AddElementTrait to the waddling quirk, and mouse
waddling
/🆑

<!-- 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. -->
2024-05-22 20:11:03 -04:00
Waterpig
f4571bb133 You can now wear soup pots (#1503)
## About The Pull Request

![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/d3cdc93e-64ac-4ff5-85e6-ce8baf233201)

This also turns you blind, funny!


![image](https://github.com/Bubberstation/Bubberstation/assets/49160555/a033375d-f9d2-4449-834e-97ab028ef626)


## Why It's Good For The Game

You could already do so with buckets

## Changelog

🆑
add: Cooking pots can now be worn on your head
/🆑
2024-05-22 17:59:51 +00:00
VrazzleDazzle
34b4bb789a Adds one extra alt skin to the mining MODsuit (#1397)
<!-- 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
What it says on the tin. This adds the brimdemon-inspired Type-1 Mining
Personnel "1MP" suit as an alt skin to mining MODs.

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/163d7221-25ac-46f5-bbf3-9734f0041a37)

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/81086b16-bde5-4e8d-81f3-1498b00e0239)

Sprites courtesy of @Crumpaloo 
<!-- 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
More drip is always neat.
<!-- 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
The sprites have been visually observed.

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/18394aac-cf60-4538-823d-7646289e3d97)


<!-- 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. -->

:cl:VrazzleDazzle
image: Added one new alt skin to the mining MODsuit
/🆑

<!-- 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: Swift <jackwars4@gmail.com>
2024-05-22 16:07:17 +00:00
lexis
df5502a79d Pod ruin changes (#1365)
## About The Pull Request

Similar to #1338, but fixes the issue with the colony fab not existing
by spawning a flatpacked item version in a crate.
also adds scrubbers and some more space

## Why It's Good For The Game

Podpeople haven't been updated in.. never

## Proof Of Testing

![Screenshot 2024-04-08
213924](https://github.com/Bubberstation/Bubberstation/assets/127071388/07596ba4-63de-4752-be3f-4d99d669558d)

## Changelog

🆑
add: Added more stuff to the seed vault.
/🆑

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Swift <jackwars4@gmail.com>
2024-05-17 06:04:04 +00:00
BurgerLUA
1e71d76af5 Makes Ashwalker/Lizard names use a special name generator (#1518)
## About The Pull Request

Makes Ashwalker/Lizard names use a special generator, which either makes
its own name based on consonant/vowel pairs, or with the infamous
Verbs-The-Noun format.

Consonant/vowel generation will take up 80% of random names.
Verbs-The-Noun will take up 20% of random names.

Uses the ic/slur filter as well in case it generates Sus-Amongus or
something hilarious.

## Why It's Good For The Game

This is basically a test PR that I will eventually(tm) make for /tg/. I
just want to know what people think of it first.

The reason why I made this is because I made the mistake of using the
standard /tg/ generator for one of my static characters and it's
entirely possible for someone else to get the same name since there are
limited pickings (1 in 26569 for a female lizardperson).

## Proof Of Testing

Using the new debug verb provided:


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/ad8195ac-4ce8-4236-9c56-3e27d878c99d)


Example in the character creator:


![image](https://github.com/Bubberstation/Bubberstation/assets/8602857/85039df4-5321-47b7-aa1c-59cb37ad7585)


## 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. -->

🆑 BurgerBB
add: Makes Ashwalker/Lizard names use a special name generator
/🆑

<!-- 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: nevimer <77420409+nevimer@users.noreply.github.com>
2024-05-16 22:56:58 -04:00
tmyqlfpir
0dc046bfba (Mostly-Modular) Restore Ice Moon Interdyne Classic (#1306)
<!-- 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

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

Replaces Interdyne for Ice Moon with the old original version before
"Frozen Moonlight" version (a8b38abcd7).

<img width="899" alt="final"
src="https://github.com/Bubberstation/Bubberstation/assets/80724828/8434bde2-9a07-401a-bc37-a42c35f40d37">

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

The Frozen Moonlight revision is a rather controversial update of
Interdyne, which at best has had a mixed reception with regular ghost
role players. While I like some aspects of it, I feel (personal
opinion!) the overall design is weaker than the version it replaced.

It's also considerably 'finished' with all machines upgraded and
materials included, while this version of Interdyne at least has a
gameplay reason for Interdyne members to go mining.

I'd like to offer Interdyne ghost players something old and something
new:
* Reduced the overall number of spawns to match that of the "Frozen
Moonlight" version
* Added the "Frozen Moonlight" bridge to the external landing area
* Increased map size (52x57 -> 54x57) and thickened moat
* Copied SSV Dauntless armory over to room above research
* Rework the cargo and dorms to be more comfortable visually and
spatially
* Wall mounted fire extinguishers have been littered across the hallways
* All fire alarms are aligned to their walls
* Added more air alarms and fire locks
* Added bar seating so patrons are not forced to stand
* Add cargo express console and powerator to vault's filing cabinet
* Added an old abandoned jukebox in the morgue
* Added a pAI to the library crate
* Moved sentry near kitchen one unit away (so it won't shoot pets)
* Now uses a turbine for a source of power
* Added a crematorium to morgue
* New gym area

Additionally, the behaviors of machines linking to the techweb have been
changed.
* Machines built within Syndicate designated areas
(Interdyne/DS-2/Dauntless/Space Dauntless) will only be able to connect
the newly added Syndie R&D servers
* Machines outside of Syndicate designated areas (NT/Tarkon/Ruins/Etc)
will not be able to connect to the newly added R&D Syndie servers
* All Syndicate based ruins that spawn with a R&D server will share a
single techweb that is independent to NT

<!-- 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

I have compiled and tested to ensure it works in-game on Kilo and Ice
Moon, ensuring that Dauntless and Interdyne spawns do not conflict.

<!-- 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. -->

🆑
add: Restore classic Interdyne base for Ice Moon
fix: Department display screen no longer calls itself recursively
fix: Fixes vents in Dauntless bridge
qol: Adds new battle attack arcade machine in Dauntless prison
fix: Changed Dauntless brig radio freq
add: Add R&D servers to Dauntless/Interdyne ruins
qol: Only allow machines located within Syndie areas to connect to
Syndie R&D servers (and vice versa)
/🆑

<!-- 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: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: nevimer <foxmail@protonmail.com>
Co-authored-by: Swift <jackwars4@gmail.com>
Co-authored-by: Otome <darkwolfinsanity@gmail.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2024-05-16 22:11:26 -04:00
Waterpig
a8385f8081 Fixes linters (#1520)
We love outdated tools.

Also hi I am posting this from bed :3
2024-05-16 19:28:02 +00:00
nevimer
2b93e15a5a round end credits (#677)
<!-- 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
Round end credits. Port from Bay12


https://github.com/Bubberstation/Bubberstation/assets/77420409/5e1180b0-8c77-4cc7-8124-198e00d5e428



<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Content and it's cool.
## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Round end credits
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
Co-authored-by: Waterpig <wtryoutube@seznam.cz>
2024-05-15 01:04:47 -04:00
VrazzleDazzle
ecefca6154 Adds a new dress to the loadout. (#1493)
<!-- 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
PR'd for Gearsin on discord.

This adds one new dress to the loadout, the formal evening gown.

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/93013c4b-5dc0-4e49-9b70-9bca6bf6e58e)

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/39fa5f60-0761-4880-b069-066d71a4bda6)

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/e75866e5-5df4-4984-a914-b2546128bb9c)

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/96677862-ae5e-4938-b042-e4e8a31625b0)


<!-- 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
Clothing!
<!-- 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

![image](https://github.com/Bubberstation/Bubberstation/assets/21011148/dc08115c-5de6-42dd-9ed9-4357272fcd1f)
It works 👍
<!-- 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. -->

:cl:VrazzleDazzle
image: Added one shiny new dress to the loadout.
/🆑

<!-- 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. -->
2024-05-12 15:46:02 -04:00
Waterpig
6d1f9ecf15 Fixes bloodsucker sucking being obvious no matter what (#1491)
Untested and unhinged

## Changelog

🆑
fix: Bloodsucking no longer shows a cog above your head
/🆑
2024-05-08 17:05:55 +00:00
Waterpig
78d636a4ae [FIX] Removes the ability to adjust the command stripper outfit (#1480)
## About The Pull Request

No more needing to install CS:S mid ERP

## Changelog

🆑
fix: Command members no longer have to install CS:S mid erp because they
altclicked their stripper outfit
/🆑
2024-05-06 01:24:26 -04:00
nevimer
f9d8091e2c Add Marish and Shadekin Empathy (#1463)
<!-- 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

Adds Marish and Shadekin Empathy

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

Species lore shadekins.

## Proof Of Testing


https://github.com/Bubberstation/Bubberstation/assets/77420409/ce047836-57e6-4dcb-a9a2-82cdb42ad7d0



<!-- 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. -->

🆑 nevimer, roachwitharoach
add: Added Marish and Shadekin Empathy as languages. 
icon: added two icons for shadekin languages
/🆑

<!-- 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. -->
2024-05-06 01:23:33 -04:00