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.

Sign up for GitHub

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

Jump to bottom

Chronolegioneer remove #33

Merged
merged 3 commits into from
Aug 10, 2024
Merged

Chronolegioneer remove #33

merged 3 commits into from
Aug 10, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

MetalSage pushed a commit to MetalSage/stories-fork that referenced this pull request Jul 27, 2024
@doublechest0
Revert "Add repeated arrivals system and component (Space-Stories#33)" (
f18b663 
Space-Stories#23)

This reverts commit cc8a8e6.

Co-authored-by: Doublechest <twin01v@gmail.com>
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

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

Resources/Textures/Mobs/Species/Human/parts.rsi

State Old New Status
full Modified

Resources/Textures/Effects/portal.rsi

State Old New Status
portal-chrono Removed

Resources/Textures/Stories/Actions/chronoblink.rsi

State Old New Status
effect Removed

Resources/Textures/Stories/Clothing/Back/Backpacks/stasis_back.rsi

State Old New Status
equipped-BACKPACK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Clothing/Ears/Headsets/chronolegioneer.rsi

State Old New Status
equipped-EARS Removed
icon Removed

Resources/Textures/Stories/Clothing/Eyes/Hud/chrono.rsi

State Old New Status
equipped-EYES Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Clothing/Hands/Gloves/chronolegioneer.rsi

State Old New Status
equipped-HAND Removed
icon Removed

Resources/Textures/Stories/Clothing/Head/Hardsuits/chronolegioneer.rsi

State Old New Status
icon-flash Removed
icon Removed
off-equipped-HELMET Removed
on-equipped-HELMET Removed

Resources/Textures/Stories/Clothing/Mask/chronolegioneer.rsi

State Old New Status
equipped-MASK Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Clothing/OuterClothing/Hardsuits/chronolegioneer.rsi

State Old New Status
equipped-OUTERCLOTHING Removed
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Clothing/Shoes/Boots/chronolegioneer.rsi

State Old New Status
equipped-FEET Removed
icon-on Removed
icon Removed
inhand-left Removed
inhand-right Removed
on-equipped-FEET Removed
on-inhand-left Removed
on-inhand-right Removed

Resources/Textures/Stories/Effects/portal.rsi

State Old New Status
portal-chrono Removed

Resources/Textures/Stories/Effects/stasis.rsi

State Old New Status
effect Removed

Resources/Textures/Stories/Interface/Alerts/stasis.rsi

State Old New Status
stasis Removed

Resources/Textures/Stories/Interface/Misc/job_icons.rsi

State Old New Status
Future Removed

Resources/Textures/Stories/Objects/Devices/pda.rsi

State Old New Status
pda-chrono Removed

Resources/Textures/Stories/Objects/Devices/teleporter.rsi

State Old New Status
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Objects/Misc/bureaucracy.rsi

State Old New Status
pen_future Removed

Resources/Textures/Stories/Objects/Misc/id_cards.rsi

State Old New Status
future Removed
idchrono Removed

Resources/Textures/Stories/Objects/Specific/Medical/stasipen.rsi

State Old New Status
stasipen Removed
stasipen_empty Removed

Resources/Textures/Stories/Objects/Specific/Stasis/stasis_cage.rsi

State Old New Status
icon Removed
inhand-left Removed
inhand-right Removed
stasis_cage-base Removed
stasis_cage-closed Removed
stasis_cage-opened Removed

Resources/Textures/Stories/Objects/Tanks/chronojet.rsi

State Old New Status
equipped-SUITSTORAGE Removed
icon-on Removed
icon Removed
on-equipped-SUITSTORAGE Removed

Resources/Textures/Stories/Objects/Tools/rcd_chrono.rsi

State Old New Status
icon Removed
inhand-left Removed
inhand-right Removed

Resources/Textures/Stories/Objects/Tools/sonic_screwdriver.rsi

State Old New Status
crowbar Removed
cutter Removed
icon Removed
screw Removed
wrench Removed

Resources/Textures/Stories/Objects/Weapons/Guns/Stasis/stasisgun.rsi

State Old New Status
equipped-BELT Removed
icon Removed
inhand-left Removed
inhand-right Removed
wielded-inhand-left Removed
wielded-inhand-right Removed

Resources/Textures/Stories/Objects/Weapons/Melee/stasisbaton.rsi

State Old New Status
off-inhand-left Removed
off-inhand-right Removed
on-inhand-left Removed
on-inhand-right Removed
stunbaton_off Removed
stunbaton_on Removed

Resources/Textures/Stories/Structures/Machines/timeline_disruptor.rsi

State Old New Status
animation Removed
base Removed
cube Removed
filled Removed
icon Removed
piston-push Removed
piston Removed

@doublechest0 doublechest0 merged commit 7e8a674 into master Aug 10, 2024
9 of 12 checks passed
@doublechest0 doublechest0 deleted the chronolegioneer branch September 23, 2024 17:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Changes: Map Changes: Shaders Changes: Sprites
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@doublechest0