Skip to content

Generic Trigger System & Ancient Temple Changes Pt1 - #10577

Merged
MaxIsJoe merged 11 commits into
unitystation:developfrom
AtnerNT:Awaysite-stuff
Oct 19, 2024
Merged

Generic Trigger System & Ancient Temple Changes Pt1#10577
MaxIsJoe merged 11 commits into
unitystation:developfrom
AtnerNT:Awaysite-stuff

Conversation

@AtnerNT

@AtnerNT AtnerNT commented Oct 19, 2024

Copy link
Copy Markdown
Contributor

Was originally all gonna be one PR, but Gilles wanted to do some stuff with the things already finished, so merging what is already working
Whats In Progress but not in this PR:
-> New Ancient Temple map complete with a variety of traps, puzzles and new loot
-> Sprite work for logic wall switches (Currently using logic gate sprite)
-> Small bug fixes for logic items such as spike traps having a desynced enable/disable animation

Changelog:

CL: [New] Adds several new vinyls and songs by M0N7Y5
CL: [New] Adds mappable logic gates, timers and clearance providers to increase mapping capabilities
CL: [New] Adds pressure plates, timers and logic switches
CL: [New] Adds spike traps and dart traps
CL: [New] Adds two new crate types, "Stone Chests" and its vined variant for more thematic loot in awaysites
CL: [New] Adds new floor tile "Sandstone Floor"

CL: [Fix] Fixed projectiles that dont spawn decals forming NREs and breaking, fixing certain bugs with arrow variants
CL: [Improvement] The research laser projector will now display dismantling hovertips even if not already holding the correct tool

@github-actions github-actions Bot added Scene Changes Any changes that affect scenes (e.g. lobby or maps) Sprite Work labels Oct 19, 2024
@github-actions github-actions Bot removed the Scene Changes Any changes that affect scenes (e.g. lobby or maps) label Oct 19, 2024
@MaxIsJoe

Copy link
Copy Markdown
Member

tests are failing

@AtnerNT

AtnerNT commented Oct 19, 2024

Copy link
Copy Markdown
Contributor Author

Ay tests passing now

Comment thread UnityProject/Assets/Scripts/Objects/Traps/LogicGate.cs Outdated
Comment thread UnityProject/Assets/Scripts/Objects/Traps/LogicTimer.cs Outdated
@AtnerNT

AtnerNT commented Oct 19, 2024

Copy link
Copy Markdown
Contributor Author

reviews applied

@MaxIsJoe
MaxIsJoe merged commit 1268c10 into unitystation:develop Oct 19, 2024
@AtnerNT
AtnerNT deleted the Awaysite-stuff branch October 19, 2024 17:05
@corp-0 corp-0 added the blog post! PRs that will be mentioned in next blog post label Apr 30, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blog post! PRs that will be mentioned in next blog post Sprite Work

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants