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

Test PR 2 #2

Closed
wants to merge 40 commits into from
Closed

Test PR 2 #2

wants to merge 40 commits into from

Conversation

SlamBamActionman
Copy link
Owner

About the PR

Why / Balance

Technical details

Media

Requirements

Breaking changes

Changelog

# Conflicts:
#	Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
#	Resources/Prototypes/Stacks/floor_tile_stacks.yml
# Conflicts:
#	Resources/Locale/en-US/tiles/tiles.ftl
#	Resources/Prototypes/Entities/Objects/Misc/tiles.yml
#	Resources/Prototypes/Tiles/floors.yml
…talagtites to doorways, nerfed xeno a bit more, other minor fixes
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Resources/Prototypes/Entities/Markers/Spawners/mobs.yml
#	Resources/Prototypes/Entities/Structures/Walls/walls.yml
#	Resources/Prototypes/Stacks/floor_tile_stacks.yml
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
# Conflicts:
#	Content.Shared/Singularity/Components/ContainmentFieldGeneratorComponent.cs
@github-actions github-actions bot added Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design. labels Nov 14, 2024
Copy link

RSI Diff Bot; head commit 85591ce merging into 5e54536
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Tiles/tile.rsi

State Old New Status
techfloordark Added
xenofloor Added

Resources/Textures/Structures/Shuttles/old_thruster.rsi

State Old New Status
base Added

Resources/Textures/Structures/Wallmounts/air_monitors_xeno.rsi

State Old New Status
alarm0 Added
alarm1 Added
alarm2 Added
alarm_b1 Added
alarm_b2 Added
alarm_bitem Added
alarmp Added
alarmx Added
auth_off Added
auth_on Added
fire0 Added
fire_0 Added
fire_1 Added
fire_2 Added
fire_3 Added
fire_b0 Added
fire_b1 Added
fire_b2 Added
fire_bitem Added
fire_detected Added
fire_emagged Added
fire_off Added
fire_on Added
fire_overlay Added
firex Added

Resources/Textures/Structures/Walls/xeno.rsi

State Old New Status
full Added
reinf_construct-0 Added
reinf_construct-1 Added
reinf_construct-2 Added
reinf_construct-3 Added
reinf_construct-4 Added
reinf_construct-5 Added
reinf_over0 Added
reinf_over1 Added
reinf_over2 Added
reinf_over3 Added
reinf_over4 Added
reinf_over5 Added
reinf_over6 Added
reinf_over7 Added
reinforced_wall_girder Added
rgeneric Added
solid0 Added
solid1 Added
solid2 Added
solid3 Added
solid4 Added
solid5 Added
solid6 Added
solid7 Added
wall_girder Added

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Map Can be reviewed or fixed by people who are knowledgeable with mapping. Changes: Sprites Should be reviewed or fixed by people who are knowledgeable with spriting or visual design.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant