Skip to content

what#44

Merged
Cygnall merged 3 commits into
masterfrom
vandanna
May 29, 2025
Merged

what#44
Cygnall merged 3 commits into
masterfrom
vandanna

Conversation

@Cygnall
Copy link
Copy Markdown

@Cygnall Cygnall commented May 29, 2025

the hell?

@Cygnall Cygnall merged commit a7c0efd into master May 29, 2025
9 of 11 checks passed
warcrazed11 pushed a commit to warcrazed11/HardLight that referenced this pull request Aug 30, 2025
* Psionics

It's a ton of stuff relating to the basic Psionics system and all the powers.

I'm saving this as a bit of a sanity check before moving forward.

Left to do:
1. Implementing the Psionic faction so that the chat works as intended.
2. Adding the start-state cooldown timers to the actions.

* Cleaned up everything with the word 'Psionic' on it.

Got the psionic chat working. Got some other stuff working

* Some final psionic cleanup.

The last batch of content.

* Update RobustToolbox

* rebased

* Revert "Update RobustToolbox"

This reverts commit c0cf35d03f828f6ccfeb05fcffd91cf074818fc9.

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit c4dc828df7912e063ea856b2a83a790bc88d1e09.

* Update RobustToolbox

* Psionics

It's a ton of stuff relating to the basic Psionics system and all the powers.

I'm saving this as a bit of a sanity check before moving forward.

Left to do:
1. Implementing the Psionic faction so that the chat works as intended.
2. Adding the start-state cooldown timers to the actions.

* Cleaned up everything with the word 'Psionic' on it.

Got the psionic chat working. Got some other stuff working

* Some final psionic cleanup.

The last batch of content.

* rebased

* Cleaned up everything with the word 'Psionic' on it.

Got the psionic chat working. Got some other stuff working

* Broken Commit

With these changes in place, the unit does not work. Recording them so i don't lose my work.

* Brings it All Together.

Dawn of the final Commit. Rebase completed.

* Update RobustToolbox

* Changed 'Station Events' to 'StationEvents' and cleaned up the Delta-V Events.yml file of duplicate events.

* Delete ghost_roles.yml

Duplicate.

* Update familiars.yml

* Update familiars.yml

* Update GlimmerReactiveSystem.cs

* Makes tinfoil hats craftable.

* Decided I'm not dealing with adding fugitives or Glimmer Wisps right now.

* Psionic invisibility won't work now that Eye component exists. Or at least, the integrator test won't psas.

* Update special.yml

* Added #nyanotrasen code or //Nyanotrasen code to many, many files.

* Properly fixes comments.

---------

Signed-off-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
Signed-off-by: PHCodes <47927305+PHCodes@users.noreply.github.com>
Co-authored-by: Debug <sidneymaatman@gmail.com>
Co-authored-by: Colin-Tel <113523727+Colin-Tel@users.noreply.github.com>
fenndragon added a commit that referenced this pull request May 21, 2026
* Merge pull request #3 from AU-14/weapons

M41 + Smartgun

* Merge pull request #39 from troytroy400/equipment-rework

PvE Hat/Helmet Ports

* Merge pull request #43 from troytroy400/pvearmor

PvE Marine Armor

* Merge pull request #44 from troytroy400/evenmoreclothing

Port PvE Clothing

* Merge pull request #45 from troytroy400/goggles

Port PvE Goggles

* Merge pull request #47 from troytroy400/glasses

Port PvE Glasses

* rmc weapons

* bezoar

* fix

* Update Bezoar.yml

* Update Bezoar.yml

* Update base_pistol.yml

* Update base_sniper.yml

* Update base_gun.yml

* Update Bezoar.yml

* fix

* fixes

* Update tags.yml

* tweak

* damage rebalance

* Update grenades.yml

---------

Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com>
Co-authored-by: Orion <58231741+troytroy400@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant