Skip to content
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

Mapping Mini-Wizmerge & New Central Command #1610

Merged
merged 4 commits into from
Jan 20, 2025

Conversation

sleepyyapril
Copy link
Contributor

@sleepyyapril sleepyyapril commented Jan 20, 2025

Description

Ports space-wizards/space-station-14#32294
Ports ss14-harmony/ss14-harmony#310 (and everything needed for it to function)
Early-merges space-wizards/space-station-14#34302

Adds the ability for multiple central command maps that get randomly selected.
Tested and works.


Changelog

🆑 Several contributors

  • add: Added a new central command map that is randomly picked alongside the old one (thank you to Spanky from Harmony)
  • add: Added Advanced SMES for mappers.
  • add: Added the atmospheric network monitor for seeing what the temperature, moles, and pressure is on every pipe everywhere through a computer.
  • add: Nukie med bundle now contains a compact defibrillator.
  • add: Ported a better mapping editor.
  • add: Added the throngler plushie.
  • remove: Removed the Throngler as a possible loot spawn for gamble crates.

sleepyyapril and others added 2 commits January 19, 2025 22:50
<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- add: Added a new central command map that is randomly picked alongside
the old one (thank you to Spanky from Harmony)
- add: Added Advanced SMES for mappers.
- add: Added the atmospheric network monitor for seeing what the
temperature, moles, and pressure is on every pipe everywhere through a
computer.
- add: Nukie med bundle now contains a compact defibrillator.
- add: More mapping stuff.
- add: Added the throngler plushie.
- remove: Removed the Throngler as a possible loot spawn for gamble
crates.
@github-actions github-actions bot added Status: Needs Review Someone please review this Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: UI Changes any XAML files Changes: Map Changes any yml file in the Maps directories Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 20, 2025
Copy link
Contributor

github-actions bot commented Jan 20, 2025

RSI Diff Bot; head commit 3034d61 merging into 9a12e7b
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Clothing/Multiple/towel.rsi

State Old New Status
NTmono Added
equipped-BELT Added
equipped-HELMET Added
equipped-INNERCLOTHING Added
icon Added
iconstripe Added
inhand-left Added
inhand-right Added

Resources/Textures/Decals/Overlays/markups.rsi

State Old New Status
rectangle1x2 Added
rectangle1x2center Added
square Added
squareQuater Added
squareQuaterCenter Added

Resources/Textures/Decals/burnt.rsi

State Old New Status
burnt1 Added
burnt2 Added
burnt3 Added
burnt4 Added

Resources/Textures/Objects/Specific/Medical/defibsmall.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
ready Added
screen Added

Resources/Textures/Objects/Specific/Medical/defibsyndi.rsi

State Old New Status
icon Added
inhand-left Added
inhand-right Added
ready Added
screen Added

Resources/Textures/Objects/Specific/Medical/medipen.rsi

State Old New Status
dexpen Added
dexpen_empty Added
punctpen Added
punctpen_empty Added
pyrapen Added
pyrapen_empty Added

Resources/Textures/Objects/Weapons/Melee/ThronglerPlushie.rsi

State Old New Status
icon Added

Resources/Textures/Structures/Machines/computers.rsi

State Old New Status
generic_panel_open Added

Resources/Textures/Structures/Piping/Atmospherics/directionalfan.rsi

State Old New Status
icon Added

Resources/Textures/Structures/Piping/Atmospherics/gas_pipe_sensor.rsi

State Old New Status
base Added
blank Added
icon Added
lights Added

Resources/Textures/Structures/Power/smes.rsi

State Old New Status
advancedsmes-open Added
advancedsmes-static Added
advancedsmes Added

Resources/Textures/Structures/Wallmounts/posters.rsi

State Old New Status
poster52_legit Added
poster53_legit Added

Resources/Textures/Structures/Wallmounts/signs.rsi

State Old New Status
bath Added

Edit: diff updated after 3034d61

@stellar-novas
Copy link
Contributor

Woo, CODEOWNERS is working!

Signed-off-by: sleepyyapril <123355664+sleepyyapril@users.noreply.github.com>
@sleepyyapril sleepyyapril merged commit 9272f65 into Simple-Station:master Jan 20, 2025
15 checks passed
SimpleStation14 added a commit that referenced this pull request Jan 20, 2025
@sleepyyapril sleepyyapril deleted the multiple-centcomms branch January 20, 2025 07:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an RSI Changes: UI Changes any XAML files Changes: YML Changes any yml files Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants