STAGING-SIERRA: Resomi port #2047
Merged
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
Activited resomi job blacklist in SIERRA map module. Resomi added to SOUNDED_SPECIES list in EMOTE_PANEL module. Activated resomi posters in NYC_POSTERS module. Resomi emotes used sounds properly. Deleting duplicated resomi sounds in 'infinity' folder. Overrided `get_pulse_as_number()` proc in RESOMI module. Now it's working depends on species blood_volume. Sorted files in RESOMI module code.
Loadout tweaks.
del: thermal suit. override: plush toy loadout datum in LOADOUT_ITEMS module. add: polychromic cloak as an resomi hooded cloak; resomi plush added to "plush toy" loadout datum; resomi undercoats and expeditionary uniforms added to "Xenowear" loadout cat.
Clear conflict and properly working "plush_toy" loadout datum.
…into Daeberdir-resomi-port # Conflicts: # maps/sierra/sierra.dm # mods/loadout_items/code/loadout/loadout.dm # mods/resomi/code/body/abilities.dm # mods/resomi/code/clothing/misc.dm # mods/resomi/code/gear.dm
Conflict resolutions
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.
ПР делает что-то умное и на Сьерре появляются резоми. Ого!
Чейнджлог