5 Commits

Author	SHA1	Message	Date
shellspeed1	83a0f35c71	The offstation cargo update (Ready) (#1764) ... ## About The Pull Request First things first, credit to tmyqlfpir aka Feignsleep for making the initial cargo crate import code. I probably butchered it when I messed with it to make it only import on console so make sure to yell at me if there are issues. This PR does several things. FIRST it brings Tarkon up to date with Interdyne as far as cargo goes. In this case, that means an express cargo console, selling pad, and powerator tied to a budget account. Second, thing, both Interdyne and Tarkon now have access to cargo company items. Its a bit janky but it should do for at least now. With how it was done, we should be able to add unique items to the consoles for each faction, although that might need some work. As a minor note, I also nerfed the interdyne powerator. It had a 2x multiplier and I'm not sure that is really needed. ## Why It's Good For The Game Cargo goes brrrt, also Tarkon could use some love. ## Proof Of Testing  ## Changelog 🆑 add: Cargo Companies are now available to offstation factions add: Tarkon now has a cargo setup available to them balance: rebalanced something /🆑 --------- Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com> Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com> Co-authored-by: Swift <jackwars4@gmail.com>	2024-09-15 17:45:06 +00: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
tmyqlfpir	9c51d3eb6a	[MODULAR] Dauntless tweaks (#1408) ... <!-- 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 several map decals, expands the interrogation room and creates a space variant of the Dauntless (set to never spawn). Other adjustments include tweaking a few decals, and moving some lights/fire extinguishers, and adding a black market uplink and LTSRBT machine board. Additionally, many crates have now been moved to the new storage room located south of xeno. A new button object has been added to the vault, the security camera area and the bridge. Activating it will toggle all cameras on the Dauntless network (except for xenobiology). Dauntless cyborgs will have their cameras automatically removed, much like how ghost cafe does. <img width="933" alt="final" src="https://github.com/Bubberstation/Bubberstation/assets/80724828/8bc66e52-3aec-428d-bcb7-6e3770bdbd33"> <!-- 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 takes into consideration feedback given by various ghost role players, and reduces the chances of AI exploiting the cameras as a means to relay information back to NT personnel. <!-- 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 on my local server and confirm 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. --> 🆑 qol: Various tweaks to Dauntless service and medical add: Add new camera kill switches to the Dauntless add: Add (non-spawned) space version of Dauntless add: Add new storage room to Dauntless balance: Dauntless cyborgs will have their cameras automatically removed balance: Interdyne Powerator has 2x efficiency add: Created Interdyne injectors to assign non-spawned crew as Syndicate faction /🆑 <!-- 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-04-27 11:14:06 +02:00
tmyqlfpir	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>	2024-04-19 08:33:02 +02:00
tmyqlfpir	5a65b512ff	Adds express cargo console to lavalands dauntless base (#1348) ... <!-- 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 achieves multiple goals: * Adds a new department bank account for Interdyne * Assigns a unique Interdyne flavored powerator and express cargo console that uses the Interdyne bank account * Add two machine board to the filing cabinet in the vault * Adds a bitden setup to brig area for prisoners to do something (e.g digital mining - like NT station prisoners) <!-- 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 is purely to give more gameplay depth to the ghost role for Dauntless, and an incentive to increase the power production of the turbine. <!-- 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 can confirm that the new Interdyne department does not conflict with regular cargo operations and machinery. <!-- 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 cargo ordering functionality for dauntless base add: Add bitden to dauntless brig area /🆑 <!-- 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-04-08 00:54:40 +07:00