From a0f3f31a747268dea5f82db49089314ebe826a89 Mon Sep 17 00:00:00 2001
From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com>
Date: Thu, 8 Aug 2024 01:38:04 +0300
Subject: [PATCH 01/21] Butlergone (Cherry-Pick From Delta-V) (#678)

# Description
Cherry-picks https://github.com/DeltaV-Station/Delta-v/pull/1100 and
https://github.com/DeltaV-Station/Delta-v/pull/1222.

Makes butlertron anchorable, pullable, and destructible, and disables
logging of butlertron's messages.

Credit to adeinitas and NullWanderer.

# Note
This was cherry-picked without testing, someone needs to test it first.

# Changelog
:cl:
- add: Mr. Butlertron can now suffer for its crimes.

---------

Signed-off-by: Null <56081759+NullWanderer@users.noreply.github.com>
Co-authored-by: Adeinitas <147965189+adeinitas@users.noreply.github.com>
Co-authored-by: Null <56081759+NullWanderer@users.noreply.github.com>
---
 .../DeltaV/NPC/Roboisseur/RoboisseurSystem.cs          |  4 ++--
 Resources/Prototypes/DeltaV/NPC/roboisseur.yml         | 10 ++++++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
index b4e99e6199d..ee1c4582239 100644
--- a/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
+++ b/Content.Server/DeltaV/NPC/Roboisseur/RoboisseurSystem.cs
@@ -58,7 +58,7 @@ public override void Update(float frameTime)
                     }
                     else if (CheckTier(roboisseur.DesiredPrototype.ID, roboisseur) > 2)
                         message = Loc.GetString(_random.Pick(roboisseur.DemandMessagesTier2), ("item", roboisseur.DesiredPrototype.Name));
-                    _chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, false);
+                    _chat.TrySendInGameICMessage(roboisseur.Owner, message, InGameICChatType.Speak, true);
                 }
 
                 if (roboisseur.Accumulator >= roboisseur.ResetTime.TotalSeconds)
@@ -100,7 +100,7 @@ private void OnInteractHand(EntityUid uid, RoboisseurComponent component, Intera
             if (CheckTier(component.DesiredPrototype.ID, component) > 1)
                 message = Loc.GetString(_random.Pick(component.DemandMessagesTier2), ("item", component.DesiredPrototype.Name));
 
-            _chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, false);
+            _chat.TrySendInGameICMessage(component.Owner, message, InGameICChatType.Speak, true);
         }
 
         private void OnInteractUsing(EntityUid uid, RoboisseurComponent component, InteractUsingEvent args)
diff --git a/Resources/Prototypes/DeltaV/NPC/roboisseur.yml b/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
index 2c0b3aee8a0..e7f0b5bcd09 100644
--- a/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
+++ b/Resources/Prototypes/DeltaV/NPC/roboisseur.yml
@@ -4,12 +4,22 @@
   name: Mr. Butlertron
   description: It asks for food to deliver to exotic customers across the cosmos. Powered by the latest technology in bluespace food delivery.
   components:
+  - type: Anchorable
+  - type: Pullable
   - type: Sprite
     noRot: true
     drawdepth: Mobs
     sprite: DeltaV/Structures/Machines/roboisseur.rsi
     layers:
     - state: roboisseur-1
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 1000
+      behaviors:
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
   - type: Roboisseur
   - type: Speech
     speechSounds: Pai

From 732b8e87c5236798edc1bf34937ca217a121cdf6 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 22:38:28 +0000
Subject: [PATCH 02/21] Automatic Changelog Update (#678)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 5aca84c9f32..fb3fd2c343c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5053,3 +5053,9 @@ Entries:
       message: Barotrauma admin log spam
   id: 6232
   time: '2024-08-07T17:31:55.0000000+00:00'
+- author: Mnemotechnician
+  changes:
+    - type: Add
+      message: Mr. Butlertron can now suffer for its crimes.
+  id: 6233
+  time: '2024-08-07T22:38:04.0000000+00:00'

From 2a6790ba9d703ecc825d59475187f70b96f031b1 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 7 Aug 2024 19:11:41 -0400
Subject: [PATCH 03/21] White Dream Harpy Markings (#696)

# Description

ONIKS was kind enough to provide me with several new Harpy markings,
consisting of alternate Bat-wings, Haven Tail, Long Forked Tail, and
Swallow Tail. I have also taken the liberty of actually making a basic
set of "Bionic Wings", which are just a slightly edited version of the
"harpsuit" wing sleeve, including hardsuit lights. Unfortunately due to
limitations in the game's code concerning markings, I couldn't make the
lights use the unshaded shader. This limitation irritates me. I'll
probably fix that in a separate PR.

I actually also received a pack of Arachnid and Felinid sprites! But I'm
going to add those in a different PR entirely.

<details><summary><h1>Media</h1></summary>
<p>

Bionic wings

![image](https://github.com/user-attachments/assets/6acc64a9-be6b-435b-9c61-91287ef65c10)

Bat Wings

![image](https://github.com/user-attachments/assets/e44fe12e-8410-47ca-a4c1-5e644fd36b8a)

Haven tail

![image](https://github.com/user-attachments/assets/2adadcdd-04fc-458d-8491-61bd52a3b4d1)

Swallow tail

![image](https://github.com/user-attachments/assets/615391eb-0314-4e6d-a87b-101d0a307955)

Long Forked Tail

![image](https://github.com/user-attachments/assets/e3d672f7-b8cb-4497-a2a3-87d0c224847d)

</p>
</details>

# Changelog

:cl:
- add: The following new markings have been added for Harpies: Bat
Wings, Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked
Tail
---
 Resources/Locale/en-US/markings/harpy.ftl     |  18 +++++
 .../Mobs/Customization/Markings/harpy.yml     |  73 ++++++++++++++++++
 .../Harpy/harpy_tails.rsi/forked_long.png     | Bin 0 -> 1245 bytes
 .../Harpy/harpy_tails.rsi/haven_tone_1.png    | Bin 0 -> 853 bytes
 .../Harpy/harpy_tails.rsi/haven_tone_2.png    | Bin 0 -> 630 bytes
 .../Harpy/harpy_tails.rsi/meta.json           |  18 ++++-
 .../Harpy/harpy_tails.rsi/swallow_tail.png    | Bin 0 -> 1092 bytes
 .../harpy_wings.rsi/bat_wings_tone_1.png      | Bin 0 -> 1581 bytes
 .../harpy_wings.rsi/bat_wings_tone_2.png      | Bin 0 -> 1753 bytes
 .../harpy_wings.rsi/bionic_wings_tone_1.png   | Bin 0 -> 1448 bytes
 .../harpy_wings.rsi/bionic_wings_tone_2.png   | Bin 0 -> 329 bytes
 .../Harpy/harpy_wings.rsi/meta.json           |  18 ++++-
 12 files changed, 125 insertions(+), 2 deletions(-)
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png
 create mode 100644 Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png

diff --git a/Resources/Locale/en-US/markings/harpy.ftl b/Resources/Locale/en-US/markings/harpy.ftl
index 6d6ba75a936..724207c3ef8 100644
--- a/Resources/Locale/en-US/markings/harpy.ftl
+++ b/Resources/Locale/en-US/markings/harpy.ftl
@@ -40,6 +40,14 @@ marking-HarpyWingTipsClassic = Classic Wings with Feather Tips
 marking-HarpyWingTipsClassic-harpy_wingtip_1 = Main
 marking-HarpyWingTipsClassic-harpy_wingtip_2 = Feathertips
 
+marking-HarpyWingBat = Bat Wings (Whitescale)
+marking-HarpyWingBat-bat_wings_tone_1 = Limbs
+marking-HarpyWingBat-bat_wings_tone_2 = Membrane
+
+marking-HarpyWingBionic = Simple Bionic Wings (Whitescale)
+marking-HarpyWingBionic-bionic_wings_tone_1 = Wings
+marking-HarpyWingBionic-bionic_wings_tone_2 = Lights (Unshaded)
+
 marking-HarpyEarsDefault = Feather Tufts
 marking-HarpyEarsDefault-harpy_ears_default = Tufts
 
@@ -65,6 +73,16 @@ marking-HarpyTailPeacock = Peacock Tail
 marking-HarpyTailPeacock-peacock_tail_feathers = Feathers
 marking-HarpyTailPeacock-peacock_tail_eyes = Eyes
 
+marking-HarpyTailHaven = Haven Tail (Whitescale)
+marking-HarpyTailHaven-haven_tone_1 = Outer Feathers
+marking-HarpyTailHaven-haven_tone_2 = Inner Feathers
+
+marking-HarpyTailForkedLong = Long Forked Tail (Whitescale)
+marking-HarpyTailForkedLong-forked_long = Tail
+
+marking-HarpyTailSwallow = Swallow Tail (Whitescale)
+marking-HarpyTailForkedLong-forked_long = Tail
+
 marking-HarpyChestDefault = Wing & Groin Under-Clothes
 marking-HarpyChestDefault-upper = Wing Under-Clothes
 marking-HarpyChestDefault-lower = Groin Under-Clothes
diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
index 697781be939..2629d836516 100644
--- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
+++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/harpy.yml
@@ -253,6 +253,56 @@
     - sprite: Mobs/Customization/Harpy/harpy_tails48x48.rsi
       state: peacock_tail_eyes
 
+- type: marking
+  id: HarpyTailHaven
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: haven_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: haven_tone_2
+
+- type: marking
+  id: HarpyTailForkedLong
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: forked_long
+
+- type: marking
+  id: HarpyTailSwallow
+  bodyPart: Tail
+  markingCategory: Tail
+  speciesRestriction: [Harpy]
+  coloring:
+    default:
+      type:
+        !type:CategoryColoring
+          category: Hair
+      fallbackTypes:
+        - !type:SimpleColoring
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_tails.rsi
+      state: swallow_tail
+
 - type: marking
   id: HarpyWing2ToneClassic
   bodyPart: RArm
@@ -310,6 +360,29 @@
     - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
       state: harpy_wingtip_2
 
+- type: marking
+  id: HarpyWingBat
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bat_wings_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bat_wings_tone_2
+
+- type: marking
+  id: HarpyWingBionic
+  bodyPart: RArm
+  markingCategory: Arms
+  speciesRestriction: [Harpy]
+  sprites:
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bionic_wings_tone_1
+    - sprite: Mobs/Customization/Harpy/harpy_wings.rsi
+      state: bionic_wings_tone_2
+      shader: unshaded
+
 - type: marking
   id: HarpyChestDefault
   bodyPart: Chest
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/forked_long.png
new file mode 100644
index 0000000000000000000000000000000000000000..280768b40af24643cf1eea7660bf0cfd1d5ebe05
GIT binary patch
literal 1245
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Xscb`J1#c2)=|%1_J8No8Qr
zI6rmbUT<bcfur#~lNL-AiR$Qx5j?8I7%1S~nJ_D3qKiRR@y#bf58oBtQT5m$nxn%c
zwx~D0^?&2GrnOB98ciKbx5oFje9jf}5YWAonpd}HulbpCOtOWs5`NEl5@x7c3wCRH
zzf3*)ok_k;vaTicVZ`T?J4OD*%rF0NqDFe+)(`uyPCjeN^x?<J;6t0dQ_7luRGpl(
z$M>B$tEso0N_(!E$G%Bb%MPBO^qIGAdd_m8&3k6AS^4C)#pPp*5~QCP7M-|odeP1P
zJ)R2bdTKM-C7lZ<IPe5&oLJCf`a(nTP)<?W{@=%5?_(8tDflO9#erqY{Y-lkSEYuX
zHO#(Je8)<w=$-xZml>0VdtWtbT=@EASH5yXKKqK$*zd1Tlx81q_%67^Ao`!ubCbW0
zdv9HGVs|JIw%DDMIWzV_4Yx$ahLGsB-f?d2%NW-$cgUA|v72#MxYXvXd5@pSdE|cR
zT-Ug_Het$t_VE3TiaRqTx9~hn0mcMpfk$L90|U1p2s75F#7|^kVCM03aSW-5dpj#}
z)h!2+*2#;a1rG9VvC;YTZNU!qiMv=7cX0+5aEcZ3FVg<d-}Ncu|8Mu0mX+yM{t}A~
zPdeXjnaSTaTXJ&6`IA0pPS?Ks{d;$^QM`&&x2eOTjS<X*87cqfKB(F|ZEd#S^2z$M
z{Z@t)rG9R+sNFe-ara$40scdOO`e=%i2M2Y<BDHBzj{2J*YPxX#9B!Io^Po5O-^7d
z+rj>_+xP2hT-NPRKk%NvoBe6g&#c*j`_*mU$_YHx6S{J{#_s#qf17uzOBC4X&W~d{
z{P4r;?@_+4l2wuh{|hV>PMwI?kQ3ozO=XIjwRFM>hT308Cz>@{{J48G>7wQQ^XKaJ
zhabB5Yo2&czL~V8QY_y_HiJeJwk4hp@p@H<gPb1!yr59G{jS!*%P&J@`#bE8ef*iV
zb=N7z=K<Dk0+qr~8gHNObX<IK$F7@+uXeBdefs;~{JnASxASO=b+=k=D~nWmaIu-|
zBCqqOmP3p#+itx*z|picVr|&mn@4$an7@?H;Lb3c?P%A?xGUJF!BA&j&++8tx8Hib
zmzveEda?V569O{s2V0Wr{g&(5wO=qWV5@vIowHWTQEO_Ku>?=vzVG|(xsrFeI~oeC
zV{5sX@uWSy;dy2F?+-V2%zt_2zwU>uqOU4HxYjTV^&XW{xEMizp<0+Luzv0Py=Tup
z@(#7VzT=P3d4|8Swbwi+XDcy3(C|AIem0WLQYn1zg-;zWYzwSP)=NwbouI89Rd_^-
zL0!`>X2A)iGlG`tGg<k09d`1F-YA%<$*++9L@r#W*Tg}*-zY?Got@*l6PBHvrx<G4
za~3ar^XBVs^U!NHjdvC@My>F+<1)D)(q8!4p>$i^diJF+3myilcb{iuaSfT#aOz9Z
z&XBeZKIepX8ZkUFG??kb)UHuyHv4JXtNV+uX0fVG@LT>ksMvs6Vcw$1s=BZB4S%&)
q<>$XT^k|-gaRSpZ9{qmnbMg;kc;eHRHDmxY3xlVtpUXO@geCyBy)|h7

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e818e7dd11e8a67e719be7bd065da25e56a847ab
GIT binary patch
literal 853
zcmV-b1FHOqP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004ZX+uL$Nkc;*
zP;zf(X>4Tx04UFuk-bX;K@i1XjFO;{6k3RgToJ`00Z|Z3iC~&&kwh?RbJ^q);qG$W
zB}lLpY%Bs6qK#jL|ADrGt%4vZf{3NHUyX$GZ4yWjE!<^pe!RUm%+3NGaa|Zr=L}$&
zB|8y|Dog2Q#rFaqh8cc@RpD6k$+;B%T%ULF$b1`-weY{ylg&8-@c7A7!m>+bc7ynO
z$&$QH?iU3$OFkrrZ8k{0l6t1W&yw>EewS>g60^LUtf}PNIMc?WU>oEya>&rjqS=qU
zNg!t~CYc8rLvWBl3{fb^po}%>C?UdZa%R8##_PTX6zLKCTByLLBaZ^TVX9?T%`t1#
zbKE*Aa_&Fp>1dM^jp~6Y(DmfHZzF(j2dGtD_v^@YYsY~15x6j0{vziz{XxCj(n1G7
za1%JYY-yQY;Cu@hc(7DktxH};ho%9qr$BES=(_>BR~oZwp5x>mNNw<mu7SOMV3hv{
zSHA%vxo8=*4B=z|001XYOjJd>y1LTR(v6Lcx3{-nU0uY)#Gjv^jEsz^sHmHpo0F51
zkB^T4005OnZi@f_01b3fPE-H?|NsC0|NsC0|Nj6z=pu#y000SaNLh0L01FWS01FWT
ze`H^g0003vNkl<ZSV!%a(XIj^3`7g!sw@Bhy?3S*DZB9oqAw;)43vc)hWY@KKhy#&
z0JQ)MK>Zv*<d`r8kPu=BeTo|e>wV;Pkr1iSxp>8%jGZiU;`RxB>P=XP1jl9ABLv@K
z<P4@_L|a!|kGYa@)fO?nIAMfeLKD&2P}KmU1e(mWSQivwgaV*XXtvF5P@SMSnyX3}
zSy+YI#eCBm+^(C#iYfq1olV--12thC2xXoIYF-PvJx>PA0$kz@-arG4h=~B%sAvk1
z1%N}w93V?NCQJg(T7U(h7GMFW1?T|B%jh4ur5<p;j^4=MEe%kf4@1Hm!=lc?aDKP+
zYehr>rX0KuQ2{8x-NFIgdCM0Ofah1vkG*^t)BfOpK^MYwK07A%r?5Qn!B>y4KTAKZ
fr#b%cU&#3nsynzg)gFOz00000NkvXXu0mjfXVZOu

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/haven_tone_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe98ec53eb2c4f1b570ef1a891228a7586e37178
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq002M$002M;0{{R3owtGP0004ZX+uL$Nkc;*
zP;zf(X>4Tx04UFuk-bX;K@i1XjFO;{6k3RgToJ`00Z|Z3iC~&&kwh?RbJ^q);qG$W
zB}lLpY%Bs6qK#jL|ADrGt%4vZf{3NHUyX$GZ4yWjE!<^pe!RUm%+3NGaa|Zr=L}$&
zB|8y|Dog2Q#rFaqh8cc@RpD6k$+;B%T%ULF$b1`-weY{ylg&8-@c7A7!m>+bc7ynO
z$&$QH?iU3$OFkrrZ8k{0l6t1W&yw>EewS>g60^LUtf}PNIMc?WU>oEya>&rjqS=qU
zNg!t~CYc8rLvWBl3{fb^po}%>C?UdZa%R8##_PTX6zLKCTByLLBaZ^TVX9?T%`t1#
zbKE*Aa_&Fp>1dM^jp~6Y(DmfHZzF(j2dGtD_v^@YYsY~15x6j0{vziz{XxCj(n1G7
za1%JYY-yQY;Cu@hc(7DktxH};ho%9qr$BES=(_>BR~oZwp5x>mNNw<mu7SOMV3hv{
zSHA%vxo8=*4B=z|000J1OjJec>goUh0LdQz2><{90(4SNQ~v<vw=hZo000SaNLh0L
z01FWS01FWTe`H^g0001mNkl<ZSV!%ZK@Pwm2n6;2pRO2<h*Z0!>1oG9HLxR|nsN{d
zC=e*1K%n4%K}t3N32NFX)M;#eYe}}H>wfPIhY5uBjfzsL^{HjkzY?9Gj$k8@ps<v`
z7T{1ofj|KT0tFNZLjb9q*zu>PQO%C(2{wk@-f5YZ#0@<$e-Pd$XM%#9FGyq$zd$^i
QBme*a07*qoM6N<$f@XjYK>z>%

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
index f33401617c0..94795a626ea 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/meta.json
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus",
+    "copyright": "Phoenix and Rooster by @leonardo_dabepis, Finch & Forked Tailfin by @stillxicarus, haven & forked_long & swallow by @Kilath",
     "size": {
         "x": 32,
         "y": 32
@@ -22,6 +22,22 @@
         {
             "name": "whitescale_forked_tailfin",
             "directions": 4
+        },
+        {
+            "name": "haven_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "haven_tone_2",
+            "directions": 4
+        },
+        {
+            "name": "forked_long",
+            "directions": 4
+        },
+        {
+            "name": "swallow_tail",
+            "directions": 4
         }
     ]
 }
diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_tails.rsi/swallow_tail.png
new file mode 100644
index 0000000000000000000000000000000000000000..f9187b66f84ad6bddfef3452079a7697372ed3a7
GIT binary patch
literal 1092
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU@Xscb`J1#c2)=|%1_J8No8Qr
zI6rmbUT<bcfur#~lNL-AiR$Qx5j?8I7%1S~nJ_D3qKiRR@y#bf58oBtQT5m$nxn%c
zwx~D0^?&2GrnOB98ciKbx5oFje9jf}5YWAonpd}HulbpCOtOWs5`NEl5@x7c3wCRH
zzf3*)ok_k;vaTicVZ`T?J4OD*%rF0NqDFe+)(`uyPCjeN^x?<J;6t0dQ_7luRGpl(
z$M>B$tEso0N_(!E$G%Bb%MPBO^qIGAdd_m8&3k6AS^4C)#pPp*5~QCP7M-|odeP1P
zJ)R2bdTKM-C7lZ<IPe5&oLJCf`a(nTP)<?W{@=%5?_(8tDflO9#erqY{Y-lkSEYuX
zHO#(Je8)<w=$-xZml>0VdtWtbT=@EASH5yXKKqK$*zd1Tlx81q_%67^Ao`!ubCbW0
zdv9HGVs|JIw%DDMIWzV_4Yx$ahLGsB-f?d2%NW-$cgUA|v72#MxYXvXd5@pSdE|cR
zT-Ug_Het$t_VE3TiaRqTx9~hn0mcMpfk$L90|U1p2s75F#7|^kU@G=>aSW-5dppaq
z>yU$h>*G6)ANeLJ$T{sftWeBhevbD}MTg=OzD3gh3P}QYb_=e5p!7I@)so)Mmq#Sk
zX0Bp?czf-!Rrgbcf--s8nEj3Nmm~!;dmLTFHlfRvS3$H}%0Wxav>`+%i(zHN6^5XV
zD;Sp~3FbSz&F{=LlddW~pSRt6*WGpHR&)0#a73B>bqK8MUDNQisM1@m%W!Y#EH|kO
z@4xSTTb3Q?Y`D(rF^|Rk^PFM#*pkm&-XPMuhC%P|;fDz(xgL^SyayaL@;_JaJ@tRD
zR>IW4PaeODc2*pJ{4tH~+3JwSV%8^bZE{Z~ZS;8a(LYhWf64XNTW9t^{-G+Y^`CW-
zhF8<;gX~_x``xT6Rrc=gQ=ja~{i}=9k1e772jlFr-G5*H-WNE_=s|I6_(RFalg;Z5
zOrF<WTc!3Sj$`4Jg>x)QEM%U=6&Td?v8|cwxBNqO=CjW`f7Z_Ec@n`GHdmNk{_)0@
zZWF%#%%1w}-@nV+2XE%2H67>+$V<D#$kNYnpu|dd?jGJg<s0&o*vcMdCa{R473^^h
zZ@ML`hCTSOhVLU@jXk>O{@RvAZIY6yuZ^}{{XgS)l*s&I)&<5#?#{Amme@J_Y13rJ
zJL!+#`OJMN5nJ8t$9CZ2)vT{ubVJ1jl#@!=HaRgrP$|3Cay4B*JE?4C({i>2&OKqp
zB5l19wQL)e(vF;qeP?5Ip6Q2>%#pAuHL~ZKcy=9q|9E5O<z(qzH~z{yk_q<02TmUU
zU7H+c$8B>wWi~^Oat~u9zw@8=Cz7{W5~LTNXP>}z^z%N(GM}Yx(sM<+fN7G!)78&q
Iol`;+090D%3;+NC

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..a147739cc90c5cc7bd164a8bb774730f17eed382
GIT binary patch
literal 1581
zcmV+|2GaS7P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lkv&TTK@f(YL?xn;6k3Rgq=;e>K@`MNB50!)F@jN><h)CS+~v4SkYFp=SO^xP
zjbDZTKwH69K@b!{#M0WYM&z6|fdonRn45=p_Z?<u!9SDJOt*OgOsn9;r(@y8<We~B
zN`O9zR-!4*wP)w25;R<2_xM!48&b6zpR2ptS9MndU#sw#W;+F8>4us0f~|O4xJ%2X
zR)vp*qmDEve693!nO_uV%KV|&NyI0?uWE)fHJq+tE$f)VgTfIrSJW!~sG9_JYhhk;
zk3=snai)n8CQXqwaugVnY{|^(`-cB~bL7RN$={}gBaRGN@kT{0N>yF5A-XPKj*^=D
z|9QH`=t#MGFa|Bpp7-7lfnE67@x1S2&-*!nrYE?xs{XvpY5Y_4ovIc&gwQ6OUsbjA
z9$aie_oJP1Qh!pDgx@gW?F>4S(0L1O%jH>B_Bnlk#D+Z44eTGlfSeDl`~o4lXc-r;
zD+mAp010qNS#tmY3labT3lag+-G2N400d=8L_t(|UhSGqPUAojg-sMLz=|`BV8kWh
z7KjBKmPip|!GbLag*!x?feq|90SaiAXqJdGAZ2(So~Kf-?yim<CZp+3ifp&5t6u-u
z?YLZ3g+ifFC=?2XLXz=#JnM44D=Gh}^PTWI_uA!<>oeCr2^~(S)0sT>p6`O!x7SXy
zmNI~&-QC^l_4TzretLSUMx#-y9_+Tax9k1Q&CTlm{@%39!5drJ=V~xd9v&W6M@L81
z!^1-(0Kq{@0Jad}6%ax;-V>YTYDo4bf=?eG=gv)TZd&yY_V?$e-1nWGiuFChC6U-`
zAF)H#paGjkhetzGcz1U<+uPf#kDKf1GdLW{V<0<0HeTEEm;z)Rk`cSMu{z<i@nDvt
zVNM8wTaDD^@*J>6pTTtJghs*>+nRYA#`9`OI-~$p#1<mpP<H^!X%}m(7b|wEPOlmu
zfW0TTdc<X!+<KQH3oEt<T`#3!5IVu$w|ZTdg=|niCBQ<Cd@gdtITK<U%no1$&y<TH
zuj7<0k+C~X-|BZ~q%;h0N0bHZeHonBl?T|#DGNW=C?Ia%u}O}GR_|ET9_QhN+bTfJ
zPB(<-W3eG{k>?1&X9>CFhBQREzP@e*rfx>^ysWn<Ik8EuhTu&Qpcg-A_G7k$cBtpA
zV<BTNN+%7MmzT|QBA1pFa_PZ7{G{q=WNhG#O?2IC4d>_Qy$XogYP!ZI+6VkvcCA$a
z#y?+P7Fxn2ayf%f-4MMBaF)r~eF1;)s~?P-_zZ6K_VMxYLLFe$V+<)`8L^2=!$&Vv
z7Z(?;%3v~?bP~{|ewVtEzWfvlg+ifFC=?2X{~YUO<|^<dy6_kB?d`1&!aV%agGOL%
zYJs-g_ZP#IfuzpS?e8}M@xNNXb>)8FFEuRRh|O|p(mBi&ZjlIdH6GXd$k~stu39!a
zE8ABmu#r}lnv70P>hA%-$!O$`?K0ADYxKKyPCM@BCNyIpwoZ2Hc(jdWutPMLfX>^?
zMz@j)pZR$NXM+(e_xf7|CSBxfEt%ku8V<zA5<1~xejmV_3O`99I)j4O%){ZZdVhbf
zemp<Vb&wo&i1ds?4C#Zjfgskmt*we$PESu;87+Ct?}y|-XNzOwb^cwCMjwqQ(wB}S
zFFC6dQbaRD5;Q#4c$w5(#-$(|E)$(N<~;)1s59>E53b&#Lr!;n&B<x6kNbktU(T?Q
z7F-s<GaG^iY&3cmgtErEyw9nx(Y~!tkmUfE1qgM9`F#L>7;XGQYdUNOgTY++GN!&p
z#z1Un&~d2=+Sv}aOWM`n2i)G?R_p8QGx<$kDu-^3{IaIL#v1j|OaRt%0&MlS18(3@
zKNwkM%S5NwLS?;kc6Jv1LhLKC;^G(@Lv<|N%OIR@Y;3e{c-Ss`+FQtnBUuKGy$%Sc
zx1L^KJ?%rpw7D*c(EoYfHLXUjO5;hWu`CaDMDvvxzs9ouW_s5CRUr0Eplugk1^(vS
fA20uc#+Bk10P^udA=g`(00000NkvXXu0mjf*Ean;

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bat_wings_tone_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b2170ff803c694b4080f0a18e8ec78b2ff383adb
GIT binary patch
literal 1753
zcmV;~1}6E5P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0004QX+uL$X=7sm
z04R}lkv&TTK@f(YL?xn;6k3Rgq=;e>K@`MNB50!)F@jN><h)CS+~v4SkYFp=SO^xP
zjbDZTKwH69K@b!{#M0WYM&z6|fdonRn45=p_Z?<u!9SDJOt*OgOsn9;r(@y8<We~B
zN`O9zR-!4*wP)w25;R<2_xM!48&b6zpR2ptS9MndU#sw#W;+F8>4us0f~|O4xJ%2X
zR)vp*qmDEve693!nO_uV%KV|&NyI0?uWE)fHJq+tE$f)VgTfIrSJW!~sG9_JYhhk;
zk3=snai)n8CQXqwaugVnY{|^(`-cB~bL7RN$={}gBaRGN@kT{0N>yF5A-XPKj*^=D
z|9QH`=t#MGFa|Bpp7-7lfnE67@x1S2&-*!nrYE?xs{XvpY5Y_4ovIc&gwQ6OUsbjA
z9$aie_oJP1Qh!pDgx@gW?F>4S(0L1O%jH>B_Bnlk#D+Z44eTGlfSeDl`~o4lXc-r;
zD+mAp010qNS#tmY3labT3lag+-G2N400j|AL_t(|UhSGqN+d}X$0NlPxDb({4=}W%
zYZo#!y6_4^(cVEkh14A!%DIHn%t~BZlrqa^Xa*4%E?o&Z@eAW0^C~|o(<)~Wj2|Rc
zW_-Mlc=0mLm(FD}nM@{=$z(E_OeT}bd@zbxjg!fwyuZJ9H#axMWIUc~`)xEzzrPL!
zQ*E1DTW(`xqg-2CbDNu+Gi8Y3aOkXzqvPWsdw+kw*Z6sLSZ=zA;S99KGhzH&`oFaa
zbzS{Dg`cB*cz6hgbUEVa=qUWH%APgGVizRva$YdsEFBshAO#qJXMY_G%HKz$qRn`S
z#)o$G_m_*ky}e*iUnKkD;vzWy{QSHoyJoEWHv+T(NoQ|^oZ7@v^#a}+v(nL92v(a9
zsqnX|fX>yfaVUZz%*VX01Id>07$e$b3!_7lqw(0%ro)s2@Dv@j@9@4~K|--QZYK0+
z9IFt|g96OoHb$})_KYQZUMpKf9ZGEA9GjYSNDffKv&JhNwYU2aL$F{R<5`hOG%U;&
z74Y+i1FFeZ$?LVUMO6pu1git29AFc~>FH^?<tL%DCd8YB=ByC({lcDi=I+8gcXxN?
zAK$)(oWRPE@x3yko!`vMZ;b!t%NHxVFtS_2Uql_8(Sak(hfRlvheh?SQcHq(OA2t@
z-rg1iAC4nGdG%IUMeX!IJ39-)IX^f!aO>;qWz#K9*&iBYJ0rW-9U=BBjSc~HVE(EO
zwIry}({?D!6fM0JaIqib6!r?mF05?E8rgHfc!hnN4pT;HZ`fSGHD%?l5Cm>V3d7;a
zN%8aN&u)8rJKcubo(HV#>+9>{Prv#+3=#UQY9HAm>JSpR<SD0t)uFZps!v~0fnLS~
z{l41YUYVz-C%3b+(-{TGzP!9F{`&qs?PtG5`bJ(N>X5b|V3T!1jjOAx(kG<FVy*?8
zz`^{;;hMb*MA@mISVSMmYig4YnM@{=$z(E_OeT}bWHOnL$gAJCRpC9GsyP%is>Rg4
z?-JY4OIFP(8MN`cZ}qs1#^R_&3Wz~0cd3jegX0_Ag_P+7^7O{ppBB7J#1UIj$I(ks
zHqd7QIvs%VGMcxx7|v_!<>h7f{QT^AeN7)*-Qkrq#mv6Nj4o90RGAD}iV9x4;}ow`
zc>Qjx(IX<f!vQlD)N5ppajg2tcpH*jS6HF|j-oW(<^8^>M2{YFw3RDeSP-1Rbz5PY
zwM|+hz}D2Y>S2H}p2)DZ{FC7@6*=4Hofqchg9~IHztjrCR`7<Fth98Jo-Wn|u>o7!
z3NoEl8qlN)ce^F5@mymM_St){MY%|_ae^vPDdeMUwgo5}W>ux8F4zwUR##U;8%YMN
zk)R}~1jx0w4*e>2D*%a5+fYdm<Q!1(waGT9eIG!h?VyUU!dr<D<Cm6}!u5H+>6sT5
zT#<=vbkGMF(oYLztJ$)PcKdxmr@|^(gA!rW%In&HwfaI^K_5|ojRelEzFp4=t&R2$
z0CCmB7@P3^Pvb?^2^=Qu!!1}&=(-cMIzXS6K{V1mK0X$I|M+1O-dxq&w}b-dAQn_{
z!cU(*xs{cb-~=rmf9<xmG~Nc4FysJ?*F(te?rvK7w|dZ71auh3NFYJRXhg5H&uPP^
zCMVP!pk!!_PxsiEQ49P0{~n0Cr2h-zSEuQLiS66<JP@D*hrX(U>L;kQsh0m<h~EM@
vtGBKT+GJmCg1#{Ly%{g$goO;ud_evIT$ZXrgM6yg00000NkvXXu0mjf>_%I_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..752d6cc9a2062ae380ac67d49149f5c25e783f9a
GIT binary patch
literal 1448
zcmV;Z1y}lsP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz1wBbbK~#8N?V7tw
zEHM<uXKigPY<&C+vWnRI0<A2qwHFj0omL7WK0vV)U9k}x!A|hii}=`o!AGNDq1ZWh
zzGJ>Mo5^HnW%PP4`N1%gOmfb5&Lo-L%?2Ki$K&yMJRXn7<N1YbZEc0>vMSQ{t5N4f
zE-x>`YDJ(u`l({ow6wH{Px>|eFD@?T)TI@@9}d`)8y2jFT3cJuQLeA9uH^jq_$cS8
zsi{QgkuY&oUtcff$c~(chlgRuDVjj+`1rUgeFFb3-vk=yUuR`yB`6k)vHr0Ukk9AC
zLZKkn2p*0ZJPgAD10}4ZWA<V4U=MbsPyqzr*4Cy<pSG&O>;rqYq=Hxi#>U3ve0+Qy
zJUu;0&^*$hw?}{20km6*wY4=&JGrhla1-{2J=nDoO8^BRfS#V7AeT!ua$}$$`ooS(
zfXU|Orc50i=&KWrDCa0L@1s9$!LE&10w^Gwi^2Q*yPQ!5m7WOi+xjO7FyXWzdJ;G?
zlF;v4lBcf9DN6uWOj|><&RmSla*_?M&Mu+_Glyw&a&l5iJki$%8|HoVhaK31T~%F1
zSpv|A0?y9Pq^_psqY0mG(n`#Fwqrlop@1Y2I#^66Cns~=-QB9@lPDl(f7^Z7fjx8K
zCb20%0TUAwV(j|*TIxZi*N}dn{b0u>KnHDhcXu(A!{}*>Ehf|)(n+u#`@s(E!LCh1
zSpswc7Z(>{dwY8>3_to*D**k_A9h><bb5PxgN=<1Rr+`nku;+R=<W3WunYT6Ae6!5
z;G9h}cXjlBv_;#}Ac5uO<q!wkqb|+JvB7?fhqmRWMp;(bptG}6<}fmdCs}Fe+kgPR
z3h_4Jn!>4N0+H&n<Qr2*RehPIrKOM>2u7y5{7isNz*mDOW)g@lKnEJK@=Z()rth-C
z-w;6f08UR&GxJTTp{uJ)%2o{!fCEDY9aMEDz#i<<hpLW&HtO<QsA&JM3-EY69*@W4
z@pwEQkH_;9WcI5In4O(1eczv%nfWJdXJQEAnwy(d>4V$b+suT1r~Rr7JUl#vhlhvq
zn;n0DpPQQto0^*BzDX7$ZNZbfySrd|dRpw`CwTns*Voq<G&D4%_L;h2<SaZoI+EaV
zz<F(LZBSQNr&`4M?gW76=jY({^)<jlKmu@J10*V^@*CS4GuheM2@!l_W22O@+k1b1
zA3zlL56lfroh*i^%LaTy1GGRBv;k;^W@wiR2Z;$N6bj+?_O=Ww2LJN%BIo}8{?hih
zzIUkON=&sR*@ACqfEH*1)CkScju;S&R9bL8A!HF}CIDO9`UVHVUV^zLo^~%UE#~$d
zl9Hr_3B#xWuIb>M0{i>>5<D_(+w%v-Vlj3Pb3bcLoA3$WHgFG`p&c=}a3<jG?M=@4
zd|u7~8FrD?>&XN*D<xLfM$L>N32QX-^Yh`t!a~UHDb91-T*MoJWIgO{=stAcgc_+C
zF(4MiBozi$!TQ{f783kNK*|_e`n<ysq==sgUWaP}7CNr}Kwkr>-L)22M*tdf;R6WV
z6+Au@{513l4f<LDjnqpJOVUDUtwh$;r5M8BO!Q4n2LIDfJqdma)JFn#fbr)DecEC~
zsLK+u5wO0#E`c(G`cud7y1BXeRlx&jfhK6v7eZ=hER0R3EQr<B)o^fdu=M@}99~01
zLpfwRGJ>u2UlY7e^wh(Vkr7D<Km6#U0#jjcZ!Z`f9WCjP1%fX;0|NuW`T4mR;cWO#
zPdp9!B8i9B(a{ke92}(oq67mp@-Oqh#NqiKg5VFn9K^XpNOI8t0000<MNUMnLSTZ5
C-KO#Y

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/bionic_wings_tone_2.png
new file mode 100644
index 0000000000000000000000000000000000000000..528b5cbfa04c80c5e42971c67068c84fc96d2774
GIT binary patch
literal 329
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1quc!F!%Ajv*CsZ*L@W9ai9JOMG9i^Zt?LHcm0O
zV;R17;fL=%KW`QBIK4zS0;rfF!F}ts<2&X&+WX#F|4P(st!wr2ydUh=rT=++dG2Aq
zKVHgj8Wu9NrT<ag*J{Dd&X68ve_)!uf@oOlo|y0781!G6pDNia7bd#s`bU${tpW?J
zE(%QiJ(b%)uXYcsi13bL#%%(*i?YNSK~^y^{0RO#VdMNQ?<#KWu$is9=kmnOXO(gf
zUA+0xv^Ta~i{Z({k1z9EpHJAyIqA*J`%5>ykt}aCDLxjfaDL88&YAzWG1RS`qCR0d
Uhf+r841JJ!p00i_>zopr052DVy#N3J

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
index 7737af0afc2..c8bf28767a8 100644
--- a/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
+++ b/Resources/Textures/Mobs/Customization/Harpy/harpy_wings.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus",
+    "copyright": "classicharpy Taken from S.P.L.U.R.T at commit https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13/commit/285f6f86ac41a6246f250993486effeab8581c2c, edited by @raistlin_jag | harpyfolded, harpy, and owl by @stillxicarus, bat wings by @Kilath",
     "states": [
         {
             "name": "huescale_harpy",
@@ -78,6 +78,22 @@
         {
             "name": "whitescale_harpy_wing_owl",
             "directions": 4
+        },
+        {
+            "name": "bat_wings_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "bat_wings_tone_2",
+            "directions": 4
+        },
+        {
+            "name": "bionic_wings_tone_1",
+            "directions": 4
+        },
+        {
+            "name": "bionic_wings_tone_2",
+            "directions": 4
         }
     ]
 }

From 07325fcdf80e9545da7d38a718c225e5b792136d Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:12:04 +0000
Subject: [PATCH 04/21] Automatic Changelog Update (#696)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index fb3fd2c343c..3334fd4e136 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5059,3 +5059,11 @@ Entries:
       message: Mr. Butlertron can now suffer for its crimes.
   id: 6233
   time: '2024-08-07T22:38:04.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Add
+      message: >-
+        The following new markings have been added for Harpies: Bat Wings,
+        Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked Tail
+  id: 6234
+  time: '2024-08-07T23:11:41.0000000+00:00'

From 020e90ab1d9c7adf4c293053881b15a4bc8b4aae Mon Sep 17 00:00:00 2001
From: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Date: Thu, 8 Aug 2024 00:16:30 +0100
Subject: [PATCH 05/21] Add Le Psionic Orb From Nyanotrasen (#685)

# Description

It says Psionic chat out loud


<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>


![image](https://github.com/user-attachments/assets/a60c4110-ce1b-40ca-8177-df2d0b45b6da)

</p>
</details>

---

# Changelog


:cl:
- add: Readded Psionic Relay Orb
---
 .../Entities/Objects/Specific/Research/misc.yml          | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
new file mode 100644
index 00000000000..79c475900aa
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Specific/Research/misc.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: PonderingOrb
+  id: PonderingOrbTelepathic
+  name: telepathic relay orb
+  description: Relays messages intercepted from Psionics.
+  components:
+  - type: TelepathicRepeater
+  - type: Psionic
+  - type: Speech
\ No newline at end of file

From 9e83f669c836e8934ad21585c2c1dcaed6ebec93 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:16:55 +0000
Subject: [PATCH 06/21] Automatic Changelog Update (#685)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 3334fd4e136..b7ab981fc63 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5067,3 +5067,9 @@ Entries:
         Simple Bionic Wings, Haven Tail, Swallow tail, and Long Forked Tail
   id: 6234
   time: '2024-08-07T23:11:41.0000000+00:00'
+- author: DangerRevolution
+  changes:
+    - type: Add
+      message: Readded Psionic Relay Orb
+  id: 6235
+  time: '2024-08-07T23:16:30.0000000+00:00'

From dfe5c2c54045c026621f009b676f7f3ef97692dc Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 7 Aug 2024 19:18:35 -0400
Subject: [PATCH 07/21] Psionic Refactor Part 1: Respacing To Keep Files
 Changed Down (#698)

# Description

Due to some inherent limitations of maintenance, code review, and me
having both severely crippling ADHD and a lifelong adderal dependency,
I've made the executive decision to break apart the Psionic Refactor
into a multitude of smaller, bite sized PRs. I'm keeping the original
Psionic Refactor PR open, because I'm going to need it for code
reference to keep track of the changes I had originally worked on, but I
need to essentially restart the entire refactor from scratch, and
approach it from a new angle that's going to make everything actually
way easier. I also need to be able to work on each available system
individually wherever possible, and this fact is most readily shown by
how the Lightning Refactor and Oracle Refactor were both done
separately.

To start off, this PR is ONLY moving all of the relevant psionics code
to core folders, and nothing more. I'm doing this first so that I can
immediately cut down massively on the "Files Changed" with the simplest,
most basic change necessary to start my work.

No changelog because this isn't player facing, and no media because
there's literally nothing to show.
---
 .../CartridgeLoader/Cartridges/GlimmerMonitorUi.cs        | 5 ++---
 .../Cartridges/GlimmerMonitorUiFragment.xaml              | 2 +-
 .../Cartridges/GlimmerMonitorUiFragment.xaml.cs           | 4 ++--
 .../{Nyanotrasen => }/Chat/PsionicChatUpdateSystem.cs     | 2 +-
 .../Psionics/Glimmer/GlimmerReactiveVisuals.cs            | 0
 .../{Nyanotrasen => }/Psionics/UI/AcceptPsionicsEUI.cs    | 0
 .../{Nyanotrasen => }/Psionics/UI/AcceptPsionicsWindow.cs | 0
 .../{Nyanotrasen => }/UserInterface/GlimmerGraph.cs       | 2 +-
 .../UserInterface/Systems/Chat/ChatUIController.cs        | 1 -
 .../Abilities/Psionics/Abilities/DispelPowerSystem.cs     | 0
 .../Psionics/Abilities/MetapsionicPowerSystem.cs          | 0
 .../Abilities/Psionics/Abilities/MindSwapPowerSystem.cs   | 0
 .../Abilities/Psionics/Abilities/MindSwappedComponent.cs  | 0
 .../Psionics/Abilities/NoosphericZapPowerSystem.cs        | 0
 .../Psionics/Abilities/PsionicInvisibilityPowerSystem.cs  | 0
 .../Psionics/Abilities/PsionicRegenerationPowerSystem.cs  | 0
 .../Psionics/Abilities/PyrokinesisPowerSystem.cs          | 0
 .../Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs | 0
 .../Abilities/Psionics/PsionicAbilitiesSystem.cs          | 0
 .../{Nyanotrasen => }/Audio/GlimmerSoundComponent.cs      | 0
 .../Cartridges}/GlimmerMonitorCartridgeComponent.cs       | 0
 .../Cartridges}/GlimmerMonitorCartridgeSystem.cs          | 0
 .../{Nyanotrasen/Chat => Chat/Commands}/TSayCommand.cs    | 0
 Content.Server/Chat/Systems/ChatSystem.cs                 | 8 +++-----
 .../NyanoChatSystem.cs => Chat/TelepathicChatSystem.cs}   | 6 +++---
 .../{Nyanotrasen => }/Chat/TelepathicRepeaterComponent.cs | 2 +-
 .../{Nyanotrasen => }/Psionics/AcceptPsionicsEui.cs       | 0
 .../Psionics/AntiPsychicWeaponComponent.cs                | 0
 .../{Nyanotrasen => }/Psionics/Dreams/DreamSystem.cs      | 0
 .../{Nyanotrasen => }/Psionics/Glimmer/GlimmerCommands.cs | 0
 .../Psionics/Glimmer/GlimmerReactiveSystem.cs             | 0
 .../Psionics/Glimmer/PassiveGlimmerReductionSystem.cs     | 0
 .../Psionics/Glimmer/Structures/GlimmerSourceComponent.cs | 0
 .../Glimmer/Structures/GlimmerStructuresSystem.cs         | 0
 .../Psionics/Invisibility/PsionicInvisibilitySystem.cs    | 0
 .../Invisibility/PsionicInvisibleContactsComponent.cs     | 0
 .../Invisibility/PsionicInvisibleContactsSystem.cs        | 0
 .../Invisibility/PsionicallyInvisibleComponent.cs         | 0
 .../Psionics/PotentialPsionicComponent.cs                 | 0
 .../Psionics/PsionicAwaitingPlayerComponent.cs            | 0
 .../Psionics/PsionicBonusChanceComponent.cs               | 0
 .../{Nyanotrasen => }/Psionics/PsionicsCommands.cs        | 0
 .../{Nyanotrasen => }/Psionics/PsionicsSystem.cs          | 0
 .../StationEvents/Components/FreeProberRuleComponent.cs   | 0
 .../StationEvents/Components/GlimmerEventComponent.cs     | 0
 .../Components/GlimmerRandomSentienceRuleComponent.cs     | 0
 .../Components/GlimmerRevenantSpawnRuleComponent.cs       | 0
 .../StationEvents/Components/GlimmerWispRuleComponent.cs  | 0
 .../StationEvents/Components/MassMindSwapRuleComponent.cs | 0
 .../Components/MundaneDischargeRuleComponent.cs           | 0
 .../Components/NoosphericFryRuleComponent.cs              | 0
 .../Components/NoosphericStormRuleComponent.cs            | 0
 .../Components/NoosphericZapRuleComponent.cs              | 0
 .../Components/PsionicCatGotYourTongueRuleComponent.cs    | 0
 .../StationEvents/Events/FreeProberRule.cs                | 0
 .../StationEvents/Events/GlimmerEventSystem.cs            | 0
 .../StationEvents/Events/GlimmerRandomSentienceRule.cs    | 0
 .../StationEvents/Events/GlimmerRevenantSpawnRule.cs      | 0
 .../StationEvents/Events/GlimmerWispSpawnRule.cs          | 0
 .../StationEvents/Events/MassMindSwapRule.cs              | 0
 .../StationEvents/Events/MundaneDischargeRule.cs          | 0
 .../StationEvents/Events/NoosphericFryRule.cs             | 0
 .../StationEvents/Events/NoosphericStormRule.cs           | 0
 .../StationEvents/Events/NoosphericZapRule.cs             | 0
 .../StationEvents/Events/PsionicCatGotYourTongueRule.cs   | 0
 .../Actions/Events/DispelPowerActionEvent.cs              | 0
 .../Actions/Events/EatMouseActionEvent.cs                 | 0
 .../Actions/Events/HairballActionEvent.cs                 | 0
 .../Actions/Events/MassSleepPowerActionEvent.cs           | 0
 .../Actions/Events/MetapsionicPowerActionEvent.cs         | 0
 .../Actions/Events/MindSwapPowerActionEvent.cs            | 0
 .../Actions/Events/NoosphericZapPowerActionEvent.cs       | 0
 .../Actions/Events/PsionicInvisibilityPowerActionEvent.cs | 0
 .../Actions/Events/PsionicRegenerationPowerActionEvent.cs | 0
 .../Actions/Events/PyrokinesisPowerActionEvent.cs         | 0
 .../RemovePsionicInvisibilityOffPowerActionEvent.cs       | 0
 .../Actions/Events/TelegnosisPowerActionEvent.cs          | 0
 .../CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs   | 0
 .../{Nyanotrasen => }/Chapel/SacrificeDoAfterEvent.cs     | 0
 .../Psionics/Abilities/AcceptPsionicsEuiMessage.cs        | 0
 .../Psionics/Abilities/Dispel/DamageOnDispelComponent.cs  | 0
 .../Psionics/Abilities/Dispel/DispelPowerComponent.cs     | 0
 .../Psionics/Abilities/Dispel/DispellableComponent.cs     | 0
 .../Abilities/MassSleep/MassSleepPowerComponent.cs        | 0
 .../Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs  | 0
 .../Abilities/Metapsionics/MetapsionicPowerComponent.cs   | 0
 .../Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs | 0
 .../NoosphericZap/NoosphericZapPowerComponent.cs          | 0
 .../PsionicInvisibilityPowerComponent.cs                  | 0
 .../PsionicInvisibilityUsedComponent.cs                   | 0
 .../PsionicRegenerationPowerComponent.cs                  | 0
 .../Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs    | 0
 .../Abilities/Telegnosis/TelegnosisPowerComponent.cs      | 0
 .../Telegnosis/TelegnosticProjectionComponent.cs          | 0
 Content.Shared/{Nyanotrasen => }/Psionics/Events.cs       | 0
 .../{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs   | 0
 .../Psionics/Glimmer/SharedGlimmerReactiveComponent.cs    | 0
 .../Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs      | 0
 .../Psionics/Items/ClothingGrantPsionicPowerComponent.cs  | 0
 .../Abilities => }/Psionics/Items/HeadCageComponent.cs    | 0
 .../Abilities => }/Psionics/Items/HeadCagedComponent.cs   | 0
 .../Abilities => }/Psionics/Items/PsionicItemsSystem.cs   | 0
 .../Abilities => }/Psionics/Items/TinfoilHatComponent.cs  | 0
 .../Abilities => }/Psionics/PsionicComponent.cs           | 0
 .../Abilities => }/Psionics/PsionicInsulationComponent.cs | 0
 .../Abilities => }/Psionics/PsionicsDisabledComponent.cs  | 0
 .../Psionics/SharedPsionicAbilitiesSystem.cs              | 0
 Content.Shared/{Nyanotrasen => }/Soul/GolemMessages.cs    | 0
 .../{Nyanotrasen => }/Soul/GunHeldByGolemComponent.cs     | 0
 .../{Nyanotrasen => }/Soul/SharedGolemComponent.cs        | 0
 .../{Nyanotrasen => }/Soul/SharedGolemSystem.cs           | 0
 111 files changed, 14 insertions(+), 18 deletions(-)
 rename Content.Client/{Nyanotrasen => }/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs (88%)
 rename Content.Client/{Nyanotrasen => }/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml (93%)
 rename Content.Client/{Nyanotrasen => }/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs (96%)
 rename Content.Client/{Nyanotrasen => }/Chat/PsionicChatUpdateSystem.cs (96%)
 rename Content.Client/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveVisuals.cs (100%)
 rename Content.Client/{Nyanotrasen => }/Psionics/UI/AcceptPsionicsEUI.cs (100%)
 rename Content.Client/{Nyanotrasen => }/Psionics/UI/AcceptPsionicsWindow.cs (100%)
 rename Content.Client/{Nyanotrasen => }/UserInterface/GlimmerGraph.cs (97%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/DispelPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/MindSwappedComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Abilities/Psionics/PsionicAbilitiesSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Audio/GlimmerSoundComponent.cs (100%)
 rename Content.Server/{Nyanotrasen/CartridgeLoader => CartridgeLoader/Cartridges}/GlimmerMonitorCartridgeComponent.cs (100%)
 rename Content.Server/{Nyanotrasen/CartridgeLoader => CartridgeLoader/Cartridges}/GlimmerMonitorCartridgeSystem.cs (100%)
 rename Content.Server/{Nyanotrasen/Chat => Chat/Commands}/TSayCommand.cs (100%)
 rename Content.Server/{Nyanotrasen/Chat/NyanoChatSystem.cs => Chat/TelepathicChatSystem.cs} (97%)
 rename Content.Server/{Nyanotrasen => }/Chat/TelepathicRepeaterComponent.cs (83%)
 rename Content.Server/{Nyanotrasen => }/Psionics/AcceptPsionicsEui.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/AntiPsychicWeaponComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Dreams/DreamSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerCommands.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/GlimmerReactiveSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibilitySystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/Invisibility/PsionicallyInvisibleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PotentialPsionicComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicAwaitingPlayerComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicBonusChanceComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsCommands.cs (100%)
 rename Content.Server/{Nyanotrasen => }/Psionics/PsionicsSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/FreeProberRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/GlimmerEventComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/GlimmerWispRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/MassMindSwapRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/MundaneDischargeRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/NoosphericFryRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/NoosphericStormRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/NoosphericZapRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/FreeProberRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/GlimmerEventSystem.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/GlimmerRandomSentienceRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/GlimmerRevenantSpawnRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/GlimmerWispSpawnRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/MassMindSwapRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/MundaneDischargeRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/NoosphericFryRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/NoosphericStormRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/NoosphericZapRule.cs (100%)
 rename Content.Server/{Nyanotrasen => }/StationEvents/Events/PsionicCatGotYourTongueRule.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/DispelPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/EatMouseActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/HairballActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/MassSleepPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/MetapsionicPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/MindSwapPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/NoosphericZapPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/PsionicInvisibilityPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/PsionicRegenerationPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/PyrokinesisPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Actions/Events/TelegnosisPowerActionEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Chapel/SacrificeDoAfterEvent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/AcceptPsionicsEuiMessage.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispelPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Dispel/DispellableComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Events.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/GlimmerSystem.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/ClothingGrantPsionicPowerComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCageComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/HeadCagedComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/PsionicItemsSystem.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/Items/TinfoilHatComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicInsulationComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/PsionicsDisabledComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen/Abilities => }/Psionics/SharedPsionicAbilitiesSystem.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Soul/GolemMessages.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Soul/GunHeldByGolemComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Soul/SharedGolemComponent.cs (100%)
 rename Content.Shared/{Nyanotrasen => }/Soul/SharedGolemSystem.cs (100%)

diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
similarity index 88%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
index 0b5fc7ad38c..9ef968e43b1 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUi.cs
@@ -1,10 +1,9 @@
-using Robust.Client.GameObjects;
-using Robust.Client.UserInterface;
+using Robust.Client.UserInterface;
 using Content.Client.UserInterface.Fragments;
 using Content.Shared.CartridgeLoader.Cartridges;
 using Content.Shared.CartridgeLoader;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 public sealed partial class GlimmerMonitorUi : UIFragment
 {
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
similarity index 93%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
index 119a1831e6e..e09a422ddf7 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml
@@ -1,4 +1,4 @@
-<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.Nyanotrasen.CartridgeLoader.Cartridges"
+<cartridges:GlimmerMonitorUiFragment xmlns:cartridges="clr-namespace:Content.Client.CartridgeLoader.Cartridges"
                                  xmlns="https://spacestation14.io" Margin="1 0 2 0">
     <PanelContainer StyleClasses="BackgroundDark"></PanelContainer>
     <BoxContainer Name="SettingsBox" Orientation="Horizontal" HorizontalExpand="True" VerticalExpand="False">
diff --git a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
similarity index 96%
rename from Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
rename to Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
index 43d9202aa45..3325c0d379e 100644
--- a/Content.Client/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
+++ b/Content.Client/CartridgeLoader/Cartridges/GlimmerMonitorUiFragment.xaml.cs
@@ -1,12 +1,12 @@
 using System.Linq;
 using System.Numerics;
-using Content.Client.Nyanotrasen.UserInterface;
+using Content.Client.UserInterface;
 using Robust.Client.AutoGenerated;
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Nyanotrasen.CartridgeLoader.Cartridges;
+namespace Content.Client.CartridgeLoader.Cartridges;
 
 [GenerateTypedNameReferences]
 public sealed partial class GlimmerMonitorUiFragment : BoxContainer
diff --git a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs b/Content.Client/Chat/PsionicChatUpdateSystem.cs
similarity index 96%
rename from Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
rename to Content.Client/Chat/PsionicChatUpdateSystem.cs
index 84602052fe7..066501acb78 100644
--- a/Content.Client/Nyanotrasen/Chat/PsionicChatUpdateSystem.cs
+++ b/Content.Client/Chat/PsionicChatUpdateSystem.cs
@@ -2,7 +2,7 @@
 using Content.Client.Chat.Managers;
 using Robust.Client.Player;
 
-namespace Content.Client.Nyanotrasen.Chat
+namespace Content.Client.Chat
 {
     public sealed class PsionicChatUpdateSystem : EntitySystem
     {
diff --git a/Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs b/Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveVisuals.cs
rename to Content.Client/Psionics/Glimmer/GlimmerReactiveVisuals.cs
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs b/Content.Client/Psionics/UI/AcceptPsionicsEUI.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsEUI.cs
rename to Content.Client/Psionics/UI/AcceptPsionicsEUI.cs
diff --git a/Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs b/Content.Client/Psionics/UI/AcceptPsionicsWindow.cs
similarity index 100%
rename from Content.Client/Nyanotrasen/Psionics/UI/AcceptPsionicsWindow.cs
rename to Content.Client/Psionics/UI/AcceptPsionicsWindow.cs
diff --git a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs b/Content.Client/UserInterface/GlimmerGraph.cs
similarity index 97%
rename from Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
rename to Content.Client/UserInterface/GlimmerGraph.cs
index c4a9109dcd8..188ebe2475b 100644
--- a/Content.Client/Nyanotrasen/UserInterface/GlimmerGraph.cs
+++ b/Content.Client/UserInterface/GlimmerGraph.cs
@@ -4,7 +4,7 @@
 using Robust.Client.ResourceManagement;
 using Robust.Client.UserInterface;
 
-namespace Content.Client.Nyanotrasen.UserInterface;
+namespace Content.Client.UserInterface;
 
 public sealed class GlimmerGraph : Control
 {
diff --git a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
index 138dc9e52be..bc79283d76e 100644
--- a/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
+++ b/Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
@@ -38,7 +38,6 @@
 using Robust.Shared.Replays;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
-using Content.Client.Nyanotrasen.Chat; //Nyano - Summary: chat namespace.
 
 namespace Content.Client.UserInterface.Systems.Chat;
 
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/DispelPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/DispelPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/DispelPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/MetapsionicPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/MindSwapPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs b/Content.Server/Abilities/Psionics/Abilities/MindSwappedComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/MindSwappedComponent.cs
rename to Content.Server/Abilities/Psionics/Abilities/MindSwappedComponent.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/NoosphericZapPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/PsionicInvisibilityPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/PsionicRegenerationPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/PyrokinesisPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs b/Content.Server/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
rename to Content.Server/Abilities/Psionics/Abilities/TelegnosisPowerSystem.cs
diff --git a/Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs b/Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Abilities/Psionics/PsionicAbilitiesSystem.cs
rename to Content.Server/Abilities/Psionics/PsionicAbilitiesSystem.cs
diff --git a/Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs b/Content.Server/Audio/GlimmerSoundComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Audio/GlimmerSoundComponent.cs
rename to Content.Server/Audio/GlimmerSoundComponent.cs
diff --git a/Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeComponent.cs b/Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeComponent.cs
rename to Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeComponent.cs
diff --git a/Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeSystem.cs b/Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/CartridgeLoader/GlimmerMonitorCartridgeSystem.cs
rename to Content.Server/CartridgeLoader/Cartridges/GlimmerMonitorCartridgeSystem.cs
diff --git a/Content.Server/Nyanotrasen/Chat/TSayCommand.cs b/Content.Server/Chat/Commands/TSayCommand.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Chat/TSayCommand.cs
rename to Content.Server/Chat/Commands/TSayCommand.cs
diff --git a/Content.Server/Chat/Systems/ChatSystem.cs b/Content.Server/Chat/Systems/ChatSystem.cs
index b41d2deda6f..b4641928e48 100644
--- a/Content.Server/Chat/Systems/ChatSystem.cs
+++ b/Content.Server/Chat/Systems/ChatSystem.cs
@@ -8,7 +8,7 @@
 using Content.Server.Language;
 using Content.Server.Speech.Components;
 using Content.Server.Speech.EntitySystems;
-using Content.Server.Nyanotrasen.Chat;
+using Content.Server.Chat;
 using Content.Server.Station.Components;
 using Content.Server.Station.Systems;
 using Content.Shared.ActionBlocker;
@@ -69,9 +69,7 @@ public sealed partial class ChatSystem : SharedChatSystem
     [Dependency] private readonly SharedInteractionSystem _interactionSystem = default!;
     [Dependency] private readonly ReplacementAccentSystem _wordreplacement = default!;
     [Dependency] private readonly LanguageSystem _language = default!;
-
-    //Nyano - Summary: pulls in the nyano chat system for psionics.
-    [Dependency] private readonly NyanoChatSystem _nyanoChatSystem = default!;
+    [Dependency] private readonly TelepathicChatSystem _telepath = default!;
 
     public const int VoiceRange = 10; // how far voice goes in world units
     public const int WhisperClearRange = 2; // how far whisper goes while still being understandable, in world units
@@ -277,7 +275,7 @@ public void TrySendInGameICMessage(
                 break;
             //Nyano - Summary: case adds the telepathic chat sending ability.
             case InGameICChatType.Telepathic:
-                _nyanoChatSystem.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
+                _telepath.SendTelepathicChat(source, message, range == ChatTransmitRange.HideChat);
                 break;
         }
     }
diff --git a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs b/Content.Server/Chat/TelepathicChatSystem.cs
similarity index 97%
rename from Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
rename to Content.Server/Chat/TelepathicChatSystem.cs
index 58ed1782741..8d44ead9d07 100644
--- a/Content.Server/Nyanotrasen/Chat/NyanoChatSystem.cs
+++ b/Content.Server/Chat/TelepathicChatSystem.cs
@@ -16,13 +16,13 @@
 using System.Linq;
 using System.Text;
 
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Chat
 {
     /// <summary>
-    /// Extensions for nyano's chat stuff
+    /// Extensions for Telepathic chat stuff
     /// </summary>
 
-    public sealed class NyanoChatSystem : EntitySystem
+    public sealed class TelepathicChatSystem : EntitySystem
     {
         [Dependency] private readonly IAdminManager _adminManager = default!;
         [Dependency] private readonly IChatManager _chatManager = default!;
diff --git a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs b/Content.Server/Chat/TelepathicRepeaterComponent.cs
similarity index 83%
rename from Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
rename to Content.Server/Chat/TelepathicRepeaterComponent.cs
index fc199f4332a..2183fafd4d1 100644
--- a/Content.Server/Nyanotrasen/Chat/TelepathicRepeaterComponent.cs
+++ b/Content.Server/Chat/TelepathicRepeaterComponent.cs
@@ -1,4 +1,4 @@
-namespace Content.Server.Nyanotrasen.Chat
+namespace Content.Server.Chat
 {
     /// <summary>
     /// Repeats whatever is happening in telepathic chat.
diff --git a/Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs b/Content.Server/Psionics/AcceptPsionicsEui.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/AcceptPsionicsEui.cs
rename to Content.Server/Psionics/AcceptPsionicsEui.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs b/Content.Server/Psionics/AntiPsychicWeaponComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/AntiPsychicWeaponComponent.cs
rename to Content.Server/Psionics/AntiPsychicWeaponComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs b/Content.Server/Psionics/Dreams/DreamSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Dreams/DreamSystem.cs
rename to Content.Server/Psionics/Dreams/DreamSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs b/Content.Server/Psionics/Glimmer/GlimmerCommands.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerCommands.cs
rename to Content.Server/Psionics/Glimmer/GlimmerCommands.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs b/Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/GlimmerReactiveSystem.cs
rename to Content.Server/Psionics/Glimmer/GlimmerReactiveSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs b/Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
rename to Content.Server/Psionics/Glimmer/PassiveGlimmerReductionSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerSourceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs b/Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
rename to Content.Server/Psionics/Glimmer/Structures/GlimmerStructuresSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibilitySystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibilitySystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs b/Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
rename to Content.Server/Psionics/Invisibility/PsionicInvisibleContactsSystem.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs b/Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
rename to Content.Server/Psionics/Invisibility/PsionicallyInvisibleComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs b/Content.Server/Psionics/PotentialPsionicComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PotentialPsionicComponent.cs
rename to Content.Server/Psionics/PotentialPsionicComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs b/Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicAwaitingPlayerComponent.cs
rename to Content.Server/Psionics/PsionicAwaitingPlayerComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs b/Content.Server/Psionics/PsionicBonusChanceComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicBonusChanceComponent.cs
rename to Content.Server/Psionics/PsionicBonusChanceComponent.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs b/Content.Server/Psionics/PsionicsCommands.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsCommands.cs
rename to Content.Server/Psionics/PsionicsCommands.cs
diff --git a/Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/Psionics/PsionicsSystem.cs
rename to Content.Server/Psionics/PsionicsSystem.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs b/Content.Server/StationEvents/Components/FreeProberRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/FreeProberRuleComponent.cs
rename to Content.Server/StationEvents/Components/FreeProberRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerEventComponent.cs b/Content.Server/StationEvents/Components/GlimmerEventComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerEventComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerEventComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerRandomSentienceRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerRevenantSpawnRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs b/Content.Server/StationEvents/Components/GlimmerWispRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/GlimmerWispRuleComponent.cs
rename to Content.Server/StationEvents/Components/GlimmerWispRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs b/Content.Server/StationEvents/Components/MassMindSwapRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/MassMindSwapRuleComponent.cs
rename to Content.Server/StationEvents/Components/MassMindSwapRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs b/Content.Server/StationEvents/Components/MundaneDischargeRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/MundaneDischargeRuleComponent.cs
rename to Content.Server/StationEvents/Components/MundaneDischargeRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericFryRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericFryRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericStormRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericStormRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericStormRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs b/Content.Server/StationEvents/Components/NoosphericZapRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/NoosphericZapRuleComponent.cs
rename to Content.Server/StationEvents/Components/NoosphericZapRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs b/Content.Server/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
rename to Content.Server/StationEvents/Components/PsionicCatGotYourTongueRuleComponent.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs b/Content.Server/StationEvents/Events/FreeProberRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/FreeProberRule.cs
rename to Content.Server/StationEvents/Events/FreeProberRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs b/Content.Server/StationEvents/Events/GlimmerEventSystem.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerEventSystem.cs
rename to Content.Server/StationEvents/Events/GlimmerEventSystem.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs b/Content.Server/StationEvents/Events/GlimmerRandomSentienceRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRandomSentienceRule.cs
rename to Content.Server/StationEvents/Events/GlimmerRandomSentienceRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs b/Content.Server/StationEvents/Events/GlimmerRevenantSpawnRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerRevenantSpawnRule.cs
rename to Content.Server/StationEvents/Events/GlimmerRevenantSpawnRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs b/Content.Server/StationEvents/Events/GlimmerWispSpawnRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/GlimmerWispSpawnRule.cs
rename to Content.Server/StationEvents/Events/GlimmerWispSpawnRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs b/Content.Server/StationEvents/Events/MassMindSwapRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/MassMindSwapRule.cs
rename to Content.Server/StationEvents/Events/MassMindSwapRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs b/Content.Server/StationEvents/Events/MundaneDischargeRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/MundaneDischargeRule.cs
rename to Content.Server/StationEvents/Events/MundaneDischargeRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs b/Content.Server/StationEvents/Events/NoosphericFryRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericFryRule.cs
rename to Content.Server/StationEvents/Events/NoosphericFryRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs b/Content.Server/StationEvents/Events/NoosphericStormRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericStormRule.cs
rename to Content.Server/StationEvents/Events/NoosphericStormRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs b/Content.Server/StationEvents/Events/NoosphericZapRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/NoosphericZapRule.cs
rename to Content.Server/StationEvents/Events/NoosphericZapRule.cs
diff --git a/Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs b/Content.Server/StationEvents/Events/PsionicCatGotYourTongueRule.cs
similarity index 100%
rename from Content.Server/Nyanotrasen/StationEvents/Events/PsionicCatGotYourTongueRule.cs
rename to Content.Server/StationEvents/Events/PsionicCatGotYourTongueRule.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/DispelPowerActionEvent.cs b/Content.Shared/Actions/Events/DispelPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/DispelPowerActionEvent.cs
rename to Content.Shared/Actions/Events/DispelPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/EatMouseActionEvent.cs b/Content.Shared/Actions/Events/EatMouseActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/EatMouseActionEvent.cs
rename to Content.Shared/Actions/Events/EatMouseActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs b/Content.Shared/Actions/Events/HairballActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs
rename to Content.Shared/Actions/Events/HairballActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs b/Content.Shared/Actions/Events/MassSleepPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/MassSleepPowerActionEvent.cs
rename to Content.Shared/Actions/Events/MassSleepPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs b/Content.Shared/Actions/Events/MetapsionicPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/MetapsionicPowerActionEvent.cs
rename to Content.Shared/Actions/Events/MetapsionicPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/MindSwapPowerActionEvent.cs b/Content.Shared/Actions/Events/MindSwapPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/MindSwapPowerActionEvent.cs
rename to Content.Shared/Actions/Events/MindSwapPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/NoosphericZapPowerActionEvent.cs b/Content.Shared/Actions/Events/NoosphericZapPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/NoosphericZapPowerActionEvent.cs
rename to Content.Shared/Actions/Events/NoosphericZapPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PsionicInvisibilityPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
rename to Content.Shared/Actions/Events/PsionicInvisibilityPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PsionicRegenerationPowerActionEvent.cs b/Content.Shared/Actions/Events/PsionicRegenerationPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/PsionicRegenerationPowerActionEvent.cs
rename to Content.Shared/Actions/Events/PsionicRegenerationPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs b/Content.Shared/Actions/Events/PyrokinesisPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/PyrokinesisPowerActionEvent.cs
rename to Content.Shared/Actions/Events/PyrokinesisPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs b/Content.Shared/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
rename to Content.Shared/Actions/Events/RemovePsionicInvisibilityOffPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Actions/Events/TelegnosisPowerActionEvent.cs b/Content.Shared/Actions/Events/TelegnosisPowerActionEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Actions/Events/TelegnosisPowerActionEvent.cs
rename to Content.Shared/Actions/Events/TelegnosisPowerActionEvent.cs
diff --git a/Content.Shared/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs b/Content.Shared/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
rename to Content.Shared/CartridgeLoader/Cartridges/GlimmerMonitorUiState.cs
diff --git a/Content.Shared/Nyanotrasen/Chapel/SacrificeDoAfterEvent.cs b/Content.Shared/Chapel/SacrificeDoAfterEvent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Chapel/SacrificeDoAfterEvent.cs
rename to Content.Shared/Chapel/SacrificeDoAfterEvent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs b/Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
rename to Content.Shared/Psionics/Abilities/AcceptPsionicsEuiMessage.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DamageOnDispelComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispelPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispelPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs b/Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Dispel/DispellableComponent.cs
rename to Content.Shared/Psionics/Abilities/Dispel/DispellableComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs b/Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
rename to Content.Shared/Psionics/Abilities/MassSleep/MassSleepPowerSystem.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs b/Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Metapsionics/MetapsionicPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs b/Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/MindSwap/MindSwapPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs b/Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/NoosphericZap/NoosphericZapPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs b/Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicInvisibility/PsionicInvisibilityUsedComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs b/Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/PsionicRegeneration/PsionicRegenerationPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Pyrokinesis/PyrokinesisPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosisPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs b/Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
rename to Content.Shared/Psionics/Abilities/Telegnosis/TelegnosticProjectionComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Events.cs b/Content.Shared/Psionics/Events.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Events.cs
rename to Content.Shared/Psionics/Events.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/GlimmerSystem.cs
rename to Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs b/Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
rename to Content.Shared/Psionics/Glimmer/SharedGlimmerReactiveVisuals.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs b/Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
rename to Content.Shared/Psionics/Items/ClothingGrantPsionicPowerComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs b/Content.Shared/Psionics/Items/HeadCageComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCageComponent.cs
rename to Content.Shared/Psionics/Items/HeadCageComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs b/Content.Shared/Psionics/Items/HeadCagedComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/HeadCagedComponent.cs
rename to Content.Shared/Psionics/Items/HeadCagedComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs b/Content.Shared/Psionics/Items/PsionicItemsSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/PsionicItemsSystem.cs
rename to Content.Shared/Psionics/Items/PsionicItemsSystem.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs b/Content.Shared/Psionics/Items/TinfoilHatComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/Items/TinfoilHatComponent.cs
rename to Content.Shared/Psionics/Items/TinfoilHatComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs b/Content.Shared/Psionics/PsionicComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicComponent.cs
rename to Content.Shared/Psionics/PsionicComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs b/Content.Shared/Psionics/PsionicInsulationComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicInsulationComponent.cs
rename to Content.Shared/Psionics/PsionicInsulationComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs b/Content.Shared/Psionics/PsionicsDisabledComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/PsionicsDisabledComponent.cs
rename to Content.Shared/Psionics/PsionicsDisabledComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs b/Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Abilities/Psionics/SharedPsionicAbilitiesSystem.cs
rename to Content.Shared/Psionics/SharedPsionicAbilitiesSystem.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/GolemMessages.cs b/Content.Shared/Soul/GolemMessages.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/GolemMessages.cs
rename to Content.Shared/Soul/GolemMessages.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/GunHeldByGolemComponent.cs b/Content.Shared/Soul/GunHeldByGolemComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/GunHeldByGolemComponent.cs
rename to Content.Shared/Soul/GunHeldByGolemComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/SharedGolemComponent.cs b/Content.Shared/Soul/SharedGolemComponent.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/SharedGolemComponent.cs
rename to Content.Shared/Soul/SharedGolemComponent.cs
diff --git a/Content.Shared/Nyanotrasen/Soul/SharedGolemSystem.cs b/Content.Shared/Soul/SharedGolemSystem.cs
similarity index 100%
rename from Content.Shared/Nyanotrasen/Soul/SharedGolemSystem.cs
rename to Content.Shared/Soul/SharedGolemSystem.cs

From f79c6db8c9549bb595423205004893ed59cb1f8d Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 8 Aug 2024 07:38:33 +0800
Subject: [PATCH 08/21] New Trait: Sluggish / Snail-Paced (#692)

# Description

This PR adds two new negative traits that decrease your movement speed:
**Sluggish** and **Snail-Paced**.

- Sluggish (+1 points)
  - 15% slower movement speed
- 35% slower climbing speed (for standard tables, from 1.5s to ~2.02
seconds)
- Cooldown on laying down/standing up increased from 2.5 seconds to 3
seconds
- Snail-Paced (+2 points)
  - 30% slower movement speed
- 66% slower climbing speed (for standard tables, from 1.5s to ~2.48
seconds)
- Cooldown on laying down/standing up increased from 2.5 seconds to 4
seconds

## Media

<details><summary>Expand</summary>

**Trait entry**


![image](https://github.com/user-attachments/assets/cb483536-ec3e-4c28-a4b4-c431bb1b669e)


![image](https://github.com/user-attachments/assets/a251844e-7058-4d4b-b21d-a5637c39489f)

</details>

# Changelog

:cl: Skubman
- add: Add two new negative traits: Sluggish (+1) and Snail-Paced (+2)
that make you move slower, and climb tables slower.

---------

Signed-off-by: Angelo Fallaria <ba.fallaria@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
---
 .../Assorted/TraitSpeedModifierComponent.cs   | 14 +++++++
 .../Assorted/TraitSpeedModifierSystem.cs      | 19 ++++++++++
 Resources/Locale/en-US/traits/traits.ftl      | 12 +++++-
 Resources/Prototypes/Traits/disabilities.yml  | 38 +++++++++++++++++++
 Resources/Prototypes/Traits/skills.yml        |  6 +++
 5 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Traits/Assorted/TraitSpeedModifierComponent.cs
 create mode 100644 Content.Server/Traits/Assorted/TraitSpeedModifierSystem.cs

diff --git a/Content.Server/Traits/Assorted/TraitSpeedModifierComponent.cs b/Content.Server/Traits/Assorted/TraitSpeedModifierComponent.cs
new file mode 100644
index 00000000000..6acb32e6c1d
--- /dev/null
+++ b/Content.Server/Traits/Assorted/TraitSpeedModifierComponent.cs
@@ -0,0 +1,14 @@
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///  This component is used for traits that modify movement speed.
+/// </summary>
+[RegisterComponent]
+public sealed partial class TraitSpeedModifierComponent : Component
+{
+    [DataField(required: true)]
+    public float WalkModifier = 1.0f;
+
+    [DataField(required: true)]
+    public float SprintModifier = 1.0f;
+}
diff --git a/Content.Server/Traits/Assorted/TraitSpeedModifierSystem.cs b/Content.Server/Traits/Assorted/TraitSpeedModifierSystem.cs
new file mode 100644
index 00000000000..c804592347a
--- /dev/null
+++ b/Content.Server/Traits/Assorted/TraitSpeedModifierSystem.cs
@@ -0,0 +1,19 @@
+using Content.Shared.Movement.Systems;
+using Content.Server.Traits.Assorted;
+
+namespace Content.Shared.Traits.Assorted;
+
+public sealed class TraitSpeedModifierSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TraitSpeedModifierComponent, RefreshMovementSpeedModifiersEvent>(OnRefreshMovementSpeed);
+    }
+
+    private void OnRefreshMovementSpeed(EntityUid uid, TraitSpeedModifierComponent component, RefreshMovementSpeedModifiersEvent args)
+    {
+        args.ModifySpeed(component.WalkModifier, component.SprintModifier);
+    }
+}
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 3439ffcdc97..5fb361af01f 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -89,6 +89,16 @@ trait-description-ParkourTraining =
     Whether as a hobby, lifestyle, or professional training, you are trained in the discipline of parkour.
     You're faster with climbing, crawling, lying down, and getting up.
 
+trait-name-Sluggish = Sluggish
+trait-description-Sluggish =
+    You navigate the world slower than others, perhaps due to a medical condition, inactivity, or age.
+    You move slower, and it takes longer for you to climb, lie down and get up.
+
+trait-name-SnailPaced = Snail-Paced
+trait-description-SnailPaced =
+    You walk at a snail's pace, perhaps due to a medical condition, mobility impairment, or age.
+    You move substantially slower, and it takes far longer for you to climb, lie down and get up.
+
 trait-name-LightStep = Light Step
 trait-description-LightStep =
     You move with a gentle step, making your footsteps quieter.
@@ -106,4 +116,4 @@ trait-description-Spearmaster =
 trait-name-WeaponsGeneralist = Weapons Generalist
 trait-description-WeaponsGeneralist =
     You are a jack of all trades with melee weapons, enabling you to be versatile with your weapon arsenal.
-    Your melee damage bonus for all Brute damage types (Blunt, Slash, Piercing) becomes 25%.
\ No newline at end of file
+    Your melee damage bonus for all Brute damage types (Blunt, Slash, Piercing) becomes 25%.
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index afdd27f339d..c47a673f84a 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -95,6 +95,44 @@
   components:
     - type: Snoring
 
+- type: trait
+  id: Sluggish
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ParkourTraining
+        - SnailPaced
+  components:
+    - type: TraitSpeedModifier
+      sprintModifier: 0.85
+      walkModifier: 0.85
+    - type: ClimbDelayModifier
+      climbDelayMultiplier: 1.35
+    - type: LayingDownModifier
+      layingDownCooldownMultiplier: 1.2
+
+- type: trait
+  id: SnailPaced
+  category: Physical
+  points: 2
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - ParkourTraining
+        - Sluggish
+  components:
+    - type: TraitSpeedModifier
+      sprintModifier: 0.7
+      walkModifier: 0.7
+    - type: ClimbDelayModifier
+      climbDelayMultiplier: 1.66
+    - type: LayingDownModifier
+      layingDownCooldownMultiplier: 1.6
+
 - type: trait
   id: BloodDeficiency
   category: Physical
diff --git a/Resources/Prototypes/Traits/skills.yml b/Resources/Prototypes/Traits/skills.yml
index 1a4242aff80..0da622da3c9 100644
--- a/Resources/Prototypes/Traits/skills.yml
+++ b/Resources/Prototypes/Traits/skills.yml
@@ -91,6 +91,12 @@
   id: ParkourTraining
   category: Physical
   points: -3
+  requirements:
+    - !type:CharacterTraitRequirement
+      inverted: true
+      traits:
+        - Sluggish
+        - SnailPaced
   components:
     - type: ClimbDelayModifier
       climbDelayMultiplier: 0.70

From 04330a4cc89906508db781503f55a2ea8084b770 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:38:58 +0000
Subject: [PATCH 09/21] Automatic Changelog Update (#692)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index b7ab981fc63..6de7dc7bf17 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5073,3 +5073,11 @@ Entries:
       message: Readded Psionic Relay Orb
   id: 6235
   time: '2024-08-07T23:16:30.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add two new negative traits: Sluggish (+1) and Snail-Paced (+2) that
+        make you move slower, and climb tables slower.
+  id: 6236
+  time: '2024-08-07T23:38:33.0000000+00:00'

From 54e59822b6098df2f399c67d3fb7f7b6e2f1cbdd Mon Sep 17 00:00:00 2001
From: Angelo Fallaria <ba.fallaria@gmail.com>
Date: Thu, 8 Aug 2024 07:39:52 +0800
Subject: [PATCH 10/21] New Trait: Hemophilia (#690)

# Description

**Hemophilia** is a +1 point negative Physical trait that makes you more
susceptible to bleeding. You bleed twice as long, and you take 10% more
Blunt damage.

## Media

<details><summary>Expand</summary>


![image](https://github.com/user-attachments/assets/ceb0e91e-73c8-4986-a566-40fb9cd0d32b)

</details>

---

# Changelog

:cl: Skubman
- add: Add the Hemophilia trait, a new negative trait for 1 point that
makes you bleed twice as long and makes you take 10% more Blunt damage.
---
 .../Body/Components/BloodstreamComponent.cs   |  2 +-
 Content.Server/Traits/HemophiliaComponent.cs  | 21 ++++++++++++++
 Content.Server/Traits/HemophiliaSystem.cs     | 28 +++++++++++++++++++
 Resources/Locale/en-US/traits/traits.ftl      |  5 ++++
 Resources/Prototypes/Traits/disabilities.yml  | 17 +++++++++++
 5 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 Content.Server/Traits/HemophiliaComponent.cs
 create mode 100644 Content.Server/Traits/HemophiliaSystem.cs

diff --git a/Content.Server/Body/Components/BloodstreamComponent.cs b/Content.Server/Body/Components/BloodstreamComponent.cs
index 76eadb99fd8..dd93da9598c 100644
--- a/Content.Server/Body/Components/BloodstreamComponent.cs
+++ b/Content.Server/Body/Components/BloodstreamComponent.cs
@@ -12,7 +12,7 @@
 
 namespace Content.Server.Body.Components
 {
-    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem))]
+    [RegisterComponent, Access(typeof(BloodstreamSystem), typeof(ReactionMixerSystem), typeof(BloodDeficiencySystem), typeof(HemophiliaSystem))]
     public sealed partial class BloodstreamComponent : Component
     {
         public static string DefaultChemicalsSolutionName = "chemicals";
diff --git a/Content.Server/Traits/HemophiliaComponent.cs b/Content.Server/Traits/HemophiliaComponent.cs
new file mode 100644
index 00000000000..e8f1f57c6e5
--- /dev/null
+++ b/Content.Server/Traits/HemophiliaComponent.cs
@@ -0,0 +1,21 @@
+using Content.Shared.Damage;
+namespace Content.Server.Traits.Assorted;
+
+/// <summary>
+///   This is used for the Hemophilia trait.
+/// </summary>
+[RegisterComponent]
+public sealed partial class HemophiliaComponent : Component
+{
+    // <summary>
+    //   What the BleedReductionAmount should be multiplied by.
+    // </summary>
+    [DataField(required: true)]
+    public float BleedReductionModifier = 1f;
+
+    /// <summary>
+    ///   The damage increase from this trait.
+    /// </summary>
+    [DataField(required: true)]
+    public DamageModifierSet DamageModifiers = default!;
+}
diff --git a/Content.Server/Traits/HemophiliaSystem.cs b/Content.Server/Traits/HemophiliaSystem.cs
new file mode 100644
index 00000000000..c70c7de37c0
--- /dev/null
+++ b/Content.Server/Traits/HemophiliaSystem.cs
@@ -0,0 +1,28 @@
+using Content.Server.Body.Systems;
+using Content.Server.Body.Components;
+using Content.Shared.Damage;
+
+namespace Content.Server.Traits.Assorted;
+
+public sealed class HemophiliaSystem : EntitySystem
+{
+    public override void Initialize()
+    {
+        base.Initialize();
+        SubscribeLocalEvent<HemophiliaComponent, ComponentStartup>(OnStartup);
+        SubscribeLocalEvent<HemophiliaComponent, DamageModifyEvent>(OnDamageModify);
+    }
+
+    private void OnStartup(EntityUid uid, HemophiliaComponent component, ComponentStartup args)
+    {
+        if (!TryComp<BloodstreamComponent>(uid, out var bloodstream))
+            return;
+
+        bloodstream.BleedReductionAmount *= component.BleedReductionModifier;
+    }
+
+    private void OnDamageModify(EntityUid uid, HemophiliaComponent component, DamageModifyEvent args)
+    {
+        args.Damage = DamageSpecifier.ApplyModifierSet(args.Damage, component.DamageModifiers);
+    }
+}
diff --git a/Resources/Locale/en-US/traits/traits.ftl b/Resources/Locale/en-US/traits/traits.ftl
index 5fb361af01f..16cae663009 100644
--- a/Resources/Locale/en-US/traits/traits.ftl
+++ b/Resources/Locale/en-US/traits/traits.ftl
@@ -28,6 +28,11 @@ trait-description-BloodDeficiency =
     Your body loses more blood than it can replenish.
     You lose blood over time, and when left untreated you will eventually die from blood loss.
 
+trait-name-Hemophilia = Hemophilia
+trait-description-Hemophilia =
+    Your body's ability to form blood clots is impaired.
+    You bleed twice as long, and you have easy bruising, taking 10% more Blunt damage.
+
 trait-name-Paracusia = Paracusia
 trait-description-Paracusia = You hear sounds that aren't really there
 
diff --git a/Resources/Prototypes/Traits/disabilities.yml b/Resources/Prototypes/Traits/disabilities.yml
index c47a673f84a..915ea0bf674 100644
--- a/Resources/Prototypes/Traits/disabilities.yml
+++ b/Resources/Prototypes/Traits/disabilities.yml
@@ -146,3 +146,20 @@
   components:
     - type: BloodDeficiency  # 0.07 = start taking bloodloss damage at around ~21.4 minutes,
       bloodLossAmount: 0.07  # then become crit ~10 minutes later
+
+- type: trait
+  id: Hemophilia
+  category: Physical
+  points: 1
+  requirements:
+    - !type:CharacterJobRequirement
+      inverted: true
+      jobs:
+        - Borg
+        - MedicalBorg
+  components:
+    - type: Hemophilia
+      bleedReductionModifier: 0.5
+      damageModifiers:
+        coefficients:
+          Blunt: 1.1

From 0fc4051e4f1333da6d8b1ea57531230aa9e48b9b Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:40:16 +0000
Subject: [PATCH 11/21] Automatic Changelog Update (#690)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 6de7dc7bf17..744677a1147 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5081,3 +5081,11 @@ Entries:
         make you move slower, and climb tables slower.
   id: 6236
   time: '2024-08-07T23:38:33.0000000+00:00'
+- author: Skubman
+  changes:
+    - type: Add
+      message: >-
+        Add the Hemophilia trait, a new negative trait for 1 point that makes
+        you bleed twice as long and makes you take 10% more Blunt damage.
+  id: 6237
+  time: '2024-08-07T23:39:52.0000000+00:00'

From c469961bf9944fdd37da2578f84211e51a075293 Mon Sep 17 00:00:00 2001
From: SleepyScarecrow <136123749+SleepyScarecrow@users.noreply.github.com>
Date: Wed, 7 Aug 2024 19:51:29 -0400
Subject: [PATCH 12/21] Aloe Cream Recipe Fix, Now 15 Seconds (#688)

<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Changed the cooking time for aloe cream, so now it doesn't interfere
with RegenerativeMesh any longer.

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl:
- fix: Fixed the RegenMesh recipe
---
 Resources/Prototypes/Recipes/Cooking/medical_recipes.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
index 9d1947f03eb..03ca5203582 100644
--- a/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
+++ b/Resources/Prototypes/Recipes/Cooking/medical_recipes.yml
@@ -2,7 +2,7 @@
   id: RecipeAloeCream
   name: aloe cream recipe
   result: AloeCream
-  time: 10
+  time: 15
   solids:
     FoodAloe: 1
 

From 7ef43ac75251636175c535ea610118b9870704b8 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:51:52 +0000
Subject: [PATCH 13/21] Automatic Changelog Update (#688)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 744677a1147..bb19e08360c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5089,3 +5089,9 @@ Entries:
         you bleed twice as long and makes you take 10% more Blunt damage.
   id: 6237
   time: '2024-08-07T23:39:52.0000000+00:00'
+- author: SleepyScarecrow
+  changes:
+    - type: Fix
+      message: Fixed the RegenMesh recipe
+  id: 6238
+  time: '2024-08-07T23:51:29.0000000+00:00'

From f2e6d1a657588be369a9ac0c2a19c9a4962170af Mon Sep 17 00:00:00 2001
From: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Date: Wed, 7 Aug 2024 16:54:13 -0700
Subject: [PATCH 14/21] New Plant Trait : Bluespace Slips (#674)

# Description

Adds a new trait which plants can mutate to have.
It teleports both the slippee and the produce to a random location
within a radius determined by how potent the produce is.
Inert unless the plant also has the slippery trait.

~~Probably very stinky code considering this is my first time dealing
with c#.~~

---
<details><summary><h1>Media</h1></summary>
<p>



https://github.com/user-attachments/assets/cd22756d-ea5e-4a30-8043-c991549c9019



</p>
</details>

---

# Changelog

:cl:
- add: Added Bluespace Slips, a plant trait that teleports you randomly
if you slip.
---
 .../Components/TeleportingTraitComponent.cs   | 31 +++++++++++
 Content.Server/Botany/SeedPrototype.cs        |  8 ++-
 .../Botany/Systems/BotanySystem.Seed.cs       |  5 ++
 .../Botany/Systems/MutationSystem.cs          |  6 ++-
 .../Botany/Systems/TeleportingTraitSystem.cs  | 51 +++++++++++++++++++
 .../teleporting-trait-component.ftl           |  1 +
 6 files changed, 99 insertions(+), 3 deletions(-)
 create mode 100644 Content.Server/Botany/Components/TeleportingTraitComponent.cs
 create mode 100644 Content.Server/Botany/Systems/TeleportingTraitSystem.cs
 create mode 100644 Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl

diff --git a/Content.Server/Botany/Components/TeleportingTraitComponent.cs b/Content.Server/Botany/Components/TeleportingTraitComponent.cs
new file mode 100644
index 00000000000..b5f79ac8c7e
--- /dev/null
+++ b/Content.Server/Botany/Components/TeleportingTraitComponent.cs
@@ -0,0 +1,31 @@
+namespace Content.Server.Botany
+{
+    [RegisterComponent]
+
+    public sealed partial class TeleportingTraitComponent : Component
+    {
+        /// <summary>
+        ///     Teleportation radius of produce.
+        /// </summary>
+        [DataField]
+        public float ProduceTeleportRadius;
+
+        /// <summary>
+        ///     How much to divide the potency.
+        /// </summary>
+        [DataField]
+        public float PotencyDivide = 10f;
+
+        /// <summary>
+        ///     Potency of fruit.
+        /// </summary>
+        [DataField]
+        public float Potency;
+
+        /// <summary>
+        ///     Chance of deletion.
+        /// </summary>
+        [DataField]
+        public float DeletionChance = .5f;
+    }
+}
diff --git a/Content.Server/Botany/SeedPrototype.cs b/Content.Server/Botany/SeedPrototype.cs
index 1a3c0473a48..2644da2a3b0 100644
--- a/Content.Server/Botany/SeedPrototype.cs
+++ b/Content.Server/Botany/SeedPrototype.cs
@@ -205,6 +205,11 @@ public partial class SeedData
     /// </summary>
     [DataField("ligneous")] public bool Ligneous;
 
+    /// <summary>
+    ///     If true, teleports both fruit and player if slippable.
+    /// </summary>
+    [DataField] public bool Teleporting;
+
     // No, I'm not removing these.
     // if you re-add these, make sure that they get cloned.
     //public PlantSpread Spread { get; set; }
@@ -215,7 +220,6 @@ public partial class SeedData
     //public bool Hematophage { get; set; }
     //public bool Thorny { get; set; }
     //public bool Stinging { get; set; }
-    // public bool Teleporting { get; set; }
     // public PlantJuicy Juicy { get; set; }
 
     #endregion
@@ -295,6 +299,7 @@ public SeedData Clone()
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = PlantRsi,
             PlantIconState = PlantIconState,
@@ -358,6 +363,7 @@ public SeedData SpeciesChange(SeedData other)
             Slip = Slip,
             Sentient = Sentient,
             Ligneous = Ligneous,
+            Teleporting = Teleporting,
 
             PlantRsi = other.PlantRsi,
             PlantIconState = other.PlantIconState,
diff --git a/Content.Server/Botany/Systems/BotanySystem.Seed.cs b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
index f64fcb3c43d..82190d1c443 100644
--- a/Content.Server/Botany/Systems/BotanySystem.Seed.cs
+++ b/Content.Server/Botany/Systems/BotanySystem.Seed.cs
@@ -207,6 +207,11 @@ public IEnumerable<EntityUid> GenerateProduct(SeedData proto, EntityCoordinates
                 var collisionWake = EnsureComp<CollisionWakeComponent>(entity);
                 _colWakeSystem.SetEnabled(entity, false, collisionWake);
             }
+            if (proto.Teleporting)
+            {
+                var teleporting = EnsureComp<TeleportingTraitComponent>(entity);
+                TeleportingTraitSystem.SetPotencyRadius(proto.Potency, teleporting);
+            }
         }
 
         return products;
diff --git a/Content.Server/Botany/Systems/MutationSystem.cs b/Content.Server/Botany/Systems/MutationSystem.cs
index c7ce5d47efa..4780f8b3310 100644
--- a/Content.Server/Botany/Systems/MutationSystem.cs
+++ b/Content.Server/Botany/Systems/MutationSystem.cs
@@ -40,7 +40,7 @@ public void MutateSeed(ref SeedData seed, float severity)
         }
 
         // Add up everything in the bits column and put the number here.
-        const int totalbits = 275;
+        const int totalbits = 285;
 
         // Tolerances (55)
         MutateFloat(ref seed.NutrientConsumption  , 0.05f, 1.2f, 5, totalbits, severity);
@@ -66,11 +66,12 @@ public void MutateSeed(ref SeedData seed, float severity)
         // Kill the plant (30)
         MutateBool(ref seed.Viable        , false, 30, totalbits, severity);
 
-        // Fun (90)
+        // Fun (100)
         MutateBool(ref seed.Seedless      , true , 10, totalbits, severity);
         MutateBool(ref seed.Slip          , true , 10, totalbits, severity);
         MutateBool(ref seed.Sentient      , true , 10, totalbits, severity);
         MutateBool(ref seed.Ligneous      , true , 10, totalbits, severity);
+        MutateBool(ref seed.Teleporting   , true , 10, totalbits, severity);
         MutateBool(ref seed.Bioluminescent, true , 10, totalbits, severity);
         MutateBool(ref seed.TurnIntoKudzu , true , 10, totalbits, severity);
         MutateBool(ref seed.CanScream     , true , 10, totalbits, severity);
@@ -120,6 +121,7 @@ public SeedData Cross(SeedData a, SeedData b)
         CrossBool(ref result.Slip, a.Slip);
         CrossBool(ref result.Sentient, a.Sentient);
         CrossBool(ref result.Ligneous, a.Ligneous);
+        CrossBool(ref result.Teleporting, a.Teleporting);
         CrossBool(ref result.Bioluminescent, a.Bioluminescent);
         CrossBool(ref result.TurnIntoKudzu, a.TurnIntoKudzu);
         CrossBool(ref result.CanScream, a.CanScream);
diff --git a/Content.Server/Botany/Systems/TeleportingTraitSystem.cs b/Content.Server/Botany/Systems/TeleportingTraitSystem.cs
new file mode 100644
index 00000000000..7aa9a6a82ab
--- /dev/null
+++ b/Content.Server/Botany/Systems/TeleportingTraitSystem.cs
@@ -0,0 +1,51 @@
+using Robust.Shared.Random;
+using Content.Shared.Slippery;
+using Content.Server.Fluids.EntitySystems;
+using Content.Shared.Chemistry.Components;
+using Content.Shared.Popups;
+
+namespace Content.Server.Botany.Systems;
+
+public sealed class TeleportingTraitSystem : EntitySystem
+{
+    [Dependency] private readonly SharedTransformSystem _xform = default!;
+    [Dependency] private readonly IRobustRandom _random = default!;
+    [Dependency] private readonly SharedPopupSystem _popup = default!;
+    [Dependency] private readonly PuddleSystem _puddle = default!;
+
+    public override void Initialize()
+    {
+        base.Initialize();
+
+        SubscribeLocalEvent<TeleportingTraitComponent, SlipEvent>(Teleport);
+    }
+
+    // sets the potency and the radius
+    public static void SetPotencyRadius(float seedPotency, TeleportingTraitComponent comp)
+    {
+        comp.Potency = seedPotency;
+        comp.ProduceTeleportRadius = comp.Potency / comp.PotencyDivide;
+    }
+
+    // teleports both the produce and the foolish fool who slipped on it to a random postion limited by the radius
+    private void Teleport(EntityUid uid, TeleportingTraitComponent comp, ref SlipEvent args)
+    {
+        var coordinates = Transform(uid).Coordinates;
+        _xform.SetCoordinates(uid, coordinates.Offset(_random.NextVector2(comp.ProduceTeleportRadius)));
+        _popup.PopupEntity(Loc.GetString("teleporting-trait-component-slipped"), args.Slipped, args.Slipped, PopupType.SmallCaution);
+        _xform.SetCoordinates(args.Slipped, coordinates.Offset(_random.NextVector2(comp.ProduceTeleportRadius)));
+        VanishProbablity(uid, comp);
+    }
+
+    // chance of being deleted and then spawnin the goop
+    private void VanishProbablity(EntityUid uid, TeleportingTraitComponent comp)
+    {
+        if (!_random.Prob(comp.DeletionChance))
+            return;
+        Solution vanishSolution = new();
+        vanishSolution.AddReagent("Slime", comp.Potency / 2);
+        _puddle.TrySpillAt(uid, vanishSolution, out _);
+        QueueDel(uid);
+    }
+}
+
diff --git a/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl b/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl
new file mode 100644
index 00000000000..c38b8605f2b
--- /dev/null
+++ b/Resources/Locale/en-US/botany/components/teleporting-trait-component.ftl
@@ -0,0 +1 @@
+teleporting-trait-component-slipped = You slip through bluespace!

From a243fca7063844cb2ec13bafce52e216f94f5cb9 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Wed, 7 Aug 2024 23:54:35 +0000
Subject: [PATCH 15/21] Automatic Changelog Update (#674)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index bb19e08360c..0aff29d638c 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5095,3 +5095,11 @@ Entries:
       message: Fixed the RegenMesh recipe
   id: 6238
   time: '2024-08-07T23:51:29.0000000+00:00'
+- author: dootythefrooty
+  changes:
+    - type: Add
+      message: >-
+        Added Bluespace Slips, a plant trait that teleports you randomly if you
+        slip.
+  id: 6239
+  time: '2024-08-07T23:54:13.0000000+00:00'

From 4c4b37aacca1448842155a9a1bafa0d002e1c890 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 7 Aug 2024 20:09:41 -0400
Subject: [PATCH 16/21] 1984 Dresser Arbitrage 2, Electric Boogaloo (#682)

# Description

@DEATHB4DEFEAT

![image](https://github.com/user-attachments/assets/0ee6b468-7959-4ebd-8202-6fbc2794511c)

No changelog because this isn't player facing.
---
 Resources/Prototypes/Entities/Structures/Furniture/dresser.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
index 6c50b334091..1d0a25ed852 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
@@ -52,7 +52,7 @@
   suffix: Filled
   components:
   - type: StaticPrice
-    price: 5
+    price: 15
   - type: StorageFill
     contents:
       - id: ClothingNeckLGBTPin

From 9b112609e009fedccf7adb70292af914752fcd2c Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 7 Aug 2024 20:10:21 -0400
Subject: [PATCH 17/21] Respace Psionics Audio & Localization Files (#700)

# Description

Effectively Part 2 of splitting up the Psionic Refactor. This PR is
partially respacing the non-C# side of Psionics code, such as
Localizations, Audio files, some entities. I'm not respacing all of them
in a single sitting because just finding them all is a complete pain in
the ass.

No media because there's nothing to show.

No changelog because this isn't player facing.
---
 .../Ambience/Objects/prober_hum_dangerous.ogg | Bin
 .../Ambience/Objects/prober_hum_high.ogg      | Bin
 .../Ambience/Objects/prober_hum_low.ogg       | Bin
 .../Ambience/Objects/prober_hum_moderate.ogg  | Bin
 .../Psionics/attributions.yml                 |   0
 .../Psionics/heartbeat_fast.ogg               | Bin
 .../{nyanotrasen => }/abilities/psionic.ftl   |   0
 .../en-US/cartridge-loader/cartridges.ftl     |   5 +
 .../en-US/chemistry/reagent-effects.ftl       |   2 +-
 .../en-US/guidebook/chemistry/effects.ftl     |  18 +++
 Resources/Locale/en-US/guidebook/guides.ftl   |   4 +
 .../cartridge-loader/cartridges.ftl           |   4 -
 .../en-US/nyanotrasen/chemistry/effects.ftl   |  18 ---
 .../en-US/nyanotrasen/guidebook/guides.ftl    |   3 -
 .../en-US/nyanotrasen/reagents/toxins.ftl     |   8 -
 .../xenoarchaeology/artifact-hints.ftl        |   1 -
 .../paper => psionics}/book-epistemics.ftl    |   0
 .../cargo => psionics}/cargo-epistemics.ftl   |   0
 .../{nyanotrasen => }/psionics/death-gasp.ftl |   0
 .../crates => psionics}/epistemics-crates.ftl |   0
 .../events => psionics}/noospheric-storm.ftl  |   0
 .../objectives.ftl}                           |   0
 .../research => psionics}/oracle.ftl          |   0
 .../psionics/psionic-chat.ftl                 |   0
 .../psionics/psionic-commands.ftl             |   0
 .../paper => psionics}/stamp-component.ftl    |   0
 .../research => psionics}/technologies.ftl    |   0
 .../Locale/en-US/reagents/meta/toxins.ftl     |   9 ++
 .../{nyanotrasen => }/reagents/psionic.ftl    |   0
 .../en-US/xenoarchaeology/artifact-hints.ftl  |   3 +
 Resources/Prototypes/Actions/psionics.yml     | 136 +++++++++++++++++
 .../Prototypes/Nyanotrasen/Actions/types.yml  | 139 +-----------------
 .../Structures/Research/glimmer_prober.yml    |  14 +-
 .../Interface/VerbIcons/dispel.png            | Bin
 .../Interface/VerbIcons/dispel.png.yml        |   0
 .../Interface/VerbIcons/license.txt           |   0
 .../Interface/VerbIcons/mass_sleep.png        | Bin
 .../Interface/VerbIcons/mass_sleep.png.yml    |   0
 .../Interface/VerbIcons/metapsionic.png       | Bin
 .../Interface/VerbIcons/metapsionic.png.yml   |   0
 .../Interface/VerbIcons/mind_swap.png         | Bin
 .../Interface/VerbIcons/mind_swap.png.yml     |   0
 .../Interface/VerbIcons/mind_swap_return.png  | Bin
 .../VerbIcons/mind_swap_return.png.yml        |   0
 .../Interface/VerbIcons/noospheric_zap.png    | Bin
 .../VerbIcons/noospheric_zap.png.yml          |   0
 .../VerbIcons/psionic_invisibility.png        | Bin
 .../VerbIcons/psionic_invisibility.png.yml    |   0
 .../VerbIcons/psionic_invisibility_off.png    | Bin
 .../psionic_invisibility_off.png.yml          |   0
 .../VerbIcons/psionic_regeneration.png        | Bin
 .../VerbIcons/psionic_regeneration.png.yml    |   0
 .../Interface/VerbIcons/pyrokinesis.png       | Bin
 .../Interface/VerbIcons/pyrokinesis.png.yml   |   0
 .../Interface/VerbIcons/telegnosis.png        | Bin
 .../Interface/VerbIcons/telegnosis.png.yml    |   0
 56 files changed, 184 insertions(+), 180 deletions(-)
 rename Resources/Audio/{Nyanotrasen => }/Ambience/Objects/prober_hum_dangerous.ogg (100%)
 rename Resources/Audio/{Nyanotrasen => }/Ambience/Objects/prober_hum_high.ogg (100%)
 rename Resources/Audio/{Nyanotrasen => }/Ambience/Objects/prober_hum_low.ogg (100%)
 rename Resources/Audio/{Nyanotrasen => }/Ambience/Objects/prober_hum_moderate.ogg (100%)
 rename Resources/Audio/{Nyanotrasen => }/Psionics/attributions.yml (100%)
 rename Resources/Audio/{Nyanotrasen => }/Psionics/heartbeat_fast.ogg (100%)
 rename Resources/Locale/en-US/{nyanotrasen => }/abilities/psionic.ftl (100%)
 delete mode 100644 Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl
 delete mode 100644 Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
 delete mode 100644 Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl
 delete mode 100644 Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl
 rename Resources/Locale/en-US/{nyanotrasen/paper => psionics}/book-epistemics.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/prototypes/catalog/cargo => psionics}/cargo-epistemics.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen => }/psionics/death-gasp.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/prototypes/catalog/fills/crates => psionics}/epistemics-crates.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/station-events/events => psionics}/noospheric-storm.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/objectives/conditions/conditions.ftl => psionics/objectives.ftl} (100%)
 rename Resources/Locale/en-US/{nyanotrasen/research => psionics}/oracle.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen => }/psionics/psionic-chat.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen => }/psionics/psionic-commands.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/paper => psionics}/stamp-component.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen/research => psionics}/technologies.ftl (100%)
 rename Resources/Locale/en-US/{nyanotrasen => }/reagents/psionic.ftl (100%)
 create mode 100644 Resources/Prototypes/Actions/psionics.yml
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/dispel.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/dispel.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/license.txt (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mass_sleep.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mass_sleep.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/metapsionic.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/metapsionic.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mind_swap.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mind_swap.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mind_swap_return.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/mind_swap_return.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/noospheric_zap.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/noospheric_zap.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_invisibility.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_invisibility.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_invisibility_off.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_invisibility_off.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_regeneration.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/psionic_regeneration.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/pyrokinesis.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/pyrokinesis.png.yml (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/telegnosis.png (100%)
 rename Resources/Textures/{Nyanotrasen => }/Interface/VerbIcons/telegnosis.png.yml (100%)

diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg b/Resources/Audio/Ambience/Objects/prober_hum_dangerous.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_dangerous.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg b/Resources/Audio/Ambience/Objects/prober_hum_high.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_high.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg b/Resources/Audio/Ambience/Objects/prober_hum_low.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_low.ogg
diff --git a/Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg b/Resources/Audio/Ambience/Objects/prober_hum_moderate.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg
rename to Resources/Audio/Ambience/Objects/prober_hum_moderate.ogg
diff --git a/Resources/Audio/Nyanotrasen/Psionics/attributions.yml b/Resources/Audio/Psionics/attributions.yml
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Psionics/attributions.yml
rename to Resources/Audio/Psionics/attributions.yml
diff --git a/Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg b/Resources/Audio/Psionics/heartbeat_fast.ogg
similarity index 100%
rename from Resources/Audio/Nyanotrasen/Psionics/heartbeat_fast.ogg
rename to Resources/Audio/Psionics/heartbeat_fast.ogg
diff --git a/Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl b/Resources/Locale/en-US/abilities/psionic.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/abilities/psionic.ftl
rename to Resources/Locale/en-US/abilities/psionic.ftl
diff --git a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
index f5cda2f2a18..cfa1b1424d2 100644
--- a/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
+++ b/Resources/Locale/en-US/cartridge-loader/cartridges.ftl
@@ -19,3 +19,8 @@ log-probe-scan = Downloaded logs from {$device}!
 log-probe-label-time = Time
 log-probe-label-accessor = Accessed by
 log-probe-label-number = #
+
+glimmer-monitor-program-name = Glimmer Monitor
+glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
+glimmer-monitor-interval = Interval
+glimmer-monitor-sync = Sync
diff --git a/Resources/Locale/en-US/chemistry/reagent-effects.ftl b/Resources/Locale/en-US/chemistry/reagent-effects.ftl
index 537770b35a5..cb55db111d6 100644
--- a/Resources/Locale/en-US/chemistry/reagent-effects.ftl
+++ b/Resources/Locale/en-US/chemistry/reagent-effects.ftl
@@ -1 +1 @@
-effect-sleepy = You feel a bit sleepy.
+effect-sleepy = You feel a bit sleepy.
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
index b6f45d23862..db2f3816f6b 100644
--- a/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/guidebook/chemistry/effects.ftl
@@ -344,3 +344,21 @@ reagent-effect-guidebook-missing =
         [1] Causes
         *[other] cause
     } an unknown effect as nobody has written this effect yet
+
+reagent-effect-guidebook-change-glimmer-reaction-effect =
+    { $chance ->
+        [1] Modifies
+        *[other] modify
+    } the glimmer count by {$count} points
+
+reagent-effect-guidebook-chem-remove-psionic =
+    { $chance ->
+        [1] Removes
+        *[other] remove
+    } psionic powers
+
+reagent-effect-guidebook-chem-reroll-psionic =
+    { $chance ->
+        [1] Allows
+        *[other] allow
+    } a chance to get a different psionic power
\ No newline at end of file
diff --git a/Resources/Locale/en-US/guidebook/guides.ftl b/Resources/Locale/en-US/guidebook/guides.ftl
index 72746dbf51f..968d3b20038 100644
--- a/Resources/Locale/en-US/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/guidebook/guides.ftl
@@ -70,3 +70,7 @@ guide-entry-space-ninja = Space Ninja
 
 guide-entry-writing = Writing
 guide-entry-glossary = Glossary
+
+guide-entry-altars-golemancy = Altars and Golemancy
+guide-entry-psionics = Psionics
+guide-entry-reverse-engineering = Reverse Engineering
diff --git a/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl b/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl
deleted file mode 100644
index 906466bc10f..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/cartridge-loader/cartridges.ftl
+++ /dev/null
@@ -1,4 +0,0 @@
-glimmer-monitor-program-name = Glimmer Monitor
-glimmer-monitor-current-glimmer = Current Glimmer: {$glimmer}Ψ
-glimmer-monitor-interval = Interval
-glimmer-monitor-sync = Sync
diff --git a/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl b/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
index 19aeebee69e..8d0c96f13c5 100644
--- a/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
+++ b/Resources/Locale/en-US/nyanotrasen/chemistry/effects.ftl
@@ -1,21 +1,3 @@
-reagent-effect-guidebook-change-glimmer-reaction-effect =
-    { $chance ->
-        [1] Modifies
-        *[other] modify
-    } the glimmer count by {$count} points
-
-reagent-effect-guidebook-chem-remove-psionic =
-    { $chance ->
-        [1] Removes
-        *[other] remove
-    } psionic powers
-
-reagent-effect-guidebook-chem-reroll-psionic =
-    { $chance ->
-        [1] Allows
-        *[other] allow
-    } a chance to get a different psionic power
-
 ## Disease System support
 
 reagent-effect-guidebook-chem-miasma-pool =
diff --git a/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl b/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
deleted file mode 100644
index 60166b82598..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/guidebook/guides.ftl
+++ /dev/null
@@ -1,3 +0,0 @@
-guide-entry-altars-golemancy = Altars and Golemancy
-guide-entry-psionics = Psionics
-guide-entry-reverse-engineering = Reverse Engineering
diff --git a/Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl b/Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl
deleted file mode 100644
index 43e35c191c9..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/reagents/toxins.ftl
+++ /dev/null
@@ -1,8 +0,0 @@
-reagent-name-soulbreaker-toxin = soulbreaker toxin
-reagent-desc-soulbreaker-toxin = An anti-psionic about 4 times as powerful as mindbreaker toxin.
-
-reagent-name-lotophagoi-oil = lotophagoi oil
-reagent-desc-lotophagoi-oil = A super potent drug that is much better at inducing psionics than normal hallucinogens, but with worse side effects.
-
-reagent-name-ectoplasm = ectoplasm
-reagent-desc-ectoplasm = The physical component of semi-corporeal spirits.
diff --git a/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl
deleted file mode 100644
index e07aa0a0322..00000000000
--- a/Resources/Locale/en-US/nyanotrasen/xenoarchaeology/artifact-hints.ftl
+++ /dev/null
@@ -1 +0,0 @@
-artifact-effect-hint-psionic = Noöspheric disturbance
diff --git a/Resources/Locale/en-US/nyanotrasen/paper/book-epistemics.ftl b/Resources/Locale/en-US/psionics/book-epistemics.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/paper/book-epistemics.ftl
rename to Resources/Locale/en-US/psionics/book-epistemics.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/prototypes/catalog/cargo/cargo-epistemics.ftl b/Resources/Locale/en-US/psionics/cargo-epistemics.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/prototypes/catalog/cargo/cargo-epistemics.ftl
rename to Resources/Locale/en-US/psionics/cargo-epistemics.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/death-gasp.ftl b/Resources/Locale/en-US/psionics/death-gasp.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/death-gasp.ftl
rename to Resources/Locale/en-US/psionics/death-gasp.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/prototypes/catalog/fills/crates/epistemics-crates.ftl b/Resources/Locale/en-US/psionics/epistemics-crates.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/prototypes/catalog/fills/crates/epistemics-crates.ftl
rename to Resources/Locale/en-US/psionics/epistemics-crates.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/station-events/events/noospheric-storm.ftl b/Resources/Locale/en-US/psionics/noospheric-storm.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/station-events/events/noospheric-storm.ftl
rename to Resources/Locale/en-US/psionics/noospheric-storm.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/objectives/conditions/conditions.ftl b/Resources/Locale/en-US/psionics/objectives.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/objectives/conditions/conditions.ftl
rename to Resources/Locale/en-US/psionics/objectives.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/research/oracle.ftl b/Resources/Locale/en-US/psionics/oracle.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/research/oracle.ftl
rename to Resources/Locale/en-US/psionics/oracle.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psionic-chat.ftl b/Resources/Locale/en-US/psionics/psionic-chat.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/psionic-chat.ftl
rename to Resources/Locale/en-US/psionics/psionic-chat.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/psionics/psionic-commands.ftl b/Resources/Locale/en-US/psionics/psionic-commands.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/psionics/psionic-commands.ftl
rename to Resources/Locale/en-US/psionics/psionic-commands.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/paper/stamp-component.ftl b/Resources/Locale/en-US/psionics/stamp-component.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/paper/stamp-component.ftl
rename to Resources/Locale/en-US/psionics/stamp-component.ftl
diff --git a/Resources/Locale/en-US/nyanotrasen/research/technologies.ftl b/Resources/Locale/en-US/psionics/technologies.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/research/technologies.ftl
rename to Resources/Locale/en-US/psionics/technologies.ftl
diff --git a/Resources/Locale/en-US/reagents/meta/toxins.ftl b/Resources/Locale/en-US/reagents/meta/toxins.ftl
index eb8422e66cf..fa2a813d1d6 100644
--- a/Resources/Locale/en-US/reagents/meta/toxins.ftl
+++ b/Resources/Locale/en-US/reagents/meta/toxins.ftl
@@ -75,3 +75,12 @@ reagent-desc-vestine = Has an adverse reaction within the body causing major jit
 
 reagent-name-tazinide = tazinide
 reagent-desc-tazinide = A highly dangerous metallic mixture which can interfere with most movement through an electrifying current.
+
+reagent-name-soulbreaker-toxin = soulbreaker toxin
+reagent-desc-soulbreaker-toxin = An anti-psionic about 4 times as powerful as mindbreaker toxin.
+
+reagent-name-lotophagoi-oil = lotophagoi oil
+reagent-desc-lotophagoi-oil = A super potent drug that is much better at inducing psionics than normal hallucinogens, but with worse side effects.
+
+reagent-name-ectoplasm = ectoplasm
+reagent-desc-ectoplasm = The physical component of semi-corporeal spirits.
diff --git a/Resources/Locale/en-US/nyanotrasen/reagents/psionic.ftl b/Resources/Locale/en-US/reagents/psionic.ftl
similarity index 100%
rename from Resources/Locale/en-US/nyanotrasen/reagents/psionic.ftl
rename to Resources/Locale/en-US/reagents/psionic.ftl
diff --git a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
index 98dfa89fa9f..a139c2036e1 100644
--- a/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
+++ b/Resources/Locale/en-US/xenoarchaeology/artifact-hints.ftl
@@ -40,3 +40,6 @@ artifact-trigger-hint-regular-gases = Standard atmospheric gases
 artifact-trigger-hint-plasma = Gaseous plasma
 artifact-trigger-hint-land = Active deceleration
 artifact-trigger-hint-examine = Examination
+
+# Psionic Effects
+artifact-effect-hint-psionic = Noöspheric disturbance
diff --git a/Resources/Prototypes/Actions/psionics.yml b/Resources/Prototypes/Actions/psionics.yml
new file mode 100644
index 00000000000..62a7fc014cd
--- /dev/null
+++ b/Resources/Prototypes/Actions/psionics.yml
@@ -0,0 +1,136 @@
+- type: entity
+  id: ActionDispel
+  name: action-name-dispel
+  description: action-description-dispel
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/dispel.png
+    useDelay: 45
+    checkCanAccess: false
+    range: 6
+    itemIconStyle: BigAction
+    canTargetSelf: false
+    event: !type:DispelPowerActionEvent
+
+- type: entity
+  id: ActionMassSleep
+  name: action-name-mass-sleep
+  description: action-description-mass-sleep
+  noSpawn: true
+  components:
+  - type: WorldTargetAction
+    icon: Interface/VerbIcons/mass_sleep.png
+    useDelay: 60
+    checkCanAccess: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MassSleepPowerActionEvent
+
+- type: entity
+  id: ActionMindSwap
+  name: action-name-mind-swap
+  description: action-description-mind-swap
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/mind_swap.png
+    useDelay: 240
+    checkCanAccess: false
+    range: 8
+    itemIconStyle: BigAction
+    event: !type:MindSwapPowerActionEvent
+
+- type: entity
+  id: ActionMindSwapReturn
+  name: action-name-mind-swap-return
+  description: action-description-mind-swap-return
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/mind_swap_return.png
+    useDelay: 20
+    checkCanInteract: false
+    event: !type:MindSwapPowerReturnActionEvent
+
+- type: entity
+  id: ActionNoosphericZap
+  name: action-name-noospheric-zap
+  description: action-description-noospheric-zap
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/noospheric_zap.png
+    useDelay: 100
+    range: 5
+    itemIconStyle: BigAction
+    event: !type:NoosphericZapPowerActionEvent
+
+- type: entity
+  id: ActionPyrokinesis
+  name: action-name-pyrokinesis
+  description: action-description-pyrokinesis
+  noSpawn: true
+  components:
+  - type: EntityTargetAction
+    icon: Interface/VerbIcons/pyrokinesis.png
+    useDelay: 50
+    range: 6
+    checkCanAccess: false
+    itemIconStyle: BigAction
+    event: !type:PyrokinesisPowerActionEvent
+
+- type: entity
+  id: ActionMetapsionic
+  name: action-name-metapsionic
+  description: action-description-metapsionic
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/metapsionic.png
+    useDelay: 45
+    event: !type:MetapsionicPowerActionEvent
+
+- type: entity
+  id: ActionPsionicRegeneration
+  name: action-name-psionic-regeneration
+  description: action-description-psionic-regeneration
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_regeneration.png
+    useDelay: 120
+    event: !type:PsionicRegenerationPowerActionEvent
+
+- type: entity
+  id: ActionTelegnosis
+  name: action-name-telegnosis
+  description: action-description-telegnosis
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/telegnosis.png
+    useDelay: 150
+    event: !type:TelegnosisPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibility
+  name: action-name-psionic-invisibility
+  description: action-description-psionic-invisibility
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_invisibility.png
+    useDelay: 120
+    event: !type:PsionicInvisibilityPowerActionEvent
+
+- type: entity
+  id: ActionPsionicInvisibilityUsed
+  name: action-name-psionic-invisibility-off
+  description: action-description-psionic-invisibility-off
+  noSpawn: true
+  components:
+  - type: InstantAction
+    icon: Interface/VerbIcons/psionic_invisibility_off.png
+    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
+
diff --git a/Resources/Prototypes/Nyanotrasen/Actions/types.yml b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
index 04002f5755d..cab8f4a1f4e 100644
--- a/Resources/Prototypes/Nyanotrasen/Actions/types.yml
+++ b/Resources/Prototypes/Nyanotrasen/Actions/types.yml
@@ -18,141 +18,4 @@
     charges: 1
     icon: { sprite: Nyanotrasen/Objects/Specific/Species/felinid.rsi, state: icon }
     useDelay: 30
-    event: !type:HairballActionEvent
-
-- type: entity
-  id: ActionDispel
-  name: action-name-dispel
-  description: action-description-dispel
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/dispel.png
-    useDelay: 45
-    checkCanAccess: false
-    range: 6
-    itemIconStyle: BigAction
-    canTargetSelf: false
-    event: !type:DispelPowerActionEvent
-
-- type: entity
-  id: ActionMassSleep
-  name: action-name-mass-sleep
-  description: action-description-mass-sleep
-  noSpawn: true
-  components:
-  - type: WorldTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mass_sleep.png
-    useDelay: 60
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:MassSleepPowerActionEvent
-
-- type: entity
-  id: ActionMindSwap
-  name: action-name-mind-swap
-  description: action-description-mind-swap
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap.png
-    useDelay: 240
-    checkCanAccess: false
-    range: 8
-    itemIconStyle: BigAction
-    event: !type:MindSwapPowerActionEvent
-
-- type: entity
-  id: ActionMindSwapReturn
-  name: action-name-mind-swap-return
-  description: action-description-mind-swap-return
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
-    useDelay: 20
-    checkCanInteract: false
-    event: !type:MindSwapPowerReturnActionEvent
-
-- type: entity
-  id: ActionNoosphericZap
-  name: action-name-noospheric-zap
-  description: action-description-noospheric-zap
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
-    useDelay: 100
-    range: 5
-    itemIconStyle: BigAction
-    event: !type:NoosphericZapPowerActionEvent
-
-- type: entity
-  id: ActionPyrokinesis
-  name: action-name-pyrokinesis
-  description: action-description-pyrokinesis
-  noSpawn: true
-  components:
-  - type: EntityTargetAction
-    icon: Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
-    useDelay: 50
-    range: 6
-    checkCanAccess: false
-    itemIconStyle: BigAction
-    event: !type:PyrokinesisPowerActionEvent
-
-- type: entity
-  id: ActionMetapsionic
-  name: action-name-metapsionic
-  description: action-description-metapsionic
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/metapsionic.png
-    useDelay: 45
-    event: !type:MetapsionicPowerActionEvent
-
-- type: entity
-  id: ActionPsionicRegeneration
-  name: action-name-psionic-regeneration
-  description: action-description-psionic-regeneration
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
-    useDelay: 120
-    event: !type:PsionicRegenerationPowerActionEvent
-
-- type: entity
-  id: ActionTelegnosis
-  name: action-name-telegnosis
-  description: action-description-telegnosis
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/telegnosis.png
-    useDelay: 150
-    event: !type:TelegnosisPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibility
-  name: action-name-psionic-invisibility
-  description: action-description-psionic-invisibility
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
-    useDelay: 120
-    event: !type:PsionicInvisibilityPowerActionEvent
-
-- type: entity
-  id: ActionPsionicInvisibilityUsed
-  name: action-name-psionic-invisibility-off
-  description: action-description-psionic-invisibility-off
-  noSpawn: true
-  components:
-  - type: InstantAction
-    icon: Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
-    event: !type:RemovePsionicInvisibilityOffPowerActionEvent
-
+    event: !type:HairballActionEvent
\ No newline at end of file
diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
index e157f8b7ff4..102000f8b26 100644
--- a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
+++ b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Research/glimmer_prober.yml
@@ -67,22 +67,22 @@
   - type: AmbientSound
     range: 6
     volume: -6
-    sound: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+    sound: /Audio/Ambience/Objects/prober_hum_low.ogg
   - type: AmbientOnPowered
   - type: GlimmerSound
     glimmerTier:
       Minimal:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+        path: /Audio/Ambience/Objects/prober_hum_low.ogg
       Low:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_low.ogg
+        path: /Audio/Ambience/Objects/prober_hum_low.ogg
       Moderate:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_moderate.ogg
+        path: /Audio/Ambience/Objects/prober_hum_moderate.ogg
       High:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_high.ogg
+        path: /Audio/Ambience/Objects/prober_hum_high.ogg
       Dangerous:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
+        path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
       Critical:
-        path: /Audio/Nyanotrasen/Ambience/Objects/prober_hum_dangerous.ogg
+        path: /Audio/Ambience/Objects/prober_hum_dangerous.ogg
 
 - type: entity
   parent: BaseMachinePowered
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png b/Resources/Textures/Interface/VerbIcons/dispel.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png
rename to Resources/Textures/Interface/VerbIcons/dispel.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml b/Resources/Textures/Interface/VerbIcons/dispel.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/dispel.png.yml
rename to Resources/Textures/Interface/VerbIcons/dispel.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt b/Resources/Textures/Interface/VerbIcons/license.txt
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/license.txt
rename to Resources/Textures/Interface/VerbIcons/license.txt
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png b/Resources/Textures/Interface/VerbIcons/mass_sleep.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png
rename to Resources/Textures/Interface/VerbIcons/mass_sleep.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml b/Resources/Textures/Interface/VerbIcons/mass_sleep.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mass_sleep.png.yml
rename to Resources/Textures/Interface/VerbIcons/mass_sleep.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png b/Resources/Textures/Interface/VerbIcons/metapsionic.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png
rename to Resources/Textures/Interface/VerbIcons/metapsionic.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml b/Resources/Textures/Interface/VerbIcons/metapsionic.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/metapsionic.png.yml
rename to Resources/Textures/Interface/VerbIcons/metapsionic.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png b/Resources/Textures/Interface/VerbIcons/mind_swap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png
rename to Resources/Textures/Interface/VerbIcons/mind_swap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml b/Resources/Textures/Interface/VerbIcons/mind_swap.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap.png.yml
rename to Resources/Textures/Interface/VerbIcons/mind_swap.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png b/Resources/Textures/Interface/VerbIcons/mind_swap_return.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png
rename to Resources/Textures/Interface/VerbIcons/mind_swap_return.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml b/Resources/Textures/Interface/VerbIcons/mind_swap_return.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/mind_swap_return.png.yml
rename to Resources/Textures/Interface/VerbIcons/mind_swap_return.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png b/Resources/Textures/Interface/VerbIcons/noospheric_zap.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png
rename to Resources/Textures/Interface/VerbIcons/noospheric_zap.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml b/Resources/Textures/Interface/VerbIcons/noospheric_zap.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/noospheric_zap.png.yml
rename to Resources/Textures/Interface/VerbIcons/noospheric_zap.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png b/Resources/Textures/Interface/VerbIcons/psionic_invisibility.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_invisibility.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png b/Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_invisibility_off.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_invisibility_off.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png b/Resources/Textures/Interface/VerbIcons/psionic_regeneration.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png
rename to Resources/Textures/Interface/VerbIcons/psionic_regeneration.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml b/Resources/Textures/Interface/VerbIcons/psionic_regeneration.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/psionic_regeneration.png.yml
rename to Resources/Textures/Interface/VerbIcons/psionic_regeneration.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png b/Resources/Textures/Interface/VerbIcons/pyrokinesis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png
rename to Resources/Textures/Interface/VerbIcons/pyrokinesis.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml b/Resources/Textures/Interface/VerbIcons/pyrokinesis.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/pyrokinesis.png.yml
rename to Resources/Textures/Interface/VerbIcons/pyrokinesis.png.yml
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png b/Resources/Textures/Interface/VerbIcons/telegnosis.png
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png
rename to Resources/Textures/Interface/VerbIcons/telegnosis.png
diff --git a/Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml b/Resources/Textures/Interface/VerbIcons/telegnosis.png.yml
similarity index 100%
rename from Resources/Textures/Nyanotrasen/Interface/VerbIcons/telegnosis.png.yml
rename to Resources/Textures/Interface/VerbIcons/telegnosis.png.yml

From e9e10f29b69cef5b79114caec0786de3b801d757 Mon Sep 17 00:00:00 2001
From: BlueHNT <79374236+BlueHNT@users.noreply.github.com>
Date: Thu, 8 Aug 2024 02:16:02 +0200
Subject: [PATCH 18/21] Updates WelderRefinable Component (#687)

# Description

I have made this originally for N14 as there was a heavy need for junk
items to be list instead of a hash. It created a few issues where you
were unable to put down 2 pieces of steel without making a new defined
entity which spawns a stack of 2.
I thought this was quite annoying so I decided to instead make it into a
`EntitySpawnEntry` from a `string` which would also give it options of
`amount` `prob` `maxAmount` and `orGroup` which would definitely aid in
the scrapping needs there as you could randomize the refined amounts.

I believe this could be useful upstream. As well as cleaning up code
which is more modifiable than before.

The new example of how it can be typed in yaml is also simpler in my
opinion as it is self-explanatory and used in various places like
StorageFill contents for one.
```YAML
  - type: WelderRefinable
    refineResult:
    - id: SheetGlass1
      amount: 1
      maxAmount: 2
      prob: 0.5
      orGroup: Glass
```

---

:cl:
refactor: Refactors WelderRefinableComponent.cs and RefiningSystem.cs
tweak: Tweaked the formatting for WelderRefinable refineResult to use
EntitySpawnEntry format
---
 .../Components/WelderRefinableComponent.cs    | 13 +++++-----
 Content.Server/Construction/RefiningSystem.cs | 15 +++--------
 .../Entities/Objects/Materials/shards.yml     | 18 ++++++-------
 .../Entities/Objects/Misc/broken_bottle.yml   |  2 +-
 .../Entities/Objects/Power/lights.yml         | 26 +++++++++----------
 5 files changed, 33 insertions(+), 41 deletions(-)

diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs
index 9d8958f7614..dc3074f1958 100644
--- a/Content.Server/Construction/Components/WelderRefinableComponent.cs
+++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs
@@ -1,5 +1,6 @@
 using Content.Shared.Tools;
-using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+using Content.Shared.Storage;
+using Robust.Shared.Prototypes;
 
 namespace Content.Server.Construction.Components
 {
@@ -10,13 +11,13 @@ namespace Content.Server.Construction.Components
     [RegisterComponent]
     public sealed partial class WelderRefinableComponent : Component
     {
-        [DataField("refineResult")]
-        public HashSet<string>? RefineResult = new();
+        [DataField]
+        public List<EntitySpawnEntry> RefineResult = new();
 
-        [DataField("refineTime")]
+        [DataField]
         public float RefineTime = 2f;
 
-        [DataField("qualityNeeded", customTypeSerializer:typeof(PrototypeIdSerializer<ToolQualityPrototype>))]
-        public string QualityNeeded = "Welding";
+        [DataField]
+        public ProtoId<ToolQualityPrototype> QualityNeeded = "Welding";
     }
 }
diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs
index b9d80c7170a..d4df8b0916b 100644
--- a/Content.Server/Construction/RefiningSystem.cs
+++ b/Content.Server/Construction/RefiningSystem.cs
@@ -1,11 +1,8 @@
 using Content.Server.Construction.Components;
 using Content.Server.Stack;
 using Content.Shared.Construction;
-using Content.Shared.DoAfter;
 using Content.Shared.Interaction;
-using Content.Shared.Stacks;
-using Content.Shared.Tools;
-using Robust.Shared.Serialization;
+using Content.Shared.Storage;
 using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem;
 
 namespace Content.Server.Construction
@@ -13,7 +10,6 @@ namespace Content.Server.Construction
     public sealed class RefiningSystem : EntitySystem
     {
         [Dependency] private readonly SharedToolSystem _toolSystem = default!;
-        [Dependency] private readonly StackSystem _stackSystem = default!;
         public override void Initialize()
         {
             base.Initialize();
@@ -39,14 +35,9 @@ private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, Welder
             EntityManager.DeleteEntity(uid);
 
             // spawn each result after refine
-            foreach (var result in component.RefineResult!)
+            foreach (var ent in EntitySpawnCollection.GetSpawns(component.RefineResult))
             {
-                var droppedEnt = EntityManager.SpawnEntity(result, resultPosition);
-
-                // TODO: If something has a stack... Just use a prototype with a single thing in the stack.
-                // This is not a good way to do it.
-                if (TryComp<StackComponent>(droppedEnt, out var stack))
-                    _stackSystem.SetCount(droppedEnt, 1, stack);
+                Spawn(ent, resultPosition);
             }
         }
     }
diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
index 5fcb006cfa5..6cdc066cf10 100644
--- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml
+++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml
@@ -89,7 +89,7 @@
     color: "#bbeeff"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -120,8 +120,8 @@
     color: "#96cdef"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - PartRodMetal1
+    - id: SheetGlass1
+    - id: PartRodMetal1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -152,8 +152,8 @@
     color: "#FF72E7"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetPlasma1
+    - id: SheetGlass1
+    - id: SheetPlasma1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -186,8 +186,8 @@
     color: "#8eff7a"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetUranium1
+    - id: SheetGlass1
+    - id: SheetUranium1
   - type: DamageUserOnTrigger
     damage:
       types:
@@ -221,8 +221,8 @@
     color: "#e0aa36"
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - SheetBrass1
+    - id: SheetGlass1
+    - id: SheetBrass1
   - type: DamageUserOnTrigger
     damage:
       types:
diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
index b7c73f5e0cc..32222d0036c 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml
@@ -28,4 +28,4 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml
index c8089cd22d3..b18a0feaa52 100644
--- a/Resources/Prototypes/Entities/Objects/Power/lights.yml
+++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml
@@ -68,7 +68,7 @@
   - type: SpaceGarbage
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
+    - id: SheetGlass1
 
 - type: entity
   parent: BaseLightbulb
@@ -276,8 +276,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalCyan
+    - id: SheetGlass1
+    - id: ShardCrystalCyan
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -296,8 +296,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalBlue
+    - id: SheetGlass1
+    - id: ShardCrystalBlue
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -316,8 +316,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalPink
+    - id: SheetGlass1
+    - id: ShardCrystalPink
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -336,8 +336,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalOrange
+    - id: SheetGlass1
+    - id: ShardCrystalOrange
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -356,8 +356,8 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalRed
+    - id: SheetGlass1
+    - id: ShardCrystalRed
 
 - type: entity
   parent: LightTubeCrystalCyan
@@ -376,5 +376,5 @@
     node: icon
   - type: WelderRefinable
     refineResult:
-    - SheetGlass1
-    - ShardCrystalGreen
+    - id: SheetGlass1
+    - id: ShardCrystalGreen

From 844218c8180d2e4439642717ad1c91e1d7229381 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 8 Aug 2024 00:16:23 +0000
Subject: [PATCH 19/21] Automatic Changelog Update (#687)

---
 Resources/Changelog/Changelog.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 0aff29d638c..45e36fa3f08 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5103,3 +5103,11 @@ Entries:
         slip.
   id: 6239
   time: '2024-08-07T23:54:13.0000000+00:00'
+- author: BlueHNT
+  changes:
+    - type: Tweak
+      message: >-
+        Tweaked the formatting for WelderRefinable refineResult to use
+        EntitySpawnEntry format
+  id: 6240
+  time: '2024-08-08T00:16:02.0000000+00:00'

From 75d2ea8f35c9be1b76a6b6c15531fc2cf5592fe9 Mon Sep 17 00:00:00 2001
From: VMSolidus <evilexecutive@gmail.com>
Date: Wed, 7 Aug 2024 20:18:08 -0400
Subject: [PATCH 20/21] 1984 Shit Colored Moths (#681)

# Description

I'll let google image search make my case.


![image](https://github.com/user-attachments/assets/c8fe9ec7-0292-4d77-bc94-f890219349e3)


![image](https://github.com/user-attachments/assets/1d871bff-4a18-4ce9-a121-d0282821c48c)


![image](https://github.com/user-attachments/assets/2375fe34-691c-49ab-b9d7-a16a17b2a3ce)

Done. By popular request, I'm bringing back RGB Moths.

# Changelog

:cl:
- fix: Moths can now once again be colorful.
---
 Content.Shared/Humanoid/SkinColor.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Content.Shared/Humanoid/SkinColor.cs b/Content.Shared/Humanoid/SkinColor.cs
index 55fab4af5ba..dcc5c2d7645 100644
--- a/Content.Shared/Humanoid/SkinColor.cs
+++ b/Content.Shared/Humanoid/SkinColor.cs
@@ -136,7 +136,7 @@ public static Color TintedHues(Color color)
     /// <param name="skinColor">The skin color to blend with</param>
     /// <param name="blendFactor">Blending factor (0.0 to 1.0)</param>
     /// <returns>Tinted hue color</returns>
-    public static Color TintedHuesSkin(Color color, Color skinColor, float blendFactor = 0.5f)
+    public static Color TintedHuesSkin(Color color, Color skinColor, float blendFactor = 0.0f)
     {
         blendFactor = MathHelper.Clamp(blendFactor, 0.0f, 1.0f);
 

From ba9a93707855c63dcbbbdc5cf5fe0931f196c9b0 Mon Sep 17 00:00:00 2001
From: SimpleStation Changelogs <SimpleStation14@users.noreply.github.com>
Date: Thu, 8 Aug 2024 00:18:30 +0000
Subject: [PATCH 21/21] Automatic Changelog Update (#681)

---
 Resources/Changelog/Changelog.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Resources/Changelog/Changelog.yml b/Resources/Changelog/Changelog.yml
index 45e36fa3f08..f6fba8d64b5 100644
--- a/Resources/Changelog/Changelog.yml
+++ b/Resources/Changelog/Changelog.yml
@@ -5111,3 +5111,9 @@ Entries:
         EntitySpawnEntry format
   id: 6240
   time: '2024-08-08T00:16:02.0000000+00:00'
+- author: VMSolidus
+  changes:
+    - type: Fix
+      message: Moths can now once again be colorful.
+  id: 6241
+  time: '2024-08-08T00:18:08.0000000+00:00'