-
-
Notifications
You must be signed in to change notification settings - Fork 266
FROZENSTAR SHRIKE 2.0 UPDATE #2837
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Karmic-Skink
wants to merge
36
commits into
BeeStation:master
Choose a base branch
from
Karmic-Skink:shrike_two_zero
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or 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
- Viewscreen added to pump room - Fire extinguisher added to port atmos - Expanded Upper Deck engine room to allow for expanded HE loop - Replaced atmos machine components in Lower Deck engine room with an constructed thermomachine - Fixed errant floor wire in tcomms control room - Increased spaced armour to the port and starboard gauss bays
Refactored your ammo a bit and gives you some tgui pointers
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Contributor
Author
When you are accidently ahead of master. SMH. |
Why didn't you merge these properly last time?
8bdb2a0 to
430117d
Compare
|
This pull request has conflicts, please resolve those before we can evaluate the pull request. |
Whoops
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
Active Test Merge
CentCom
This PR changes the CentCom map
Experimental Test Candidate
This PR is likely to be featured in an experimental test before being (test)merged on the server.
Feature
I dead please restart
Mapping
Munitions
Issues and pull requests related to munitions.
Shrike
Sprites
TGUI-Changes
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.
About The Pull Request
This PR updates several features and components of the Shrike map.
Primary Features:
NOTE: There is a lot of changes in how this functions that still need to be balanced out and refined. While physically defined munition properties, these may have to be hard baked if reasonable balance can't be achieved.
NOTE: Railgun Forge sprites are placeholders, final sprites TBA. Ditto Canister sprites.
TODO:
Why It's Good For The Game
Addresses a number of problems that caused this map to be out of rotation.
Additionally, this PR acts to further enhance unique elements assigned to ships in an effort to push each ship to play in a unique fashion and add variety to rounds.
Some factors have been watered down; some factors remain due to design decisions and explicit approval from Leadership.
CL below may omit some changes.
How to use the Railgun Forge
The Railgun Forge is a multi-block machine consisting of:
The Forge operates by drawing materials from the ORE SILO (yes, that one) and processing them into printable materials.
Material selections need to be made for both the CORE and COATING tanks.
Each material has different physical properties and special properties.
Depending on if a material is used for either the CORE or COATING will alter the final properties of the munition produced.
NOTE: Resetting materials will waste any remaining materials stored in a tank.
Munitions available (currently) in the forge:
Slug rounds can be loaded as is and fired at will.
Canister rounds need to be further prepared:
NOTE: CHARGED CANISTERS ARE ONLY IN A STABLE CONDITION WHEN FIXED TO A CHARGER
WARNING: YOU HAVE BEEN WARNED.
All of this is subject to change and improvements.
Testing Photographs and Procedure
Details
Behold, stairs.
TBH it's easier to just look at the mapbot given all the changes.
Screenshots&Videos
Put screenshots and videos here with an empty line between the screenshots and the
<details>tags.Changelog
🆑 Karmic Skink, Bokkiewokkie3
tweak: Updated Shrike engine room temperature control
tweak: Updated Shrike scrubber temperature control
tweak: Updated Shrike floor lines
tweak: Reset Shrike SD round start mixers
tweak: Removed all Shrike Zebra Interlock Helpers
tweak: Repaired Shrike battle damage
tweak: Rerouted Shrike mail in vicinity of mining
tweak: Performed lighting pass on Shrike
add: Added fire extinguisher to Shrike port atmos
add: Added viewscreen to Shrike pump room
add: Added 2 more botany trays in Shrike maint
add: Added spaced armour to the Shrike port and starboard gauss bays
add: Added Ore Silo and Ore Delivery Chute to Shrike
add: Added bump loading to the Ore Silo aka conveyors
add: Added initial gas levels to Shrike SMSD tanks
add: Added external window shutters to the mess & officer lounge on Shrike
add: Added 3x Radiation Collectors to the Shrike SM Engine Area
add: Added temperature control to Shrike SM output line
add: Added conquest beacon to the Shrike bridge
add: Added Detective's (maint) office somewhere in Shrike
add: Added Railgun ammo forge
add: Added Railgun canister ammo type
add: Added Railgun canister charger
add: Added Railgun canister filler
tweak: Expanded Shrike Galley
tweak: Expanded Shrike Bridge
tweak: Expanded Shrike Captain's Quarters
tweak: Reworked Shrike Engineering Access
tweak: Reworked Shrike Medical (switched locations with security)
tweak: Reworked Shrike Security (switched locations with medical)
tweak: Reworked Shrike Munitions
tweak: Reworked Shrike Port and Starboard Atmos
tweak: Reworked Shrike Cryo Storage
tweak: Reworked Shrike Boarding Shuttle Access
tweak: Reworked Shrike Primary Corridor Stairs
imageadd: Added Railgun canister sprites
/:cl: