[MIRROR] Black Market Trader redesign, now with trading structure! #2926
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Push 1 * 2 * Update tgstation.dme * 4 * 3 * id? * 5 * guess those ruin doors cant have ID's? * Update blackmarket.dmm * Update blackmarket.dmm * i may be slightly stupid * tweaks with proper paycheck for ghosts * 1 more power cable * Update blackmarket.dmm * doors got stupid * s p a c e
AnywayFarus
added a commit
that referenced
this pull request
Apr 17, 2024
Iajret
pushed a commit
that referenced
this pull request
Jun 8, 2024
* Add circuit component cameras (#83578) ## About The Pull Request This PR introduces a limited set of camera components that can be used by surveillance security consoles and the PDA/laptop camera app. <img width="366" alt="components" src="https://github.com/tgstation/tgstation/assets/80724828/0e628863-9998-46d6-8822-e0a44543b4c2"> There is four camera components, each limited to a specified shell circuit type. Additionally, drone circuit shells can now use the recharge stations too, much like how mobs with BCIs can recharge. ### New Components <img width="136" alt="drone camera" src="https://github.com/tgstation/tgstation/assets/80724828/fd045871-56bf-44a6-bb4f-ebe895d56d3d"> * Drone Camera This camera component captures the surrounding area. It has an option to set the camera range (near 5x5/far 14x14). <img width="136" alt="bci camera" src="https://github.com/tgstation/tgstation/assets/80724828/16bf2dd1-823b-4d66-8249-5d0f1bb1b779"> * BCI Camera This camera component uses the active user's eyes as a camera function. If the user's sights are damaged, the range will be forced to the near setting. If the user is unconscious/dead/blinded or has no eyes, the stream will be cut off. It has an option to set the camera range (near 5x5/far 14x14). <img width="136" alt="polaroid camera" src="https://github.com/tgstation/tgstation/assets/80724828/7c4d53df-b4af-4f7c-8942-a63842510720"> * Polaroid Camera Add-On This camera component streams to a camera network. The camera range is hardcoded to the near setting (5x5). <img width="136" alt="airlock camera" src="https://github.com/tgstation/tgstation/assets/80724828/5d9e9d55-49fc-45a7-99c8-aaf1ae08f6d1"> * Airlock Camera This camera component streams to a camera network. The camera range is hardcoded to the near setting (5x5). ### Features * The cameras can be EMP'd and will be disabled for 90 seconds if successful * When the cameras are active, they will actively drain the cell's power per second (near range uses 3kJ & far range uses 8kJ) * Advance camera console/AIs can use these cameras, however the camera light is disabled (they will be useless in dark areas) ### Screenshots In Action <details> This is the drone camera viewed on a security camera console<br> <img width="425" alt="near" src="https://github.com/tgstation/tgstation/assets/80724828/e5247828-0fee-4552-9e70-5e5ee897c117"><br> This is the same drone, now set to the far range setting<br> <img width="425" alt="far" src="https://github.com/tgstation/tgstation/assets/80724828/e58e3e85-aa90-4f1a-9dff-957c65764b77"><br> </details> ## Why It's Good For The Game This promotes emergent gameplay and improves the overall usefulness for drones as they can be 100% used remotely. ## Changelog :cl: add: Added new circuit camera components qol: Circuit drones can now recharge at recharge stations /:cl: --------- Co-authored-by: Watermelon914 <[email protected]> * Add circuit component cameras --------- Co-authored-by: tmyqlfpir <[email protected]> Co-authored-by: Watermelon914 <[email protected]> Co-authored-by: NovaBot13 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Original PR: NovaSector/NovaSector#2005
About The Pull Request
Been wanting to do this for a while, initially wanted a 2 player spawner but realized the logistical problems that'd bring. I retired the Chevvy and added in the Burst which was my original Interdyne shuttle well over a year ago.
How This Contributes To The Nova Sector Roleplay Experience
Adds in a redesigned ship the Burst, a smuggling small cargo ship. It now docks into the Market next to an open show room that has some premade shelve spaces along with an unlinked Qpad.
Proof of Testing
Screenshots/Videos
see top
Changelog
🆑 Zergspower
add: Replaces the Chevvy with the Burst for the BMD role
qol: rebrands the BMD to be more of a trader route, with an incentive to recruit a partner from the station.
code: Ghost roles defined with an ID are excluded from paychecks properly now
code: the Blackmarket area is not longer magically powered
/:cl: