Dreammyrr patch 2

Content.Server/Palmtree/Surgery/Components/MindExchangerComponent.cs

@@ -0,0 +1,14 @@
+namespace Content.Server.Palmtree.Surgery
+{
+    [RegisterComponent]
+    public partial class MindExchangerComponent : Component
+    {
+        [DataField("Mind")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public EntityUid mind = default!;
+
+        [DataField("ContainsMind")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool occupied = false;
+    }
+}

Content.Server/Palmtree/Surgery/Components/TendWoundComponent.cs

@@ -0,0 +1,12 @@
+using Content.Shared.Damage;
+
+namespace Content.Server.Palmtree.Surgery
+{
+    [RegisterComponent]
+    public partial class PTendWoundsComponent : Component
+    {
+        [DataField("healThisMuch", required: true)] // Sorry I can't stop making silly names
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageSpecifier healThisMuch = default!;
+    }
+}

Content.Server/Palmtree/Surgery/Components/ValidPatientComponent.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+
+namespace Content.Server.Palmtree.Surgery
+{
+    [RegisterComponent]
+    public partial class PPatientComponent : Component //"PPatient" because wizden might add surgery down the line, so I'm doing this to avoid conflicts.
+    {
+        public List<string> procedures = new List<string>();
+    }
+}

Content.Server/Palmtree/Surgery/Components/ValidSurgeryToolComponent.cs

@@ -0,0 +1,41 @@
+using Content.Shared.Damage;
+using Robust.Shared.Audio;
+
+namespace Content.Server.Palmtree.Surgery
+{
+    [RegisterComponent]
+    public partial class PSurgeryToolComponent : Component
+    {
+        [DataField("kind")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string kind = "scalpel";
+
+        [DataField("subKind")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public string subKind = "none"; // Used for implants
+
+        [DataField("useDelay")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float useDelay = 3.0f;
+
+        [DataField("bleedAmountOnUse")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public float bleedAmountOnUse = 0.0f; // Cutting tools usually are the ones that cause bleed
+
+        [DataField("damageOnUse", required: true)] // Tools damage the patient on use except in special cases.
+        [ViewVariables(VVAccess.ReadWrite)]
+        public DamageSpecifier damageOnUse = default!;
+
+        [DataField("audioStart")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public SoundSpecifier? audioStart = null;
+
+        [DataField("audioEnd")]
+        [ViewVariables(VVAccess.ReadWrite)]
+        public SoundSpecifier? audioEnd = null;
+
+        [DataField("consumedOnUse")] // Used for implants
+        [ViewVariables(VVAccess.ReadWrite)]
+        public bool consumedOnUse = false;
+    }
+}

Content.Shared/Atmos/Rotting/RottingComponent.cs

@@ -41,12 +41,13 @@ public sealed partial class RottingComponent : Component
     /// The damage dealt by rotting.
     /// </summary>
     [DataField]
-    public DamageSpecifier Damage = new()
+    public DamageSpecifier Damage = new() // SYNDIE STATION CHANGE START
     {
         DamageDict = new()
         {
-            { "Blunt", 0.06 },
-            { "Cellular", 0.06 }
+            { "Poison", 0.15 },
+            { "Asphyxiation", 0.15 },
+            { "Radiation", -10 }
         }
-    };
+    }; // SYNDIE STATION CHANGE END
 }

Content.Shared/Palmtree/Surgery/SharedSurgery.cs

@@ -0,0 +1,11 @@
+using Content.Shared.DoAfter;
+using Robust.Shared.Serialization;
+
+namespace Content.Shared.Palmtree.Surgery
+{
+    public abstract partial class SharedSurgerySystem : EntitySystem
+    {
+        [Serializable, NetSerializable]
+        protected sealed partial class SurgeryDoAfterEvent : SimpleDoAfterEvent {}
+    }
+}

Resources/Audio/Jukebox/attributions.yml

@@ -24,4 +24,24 @@
 - files: ["sunset.ogg"]
   license: "CC-BY-SA-3.0"
   copyright: "Sunset by PigeonBeans. Exported in Mono OGG."
-  source: "https://soundcloud.com/pigeonbeans/sunset"
+  source: "https://soundcloud.com/pigeonbeans/sunset"
+
+- files: ["aloneedge.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Dream Sweet in Sea Major - Miracle Musical."
+  source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"
+
+- files: ["The_Missile_Knows_Where_It_Is.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Dream Sweet in Sea Major - Miracle Musical."
+  source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"
+
+- files: ["Chitaozinho_Xororo_Evidencias.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Chitaozinho e Xororo - Evidencias"
+  source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"
+
+- files: ["Luiz_Gonzaga_Asa_Branca.ogg"]
+  license: "CC-BY-4.0"
+  copyright: "Luiz Gonzaga - Asa Branca"
+  source: "https://www.youtube.com/channel/UCxIVkeB-A3ujrsjXsWmBQxA"

Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml

@@ -12,6 +12,7 @@
       - id: Cautery
       - id: Retractor
       - id: Scalpel
+      - id: PhantomLinkCard # Syndie change
 
 - type: entity
   parent: ClothingBackpackDuffelSyndicateMedicalBundle

Resources/Prototypes/Catalog/Fills/Crates/medical.yml

@@ -68,6 +68,7 @@
       - id: Saw
       - id: Hemostat
       - id: ClothingMaskSterile
+      - id: PhantomLinkCard # Syndie change
 
 - type: entity
   id: CrateMedicalScrubs

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml

@@ -227,6 +227,7 @@
     - id: MedicalTechFabCircuitboard
     - id: MedkitFilled
     - id: RubberStampCMO
+    - id: MedicalBiofabMachineBoard # Mudança daqui, em caso de merge conflict manter essa linha onde está
 
 # Hardsuit table, used for suit storage as well
 - type: entityTable

Resources/Prototypes/Catalog/Jukebox/Standard.yml

@@ -39,3 +39,142 @@
   name: PigeonBeans - Sunset
   path:
     path: /Audio/Jukebox/sunset.ogg
+
+- type: jukebox
+  id: aloneedge
+  name: Alone At The Edge - Miracle Musical
+  path:
+    path: /Audio/Jukebox/aloneedge.ogg
+
+- type: jukebox
+  id: The_Missile_Knows_Where_It_Is
+  name: The Missile Knows Where It Is
+  path:
+    path: /Audio/Jukebox/The_Missile_Knows_Where_It_Is.ogg
+
+- type: jukebox
+  id: Chitaozinho_Xororo_Evidencias
+  name: Chitaozinho e Xororo - Evidencias
+  path:
+    path: /Audio/Jukebox/Chitaozinho_Xororo_Evidencias.ogg
+
+- type: jukebox
+  id: Luiz_Gonzaga_Asa_Branca
+  name: Luiz Gonzaga - Asa Branca
+  path:
+    path: /Audio/Jukebox/Luiz_Gonzaga_Asa_Branca.ogg
+
+- type: jukebox
+  id: a_morte_do_vaqueiro
+  name: A Morte do vaqueiro
+  path:
+    path: /Audio/Jukebox/a_morte_do_vaqueiro.ogg
+
+- type: jukebox
+  id: aster_dark_x_sweater
+  name: after dark x sweater weather
+  path:
+    path: /Audio/Jukebox/after_dark_x_sweater.ogg
+
+- type: jukebox
+  id: american_boy
+  name: American Boy
+  path:
+    path: /Audio/Jukebox/american boy+3590+5.ogg
+
+- type: jukebox
+  id: Burguesinha
+  name: Burguesinha
+  path:
+    path: /Audio/Jukebox/Burguesinha+4180+5.ogg
+
+- type: jukebox
+  id: Crucified
+  name: Crucified - ArmyOfLoversVEVO
+  path:
+    path: /Audio/Jukebox/Crucified+3350+5.ogg
+
+- type: jukebox
+  id: Furrymon
+  name: Furrymon
+  path:
+    path: /Audio/Jukebox/Furrymon+3310+5.ogg
+
+- type: jukebox
+  id: garcom
+  name: garçom
+  path:
+    path: /Audio/Jukebox/garcom+3210+5.ogg
+
+- type: jukebox
+  id: house_of_the_rising_sun
+  name: house of the rising sun
+  path:
+    path: /Audio/Jukebox/house of the rising sun+4200+5.ogg
+
+- type: jukebox
+  id: I_m_Still_Standing
+  name: I'm Still Standing
+  path:
+    path: /Audio/Jukebox/I'm Still Standing+3010+5.ogg
+
+- type: jukebox
+  id: moskau
+  name: Moskou
+  path:
+    path: /Audio/Jukebox/moskau+4270+5.ogg
+
+- type: jukebox
+  id: Não_Creio_em_Mais_Nada
+  name: Não Creio em Mais Nada
+  path:
+    path: /Audio/Jukebox/Não Creio em Mais Nada+2190+5.ogg
+
+- type: jukebox
+  id: Numa_Sala_de_Reboco
+  name: Numa Sala de Reboco
+  path:
+    path: /Audio/Jukebox/Numa Sala de Reboco+2180+5.ogg
+
+- type: jukebox
+  id: pelados_em_santos
+  name: pelados em santos
+  path:
+    path: /Audio/Jukebox/pelados em santos+3230+5.ogg
+
+- type: jukebox
+  id: rap_do_minecraft
+  name: rap do minecraft
+  path:
+    path: /Audio/Jukebox/rap do minecraft+3090+5.ogg
+
+- type: jukebox
+  id: Stronger_-_Kanye_West
+  name: Stronger - Kanye West
+  path:
+    path: /Audio/Jukebox/Stronger - Kanye West+5120+5.ogg
+
+- type: jukebox
+  id: thats_life
+  name: thats life
+  path:
+    path: /Audio/Jukebox/thats life+3070+5.ogg
+
+- type: jukebox
+  id: The_Ecstasy_of_Gold
+  name: The Ecstasy of Gold
+  path:
+    path: /Audio/Jukebox/The Ecstasy of Gold+3200+5.ogg
+
+- type: jukebox
+  id: trepada_em_cuiaba
+  name: trepada em cuiaba
+  path:
+    path: /Audio/Jukebox/trepada em cuiaba+2420+5.ogg
+
+#- type: jukebox
+#  id: 
+#  name: 
+#  path:
+#    path: /Audio/Jukebox/Path
+

Resources/Prototypes/Entities/Mobs/NPCs/animals.yml

@@ -1184,6 +1184,7 @@
   description: The genetic bipedal ancestor of... Uh... Something. Yeah, there's definitely something on the station that descended from whatever this is.
   abstract: true
   components:
+  - type: PPatient
   - type: CombatMode
   - type: Inventory
     templateId: monkey

Resources/Prototypes/Entities/Mobs/Species/base.yml

@@ -9,6 +9,7 @@
   id: BaseMobSpecies
   abstract: true
   components:
+  - type: PPatient
   - type: Sprite
     layers:
     - map: [ "enum.HumanoidVisualLayers.Chest" ]