mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-02 13:02:38 +00:00
9acbfb51a466a267003628bb880df784d9161164
68 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
c3f788b8e7 |
Allow eating cyborgs with only a passive grab (since you can't do an (#2376)
## About The Pull Request Cyborgs can be eaten with only a passive grab on them now. ## Why It's Good For The Game No cyborg prey bad :C ## Proof Of Testing  <details> <summary>Screenshots/Videos</summary> </details> ## Changelog 🆑 fix: You can now eat cyborgs. /🆑 Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
|
1a7d805bb6 |
Brings back the old sombrero (#2358)
## About The Pull Request Reintroduces the sombrero to the vendors and adds it to the loadout.  As beautiful as the day we lost it. Also makes it not hide hair closes #2355 ## Why It's Good For The Game Cool item to add to char design, and keeps you from dying on moonstation! ## Proof Of Testing <details> <summary>Screenshots/Videos</summary>  </details> ## Changelog 🆑 add: Sombreros return to clothes vendors and loadouts qol: Sombreros no longer make you bald /🆑 |
||
|
|
d19bf6c1cd |
Makes loadout renamed items able to be examined when worn (#2349)
## About The Pull Request When an item is renamed due to loadout settings, it shows up as clickable on the examine of the person wearing it.  Clicking this link then makes the user examine this item further  ## Why It's Good For The Game Allows people's neat loadout item descriptions to be visible from an examine without any stripping needed. This means more reason to customize these items. ## Proof Of Testing See above ## Changelog 🆑 add: Loadout renamed/redescribed items can be examined when worn. /🆑 --------- Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com> |
||
|
|
0866418027 |
Adds a GAGS miniskirt to the loadout (#2269)
<!-- 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 As the title says <!-- 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 Currently the ONLY way to get a miniskirt is to steal a security miniskirt from a SecDrobe, this makes it so you can get a (non-armoured) one in the loadout as anyone, plus it's recolourable! <!-- 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 a GAGSified miniskirt to the loadout menu /🆑 <!-- 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> |
||
|
|
50cced00b0 | please help | ||
|
|
618d224402 |
Adds the Vortex Luxury Emergency Shuttle (#2091)
## About The Pull Request Adds a very expensive, yet luxury shuttle for people to buy on the communications console. Includes a massive list of items that normally a shuttle wouldn't have. Can be bought on the Comms Console for 300k credits, EMAG not required. Spare unique Head of Staff MOD's in Command's E.V.A. room. NTC and Blueshield get CentCom MODsuits, Corporate, and Asset Protection. (it's the emergency shuttle, the round is basically over). Shuttle comes with fully operational atmospherics, shocked window grilles, emergency window shutters in all rooms and garbage disposals. Shuttle also comes with a cleanbot, hygienebot, medbot, and two secbots, one in brig, and one in common seating. Command have 2 Authentication Devices, 3 mini energy guns in bridge, with 3 spare telescopic batons, a boozemat, as well as a combat medkit. Along with their unique Tarkon protolathe reskinned to be a Command protolathe. Not to also forget, a Request Console with announcement access. Medical has advanced medical kits, a SAD, advanced surgery tools, vendors to vend supplies, a limbgrower with two spare beakers of synthflesh, as well as a Protolathe. Security has 2 spare batons, a set of Redsec armor, an old SecTech (Non-Armadyne security vendor), Mindshield box, and a spare SC-2 Energy Carbine. Engineering has the basics, but advanced tools, a corpse and 3 SMES's full of power to charge the window grilles. As well as 4 spare engineering MODsuits. Engineering also has a box of materials, to insert into the protolathes. Atmospherics has the basics, but smart foam grenades incase of breaches in the shuttle, RPD's for no reason, and advanced tools. As well as 2 spare Atmospheric MODsuits. # It's been tested, all works fine. ## Why It's Good For The Game It's a good change for the game to give crew a different means of escape, after getting tons of money for a good job of Cargo, they deserve a nice trip home in one of the best evacuation shuttles. ## Proof Of Testing ## After attempting to run.  ## Looking In-Game.  ## Changelog 🆑 add: Added the Vortex-Class Luxury Evacuation Shuttle. /🆑 # Vortex-Class Luxury Evacuation Shuttle  --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
|
ff590ce7b4 | getting it to compile | ||
|
|
996aa5a740 |
Replace modular medsecHUD with TG version (#2192)
## About The Pull Request TG now has the medsecHUD upstream, removes the modular Bubber version. Instead applies the bluesec SR icons to the variants. Adds the medic vest/labcoat to the orderly garment bag Reduces the amount of full spare Orderly gear sets from 2 to 1. ## Why It's Good For The Game - Code/item duplication - Orderly drip ## Proof Of Testing  ## Changelog 🆑 LT3 code: Bubber medsecHUD replaced with TG version add: Medic labcoat/vest added to Orderly garment bag /🆑 |
||
|
|
0077be5e32 |
[Ready][Until ANOTHER FUCKIMNG MERGE CREATES CONFLICTS GOD FUCK] Reflavors a lot of Bloodsucker stuff to be more in line with it's source (#2104)
## About The Pull Request Title. ## Why It's Good For The Game My love of VTM cannot stand things such as 'blah-sucker', 'vassels' or 'archive of the kindred'. The Blah-Sucker language has been renamed to Enochian, reflecting the First City of Vampires, Enoch, in the land of Nod east of Eden where the Dark Father Caine was exiled from. (Front facing) mentions of vassels have been replaced with the accurate Ghoul. They drink vitae to establish a bond with their master, not blood, vampires do not produce blood, they drink vitae. The Archive of the Kindred has been replaced with the Book of Nod. Well, a version of it. Cainites are protective of the hidden knowledge kept within and would be unhappy with the mortals (you) having a copy. Objectives have been re-written to mention lore aspects. ## Proof Of Testing 🆑 spellcheck: Various Bloodsucker things have been renamed after the Inconnu paid a visit. /🆑 --------- Co-authored-by: Waterpig <wtryoutube@seznam.cz> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> |
||
|
|
65b57be61e | Gravity generator blackout announcement/sound changes (#2185) | ||
|
|
de51b0e1ab |
Removes visual indicators for pressure/temp adaptation (#2159)
<!-- 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 Originally made by BurgerBB, see #2026 <!-- 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 These visuals are annoying, and don't serve much gameplay purpose other than to make you look bad, which is lethal. <!-- 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 Gonna begin testing tomorrow. <!-- 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. --> 🆑 BurgerBB del: Removes visuals for temperature/pressure adaptation. /🆑 <!-- 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> |
||
|
|
abea882914 |
Bloodsucker power refactor (#1458)
<!-- 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 Refactors bloodsuckers powers heavily and changes around a lot of few powers work and even removes a lot of copypasta from tremere powers. fixes #1384 <!-- 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 Currently Tremere is pretty meh compared to other bloodsuckers, and bloodsucker powers use a lot of code that actions now implement themselves. <!-- 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 basically test almost every change, as part of how I work, obviously not completely thoroughly thus testmerges,. <!-- 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: Heavily refactors how bloodsucker powers function. refactor: Tremere powers no longer have subtypes for each level. add: Completely redoes how bloodsucker ability descriptions, both the longer antag panel and the action button hover over, they will actually tell you actual values that the game itself uses for damage, cooldowns, and effect durations balance: Tremere powers can now level up as far as you want. balance: Mesmerize is heavily reworked, now it no longer forces both parties to stand still for it to work, but it is obvious to the victim when used, however the victim is muted for the duration of the spool up, and will stun and mute normally if the do_after completes. add: Mesmerize now has a secondary that allows you to mute and confuse your victim that happens on a right-click, dominate, the tremere's version instead knockdowns. add: Tremere's dominate now has a visual timer for temporary vassals, visible only to the master's vassals and the master themselves. balance: Tremere's dominate now only requires level 2 to create temporary vassals, but the duration now scales with the level. It now requires the potential vassal to have more than 336 blood, and will use it all up once the duration ends, effectively making it only usable once per person. balance: All tremere powers can now level up past level 4 balance: Thaumaturgy is heavily reworked, it now has a charge system, and while the projectile deal less damage, you can shoot a lot more of them, and the projectiles will seek towards any non-vassal mob near where you cast it. refactor: Separates bloodsucker ability bitfields and action bitfields to avoid overriding eachother balance: Bloodsuckers going into torpor outside of coffins will always die, but will wake out of torpor at 20% maxhealth(not counting critical health) balance: A coffin being opened during sol will wake you up, given you are LITERALL BURNING UN-ALIVE. /🆑 <!-- 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: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
|
45a373cdfa |
Bubber CI checks (#1830)
<!-- 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 support for bubber-related code for the CI checks <!-- 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 Helps ensure code sanity. <!-- 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 CI checks <!-- 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. --> --------- Co-authored-by: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Co-authored-by: Swift <jackwars4@gmail.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Co-authored-by: Kyle Spier-Swenson <kyleshome@gmail.com> Co-authored-by: thegrb93 <grbrown93@sbcglobal.net> Co-authored-by: SpaceLoveSs13 <68121607+SpaceLoveSs13@users.noreply.github.com> Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@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: Shadow-Quill <44811257+Shadow-Quill@users.noreply.github.com> Co-authored-by: KathrinBailey <53862927+KathrinBailey@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: snailomi <148835423+snailomi@users.noreply.github.com> Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com> Co-authored-by: Lutowski <136726218+Lutowski@users.noreply.github.com> Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com> |
||
|
|
cb9535e7bb |
[Bounty] Vore 4.0 (#1808)
## About The Pull Request A ground-up rewrite of Vore 3.0 (Virgo's current system) as a /datum/component. Resolves #464 Resolves #845 Remaining work: - [ ] Fix any bugs found in testing ## Why It's Good For The Game See bounty. People want this to enjoy themselves. ## Proof Of Testing            ## Changelog 🆑 add: Mechanical Vore /🆑 <!-- 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 new mechanics or gameplay changes add: Added more things del: Removed old things qol: made something easier to use balance: rebalanced something fix: fixed a few things sound: added/modified/removed audio or sound effects image: added/modified/removed some icons or images spellcheck: fixed a few typos code: changed some code refactor: refactored some code config: changed some config setting admin: messed with admin stuff server: something server ops should know /🆑 --> <!-- 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> |
||
|
|
a59080f7ff |
Modularizing things (#1914)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request does as the title says <!-- 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 players wont notice this but it gets rid of a tiny bit of things that coulda been modular, but were not <!-- 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 compiles: dude trust me <!-- 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. --> 🆑 refactor: modularizes a few things /🆑 <!-- 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. --> |
||
|
|
1cc783195b |
Alternate versions of bone and drake armors (#1890)
## About The Pull Request https://github.com/Bubberstation/Bubberstation/pull/1829; TLDR adds old versions back. Although, the snouthole skull mask has been pushed aside until the proper spritework is finished. I might have fucked up my merge conflict resolutions earlier. Notably - by request - the bleached variants do not hide your hair. ## Why It's Good For The Game ## Proof Of Testing   (note that snout hole variant is pictured but removed - but the appearance is pretty much the same)  ## Changelog 🆑 add: Bleached (old appearance) variants for drake suit& bone+skull armor; and corresponding crafting recipes to swap between appearances /🆑 --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> |
||
|
|
74160953d8 | Upstream 24-07a | ||
|
|
55550cb524 | Upstream fixes | ||
|
|
472a75218b |
Hydrophilic selectable again (#1593)
<!-- 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 Species was changed so this should work now also I forgot to fix the helmet icon for the idma so i figured i should do that <!-- 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 Fixing good <!-- 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 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: Due to a genetic sequencing error, hydrophilic slime people have once again been spotted on the station /🆑 <!-- 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. --> |
||
|
|
6fe6e40fe0 |
Moonstation Mega Multi-Z Update (#1541)
 ## About The Pull Request Destroying floor tiles on the Moonstation upper level can lead to a chasm that drops you down to the middle cave level. Note that you can't get dropped down to lavaland. The middle cave level is now breathable air; the same as the surface. Several areas were tweaked and some areas were added to include additional ladders that lead to the surface. The prison is now "harder" to escape, with an already-existing chasm outside the windows. ## Why It's Good For The Game It might actually not be because it means people might die to the mobs under there, and then get upset. Lets find out. Regardless it looks pretty cool. ## Proof Of Testing See screenshots. ## Ladder Routes  Routes marked with * require additional access. ## Changelog 🆑 BurgerBB add: Destroying floor tiles on the Moonstation upper level can lead to a chasm that drops you down to the middle cave level. Note that you can't get dropped down to lavaland. /🆑 --------- Co-authored-by: Swift <jackwars4@gmail.com> |
||
|
|
a6605502e1 | Upstream 2405b | ||
|
|
b09be8af2d |
[modular] Renames the code for Inquisition ERT from Spanish Red to just Unexpected because admins keep asking me why I'm sending red alert ERTs (I'm not) (#1488)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. --> <!-- You can view Contributing.MD for a detailed description of the pull request process. --> ## About The Pull Request Does what the title says <!-- 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 Differentiates it more clearly from actual red alert ERTs <!-- 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 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. --> 🆑 qol: its now easier to tell what ERT is being spawned /🆑 <!-- 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> |
||
|
|
ece80867e7 |
Moonstation Weather Damage Overhaul (#1443)
## About The Pull Request ### Overhauls Moonstation weather damage. It is now much more complex. Wearing clothing with at least minor heat protection will protect that limb from sandstorm damage. Note that some clothing items can protect multiple regions. Wearing eye protection or pepperspray protection can shield you from the new blur effect added. Wearing any sort of eye covering at all can shield you from the new eye damage effect added. ### Adds new heat protection classes to themed items. All cowboy boots, ponchos, sombreros, and cowboy hats now have minimal heat protection. ### Updates EVA storage and Public Mining storage Removes some EVA suits and replaces them with Ponchos and Sombreros. Also sunglasses included in EVA storage. 😎 ## Why It's Good For The Game People requested this. ## Proof Of Testing I tested it, okay. ## Changelog 🆑 BurgerBB balance: Overhauls Moonstation weather damage. It is now much more complex. EVA storage was changed as a result. Fixes some Moonstation lights as well. /🆑 Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com> |
||
|
|
a8b8804449 |
Moonstation Upstream Merge + Bonuses (#1413)
## About The Pull Request Updates Moonstation to work with new upstream additions. Additions include: - Photobooths - Chalkboards for Chef, Bartender, and the Coffee Shop - Piggy Bank Vault - New Fax Autoname Also placed some random minor bullshit not worth listing here, such as a free Golden Desert Eagle for the Quartermaster. ## Why It's Good For The Game Eh ## Proof Of Testing It works. ## Changelog 🆑 BurgerBB add: Moonstation Upstream Merge and Bonuses /🆑 --------- Co-authored-by: Swift <jackwars4@gmail.com> |
||
|
|
45e52eb774 |
Merge remote-tracking branch 'skrat/master' into new-bubbermaster
# Conflicts: # _maps/RandomRuins/SpaceRuins/hilbertresearchfacility.dmm # _maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm # _maps/map_files/Birdshot/birdshot.dmm # _maps/map_files/Deltastation/DeltaStation2.dmm # _maps/map_files/IceBoxStation/IceBoxStation.dmm # _maps/map_files/MetaStation/MetaStation.dmm # _maps/map_files/NorthStar/north_star.dmm # _maps/map_files/VoidRaptor/VoidRaptor.dmm # _maps/map_files/tramstation/tramstation.dmm # _maps/shuttles/pirate_ex_interdyne.dmm # code/__DEFINES/mobs.dm # code/__HELPERS/~skyrat_helpers/is_helpers.dm # code/datums/mood.dm # code/game/objects/effects/spawners/random/random.dm # code/modules/admin/verbs/adminhelp.dm # code/modules/clothing/head/jobs.dm # code/modules/mob/living/brain/brain_say.dm # code/modules/projectiles/guns/energy/kinetic_accelerator.dm # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly.png # code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_stargazer.png # code/modules/uplink/uplink_items/job.dm # config/lavaruinblacklist.txt # icons/mob/actions/actions_changeling.dmi # icons/mob/clothing/mask.dmi # icons/obj/mining.dmi # modular_skyrat/master_files/code/modules/client/preferences/headshot.dm # modular_skyrat/master_files/code/modules/mob/living/examine_tgui.dm # modular_skyrat/master_files/code/modules/research/techweb/all_nodes.dm # modular_skyrat/master_files/icons/mob/clothing/under/skirts_dresses.dmi # modular_skyrat/master_files/icons/obj/clothing/under/skirts_dresses.dmi # modular_skyrat/modules/aesthetics/airlock/icons/airlocks/multi_tile/metal_overlays.dmi # modular_skyrat/modules/colony_fabricator/code/appliances/space_heater.dm # modular_skyrat/modules/company_imports/code/armament_datums/deforest_medical.dm # modular_skyrat/modules/hyposprays/code/hypospray_kits.dm # strings/traumas.json # tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/character_preferences/skyrat/headshot.tsx |
||
|
|
991a1d0ece |
[MODULAR] Dauntless map tweaks and bounty pad (#1374)
<!-- 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 tweaks the following things for dauntless lava ruins: * Removes improperly copied decals under hull tiles * Adjusts the recreational area for the brig * Adds many exterior cameras to the dauntless, and removes many interior ones (except for those in brig & interrogation) * Adds a maxcap of 1MW to the powerator * Adds a modified pirate bounty pad that allows the Dauntless crew to sell off goods for credits * Adds a produce order console to the kitchen which is linked to the Interdyne budget account * Adds a new area variable called `ignore_weather_sfx` which bypasses weather sfx (this is applied to the Dauntless) <!-- 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 This PR removes the possibility for the AI to go snooping in the Dauntless super sekret base, and can only view the exterior. It also tweaks areas such as dorms and brig to be easier on both the eyes and for movement. The new bounty pad will allow players to use alterative forms of money, be it selling off the ore from netrunner gaming den, or other making goods for credits. This means they are not relying on using the powerator (which has been capped at 1MW). <!-- 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 ran this map on my local server and confirm it works. The bounty pad works and I have ensured that there are enough sanity checks for it to not crash or break anything. It should not affect on station cargo prices. https://github.com/Bubberstation/Bubberstation/assets/80724828/f8b5210a-4664-4c4b-8c6e-be17385f41c2 <!-- 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: Dauntless - Add exterior cameras to dauntless, removed many interior ones fix: Dauntless - Removed incorrectly placed decals under hull objects and tweaked brig/dorms balance: Interdyne powerator is now maxcapped to 1MW add: Dauntless - Added new bounty pad and bounty console add: Dauntless - Added new produce order console /🆑 <!-- 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> |
||
|
|
9cadbf1304 |
Disables Station Blackout and Random Machine Languages Station Traits (#1399)
## About The Pull Request Disables the Station Blackout and Random Machine Language station traits. ## Why It's Good For The Game Station Blackout would kill all the lights on station. This was awful, especially if there was no janitor. Random Machine Language would give a random language to every machine that speaks and every bot. This was annoying since it affected cryo announcements and arrivals announcements. ## Proof Of Testing If it compiles, it werks. ## Changelog 🆑 BurgerBB del: Disables Station Blackout and Random Machine Languages Station Traits /🆑 <!-- 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. --> |
||
|
|
fef99145a9 |
Oh Hi Daniel shuttle no longer throws. (#1353)
## About The Pull Request Oh Hi Daniel shuttle no longer throws. ## Why It's Good For The Game Issues with thrown items sometimes breaking the walls and/or creating a mess on transit, which leads to the shuttle being spaced before the shuttle arrives. ## Proof Of Testing idk ## Changelog 🆑 BurgerBB fix: Oh Hi Daniel shuttle no longer throws. /🆑 <!-- 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. --> |
||
|
|
b580debe39 |
Removes Akula Lore Protection (#1302)
## About The Pull Request Allows more customization ## Why It's Good For The Game I don't like arbitary restrictions on species. ## Proof Of Testing One line change ## Changelog 🆑 config: Removes Akula Lore protection (Allows edit to species) /🆑 |
||
|
|
064c49a0f9 |
[DONE] Adds the weakness to sol quirk (#1255)
<!-- 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 You know how bloodsuckers are weak to Sol? Now you can be too! Only as a hemophage. Features included: The very same warnings and UI that bloodsuckers get to know when they are in danger! This quirk also makes healing in a coffin cost only half blood, neat huh? <!-- 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 People wanted to suffer, and why am I to deny them pain? <!-- 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 HUD/ burning / healing works fine <!-- 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 hemophage-only quirk, Sol weakness code: Refactors the sol subsystem so that itself decides if it should run or not based on if anyone is using it. code: Refactors bloodsucker UI elements so that they can function fine outside a bloodsucker antag datum code: bloodsucker_blood_volume, humanity_lost, bloodsucker_level and bloodsucker_level_unspent are now private variables due to them being used for UI updates, if you need to change them, use the procs that are written in the autodoc code: Quirk species whitelists no longer use bitflags, but use the species ID's. Easily allowing you to add new whitelists without having to mess around with making a new bitfield /🆑 <!-- 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> |
||
|
|
3423d8fbfd | Fixes missing code levels for ERT (#1278) | ||
|
|
cc8a7be218 |
Moonstation Fixes March 16 2024 (#1280)
## About The Pull Request Fixes the following issues (and more) - Fixes AI control turrets being blocked by a turret. - Fixes atmos fuckery on the cave level when a turf is destroyed. - Fixes missing APCs in some areas. - Fixes missing new tram AC/DC plates. - Fixes Demoralizer appearing in maintenance loot (Not supposed to be itemized). - Fixes missing security records filling cabinet in some areas. Adds the following features - Adds randomly placed safes that contain 1 rare loot instance - Adds stethoscopes to maintenance loot. - Adds drains to below all showers. - Adds missing steam vents to some maintenance areas. - Adds unused mining rocks (beta feature to the new mining rework) to the cave area. - Adds missing disks and holopad to genetics. ## Why It's Good For The Game Fixes and changes good. ## Proof Of Testing I tested it okay. ## Changelog 🆑 BurgerBB fix: Fixes various Moon Station issues. /🆑 <!-- 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. --> |
||
|
|
dce4a8754a |
Lift him (PR that makes it so you can be lifted) (#1131)
<!-- 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! --> Source inspiration: https://github.com/Bubberstation/Bubberstation/pull/1042 This PR adds an optional 1-point positive quirk that allows you to be picked up. This has no real functional difference from the fireman's carry. Naturally, this trait is mutually exclusive with the oversized quirk. <!-- 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. --> https://github.com/Bubberstation/Bubberstation/assets/110273561/795a66fb-2073-457e-9aab-333fae67117b ## 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. --> 🆑 ReturnToZender (quirk code), TeshariEnjoer (original PR) add: New positive trait, featherweight. Allows you to be picked up instead of fireman's carried. This dipshit yours? /🆑 <!-- 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> |
||
|
|
b311988db9 |
Changes Pet Owner from 4 to 0 (#1274)
<!-- 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 see title <!-- Please make sure to actually test your PRs. If you have not tested your PR mention it. --> ## Why It's Good For The Game i got asked to do this and i understand completely why. this quirk has no reason to require a negative quirk because having a pet has no advantage. ## Proof Of Testing  observe how it has no cost ## Changelog pet owner now costs 0 instead of 4 points 🆑 balance: pet owner is free /🆑 <!-- 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> |
||
|
|
9102c49c27 |
Squashed commit of the following:
commit 2abf1c919f05b34cfee752677431a864bc22f12e Merge: c9636f2bea7b |
||
|
|
eb6307728d |
Adds icewalker village to radstorm protected areas (#1178)
## About The Pull Request Title ## Why It's Good For The Game They shouldnt be affected by one, then dont have any ways to heal the rads and can only run into the caves. They might not even get the announcement of it. ## Proof Of Testing Simple edit, works in game. ## Changelog 🆑 add: Added the icewalker areas to the radstorm protected areas. /🆑 --------- Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Waterpig <wtryoutube@seznam.cz> |
||
|
|
4022ff03fd |
Fixes Moonstation radstorms affecting some places it's not supposed to. (#1204)
## About The Pull Request Adds the following areas to the radstorm immune areas for radstorms. - The arrivals terminal area (eastern ministation on moonstation). - Lunar Caves (Moonstation) - Lavaland Underground (Moonstation) - Cargo Mining Elevators (Moonstation) - Cargo Mining Foundry (Moonstation Only) ## Why It's Good For The Game Coding/mapping oversight fixed. ## Proof Of Testing Untested. ## Changelog 🆑 BurgerBB fix: Fixes Moonstation radstorms affecting some places it's not supposed to. /🆑 <!-- 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. --> |
||
|
|
087e5357e7 |
Replaces the Meteor Shuttle with THE CUBE (#1171)
## About The Pull Request Replaces the Meteor Shuttle with THE CUBE. It's an emag only emergency shuttle that is literally just a 16x16 cube with some engines on it. ## Why It's Good For The Game Asteroid Shuttle had a lot of issues with it actually being spawned/launche correctly so I'm removing it and replacing it with this. It is less destructive, but still very annoying and worthy of being an emag shuttle. ## Proof Of Testing  ## Changelog 🆑 BurgerBB del: Replaces the Meteor Shuttle with THE CUBE. It's an emag only emergency shuttle that is literally just a 16x16 cube with some engines on it. /🆑 <!-- 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> |
||
|
|
5f66d4659d |
Disables Lance Shuttle on Moon Station because it caused the crew to get stuck on station for 5 hours once. (#1170)
<!-- 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 Lance station doesn't work on Moon Station because it's too big. This PR fixes that by disabling the Lance on Moon Station. ## Why It's Good For The Game Remove, don't improve, because I do not have the time or patience to code a system where shuttles are disabled based on the size of the dockport because that involves a lot of non-modular fuckery. Maybe someone else can do it. ## Proof Of Testing  ## Changelog 🆑 BurgerBB del: Disables Lance Shuttle on Moon Station because it caused the crew to get stuck on station for 5 hours once. /🆑 <!-- 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> |
||
|
|
b63a716dc7 |
Sandstorms on Moon Station are less annoying + Other QoL (#1155)
<!-- 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 missing miner GPSs to lockers + table. Sandstorms on Moon Station are less annoying in terms of notifications and sound. Fixes typo in Moon Station plaque. External airlocks to public areas no longer have access. ## Why It's Good For The Game https://www.youtube.com/watch?v=IT_sjisdgbk ## Proof Of Testing  ## 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 fix: Sandstorms on Moon Station are less annoying in terms of notifications and sound. Adds missing miner GPSs to lockers + table. Fixes typo in Moon Station plaque. External airlocks to public areas no longer have access. /🆑 <!-- 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> |
||
|
|
e9b1b9eec2 |
Command Stripper outfit GAGS (#1001)
<!-- 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 started as a requests and very quickly decended into a crack-head energy obsession. It's just GaGs ability for Command stripper outfits. <!-- 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 Sluttier command? and more GAGs 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  <!-- 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. --> 🆑 image: added GAGS versions of command stripper outfits. /🆑 <!-- 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> |
||
|
|
2713e00f4d |
Makes Moon Station actually a moon because people made fun of me for the map not actually being a moon once (#1087)
 ## About The Pull Request Moon Station is now a "planetary" map! ### Atmospherics The atmos is a very cool 60 Celsius with a custom mixture of gas that is still breathable. Special precautions should be taken with the supermatter as cooling it is now harder (but still possible). The default setup with one emitter and no altered pipes (and just using the passive cooling) generates 1MW and doesn't overheat the supermatter. Supematter events do cause the cooling to fail, which is why 3 powered coolers are provided in case that happens. ### Ruins and Lavaland Given the planetary nature of the map, there are no longer any space ruins. There also isn't a lower level yet, so in the meantime Miners can fly down to lavaland. Soon I will be adding a custom cave jungle system that miners will use for mining, with custom bosses and other cool content. ### Lighting I added Planetary lighting exclusive to Moon Station from my other coderbase. The lightning does not have a day/night cycle (too performance heavy!) but it still looks pretty cool and lights up the entire outside area. This also means that solars basically has a generous boost of power 24/7. ## Current Issues Non discovered... so far. ## Changelog 🆑 BurgerBB add: Makes Moon Station actually a moon now because people made fun of me. /🆑 <!-- 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. --> |
||
|
|
5d278e8f6c |
Replaces the Oh Hi Daniel shuttle with something else (#1071)
## About The Pull Request  Why yes, I watched several of the same clip of the Room several times to get the layout just right. ## Why It's Good For The Game The Oh Hi Daniel shuttle is much more chaotic on here than it is on /tg/ due to the fact that anyone can spam alcohol at the vendor and then flood the entire shuttle with very flammable liquid. Causes a lot of headaches for admins, so I decided to remove that aspect for it and then pretty much change it completely because I'm legitimately wild. ## Proof Of Testing Draft because untested. ## Changelog 🆑 BurgerBB add: Replaces the Oh Hi Daniel shuttle with a similar shuttle. /🆑 <!-- 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> |
||
|
|
d0b9731370 |
Pride Flag Overhaul (#1019)
<!-- 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 Resprites the biodome pride flags, makes them craftable for 3 cloth, and adds a vertical variant so they can be used in more places. You can rotate the flag with alt-click while it's on a wall. Click and drag it to yourself to take it down and fold it up. ## Why It's Good For The Game The old sprites unfortunately had some serious codersprite going on and clashed really hard with the visual style of the game. Also, new sprites are good and it helps my fellow fruits feel seen on bubberstation thirteen, the furry rp server with antags. ## 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: added vertical variants of the pride flags used in biodome image: resprited horizontal pride flags used in biodome /🆑 <!-- 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> |
||
|
|
c500e56ca6 |
Adds Moon Station: AKA Burgerstation 2 (#921)
Draft because it needs some final touches, and the CI checks need to be enabled for this map. ## About The Pull Request https://www.youtube.com/watch?v=Sr57Je1fVvM  Re-adds Burgerstation, except it's called Moon Station now. ## Why It's Good For The Game it's not lmao ## TODO - [x] Fix CI map errors/warnings. - [x] Re-add all the hallway robot pathing nodes. - [x] Test disposals + mail. - [x] Fix arrivals shuttle - [x] Test powernets. - [x] Test supermatter + supermatter waste disposal. - [x] Test clown chamber. - [x] Remove all security cameras and replace them with custom ones. - [x] Test camera visibility. - [x] Test maint club + theatre buttons. - [x] Test security timers. - [x] Test ERT and whiteship shuttle docks. - [x] Test the map itself with a testmerge. - [x] Adjust map according to feedback. ## Changelog 🆑 BurgerBB add: Adds Moon Station del: Removes Burgerstation /🆑 --------- Co-authored-by: Esixdotnet <156951974+Esixdotnet@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: Bubberbot <151680451+Bubberbot@users.noreply.github.com> Co-authored-by: thegrb93 <grbrown93@sbcglobal.net> Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com> |
||
|
|
35aa9bfd8c |
[TESTMERGE] Bloodsuckers, version 3 (#863)
<!-- 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 Fulpstations bloodsuckers into the game, this is based on https://github.com/Bubberstation/Bubberstation/pull/386 which also has good info on the abilities that it can do, although fulp also has their own wiki page on it, https://wiki.fulp.gg/en/Bloodsucker. This was built upon from the last PR and with the major known issues fixed. Balance changes: - Bloodsucker snow need 0.4 of your max blood level for each level up - Bloodsuckers can no longer stockpile more than two level ups. - Draining mindless humans gives the same draining inefficiency as draining monkeys does, which gets twice as bad if you are above level 4. - If you are at level 4, you inherit the snobbish blood drinking quality just like venture always have, with the exception of the nosferatu. This means you'll refuse to drink bad blood, to encourage conflict if you desire even more power. - Frenzy no longer kills you as quickly, tested it and it was incredibly fast. - Night timer for vampires is now 20 minutes. - All vampire type species and bloodsuckers get hurt more by silver <!-- 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 New antags add variety and fun. Probably <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 add: Add bloodsuckers, a new reason to fear maintenance and the dark. Don't go out there alone, or you might wake up pale and fainting. /🆑 <!-- 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: destrucktoid <39823128+destrucktoid@users.noreply.github.com> Co-authored-by: Ldip999 <60290575+Ldip999@users.noreply.github.com> Co-authored-by: StrangeWeirdKitten <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
|
d8e07e71de |
Nerfs most modsuits by giving them all armour boosters (#910)
<!-- 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 All security-grade modsuits (security, safeguard, magnate, blueshield, ERT, etc) have been outfitted with armour booster modules, built in and non-removable. "But wait, Yakumo, that's a huge buff, isn't it?" haha no In """"compensation"""" for this built-in module, I have halved the armour values on all applicable modsuits, and moved said values to the armour booster modules. Every modsuit has its own specific booster with the moved armour values built in. Also almost all of them don't get the speed boost, because it's just a poor copy of the syndicate one. I made an exception for the HoS MOD however because the secoff modsuits were recently buffed to have almost the same armour (we love power creep)  Contains an early pull of https://github.com/tgstation/tgstation/pull/80680 ## Why It's Good For The Game EVA combat is incredibly goofy right now. Armour on MODsuits was originally stripped out severely because having armour in already awful space combat was a little bit shit, and modsuits aren't supposed to be a be-all-end-all of protective drip. Except the Syndicate who got shafted by having dogshit armour in space, because most of their armour is in the armour booster. Now everyone is on the same playing field again. Want to have actual armour in a MODsuit? You're gonna have to sacrifice your EVA capability to do so. No more free rides, and the syndicate is a respective threat in comparison in the same EVA environment again. ## 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: Security, HoS, Captain, Blueshield, and Centcom roles have had armour booster modules built into their modsuits. Most do not reduce the slowdown of your suit (except the HoS one) balance: Armour values in said modsuits have been halved across the board, with the lost values moved to the armour boosters. balance: Effectively, armour in EVA combat is severely nerfed for everyone except the syndicate who already had armour boosters. /🆑 <!-- 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: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> |
||
|
|
d96b2b97aa |
Waterpig grows more insane with modularity: The massive PR that probably breaks shit (#838)
<!-- 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 have circuitry theory finals in 1 hour. And as such, to distract myself from my impending doom and to stop thinking about loop currents, I have decided to start working on this. (Update: I passed) This isn't even close to how I wish our modularity to look But that's future Waterpig's problem (Note to self: Fix the no_antag button) In another news, this probably breaks stuff. <!-- 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 Modularity is good. The more stuff we can modularize the better, and incase it gets removed upstream it's as simple as... removing our modular override. <!-- Argue for the merits of your changes and how they benefit the game, especially if they are controversial and/or far reaching. If you can't actually explain WHY what you are doing will improve the game, then it probably isn't good for the game in the first place. --> ## Changelog <!-- If your PR modifies aspects of the game that can be concretely observed by players or admins you should add a changelog. If your change does NOT meet this description, remove this section. Be sure to properly mark your PRs to prevent unnecessary GBP loss. You can read up on GBP and it's effects on PRs in the tgstation guides for contributors. Please note that maintainers freely reserve the right to remove and add tags should they deem it appropriate. You can attempt to finagle the system all you want, but it's best to shoot for clear communication right off the bat. --> 🆑 refactor: Refactors modularity significantly /🆑 <!-- 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> |
||
|
|
477e31ac06 |
Revert "New Quirk : Dead Inside" (#843)
Reverts Bubberstation/Bubberstation#761 ## Why it's good for the game The quirk, originally intended for undead characters, and seemingly a good idea, has been used only for the meme of "Hehe look at me I am dead inside" Additionally it's been reported as buggy several times and we in no way have the manpower nor time to maintain a meme quirk. We should maintain some level of serious and this goes directly against that. ## Changelog 🆑 remove: Dead inside quirk /🆑 |
||
|
|
0c75b09d42 |
Nerfs Miasma (#649)
Draft because it needs further testing and tweaks. ## About The Pull Request Changes how miasma works by implementing the following: - Requires miasma to have a partial pressure of 0.1 or higher to start giving disgust. - Miasma detection will only occur if the new partial pressure is double of what you previously detected, or with a very low chance to occur (based on current partial pressure). - You will cough when you get a message indicating that you detect miasma. - You can detect the presence of miasma at above 0 moles (Might change to something higher). - You get a light negative moodlet at 4 partial pressure (Previously 5). - You get a moderate negative moodlet at 12 partial pressure (Previously 15). - You get a heavy negative moodlet at 20 partial pressure (Previously 30). This is when the chance for viruses start to role (Based on current partial pressure). - When a virus rolls, you will vomit if you catch a virus, or were supposed to catch a virus (if it didn't get added due to already having one, or something). Previously, you could get a virus at any stage. - The virus symptoms from miasma viruses are picked from a pool of symptoms that I feel are balanced and make sense for a plague cloud to have. The following symptoms are currently in that pool: ``` /datum/symptom/choking, /datum/symptom/asphyxiation, /datum/symptom/confusion, /datum/symptom/cough, /datum/symptom/disfiguration, /datum/symptom/dizzy, /datum/symptom/fever, /datum/symptom/flesh_eating, /datum/symptom/hallucigen, /datum/symptom/headache, /datum/symptom/itching, /datum/symptom/undead_adaptation, /datum/symptom/viraladaptation, /datum/symptom/viralevolution, /datum/symptom/vomit ``` ## Why It's Good For The Game Allows players to detect the presence of miasma without suffering from a possible lethal virus. ## Changelog 🆑 BurgerBB balance: Nerfs Miasma /🆑 <!-- 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. --> |