Dreammyrr patch 3

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,27 @@
   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

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" ]

Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

@@ -20,6 +20,17 @@
   parent: BaseToolSurgery
   description: A surgical tool used to cauterize open wounds.
   components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    useDelay: 1
+    kind: cautery
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/cautery1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/cautery2.ogg"
+    bleedAmountOnUse: -15
+    damageOnUse:
+      types:
+        Heat: 1 # Burns!
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/cautery.rsi
     state: cautery
@@ -66,6 +77,15 @@
   parent: BaseToolSurgery
   description: A surgical tool used to make incisions into flesh.
   components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    kind: scalpel
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/scalpel1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
+    damageOnUse:
+      types:
+        Slash: 15 # Chop chop
   - type: Sharp
     butcherDelayModifier: 1.5 # Butchering with a scalpel, regardless of the type, will take 50% longer
   - type: Utensil
@@ -132,6 +152,15 @@
   parent: BaseToolSurgery
   description: A surgical tool used to hold open incisions.
   components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    kind: retractor
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/retractor1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/retractor2.ogg"
+    damageOnUse: # Ow it pinches
+      types:
+        Blunt: 5
   - type: Sprite
     sprite: Objects/Specific/Medical/Surgery/scissors.rsi
     state: retractor
@@ -145,6 +174,18 @@
   parent: Retractor
   description: A surgical tool used to compress blood vessels to prevent bleeding.
   components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    useDelay: 1
+    kind: hemostat # Even if the hemostat is in the same category as a retractor, it is used for different things.
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/hemostat1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/hemostat1.ogg"
+    damageOnUse: # Ow it pinches
+      groups:
+        Brute: -9
+        Burn: -12
+    bleedAmountOnUse: -15
   - type: Sprite
     state: hemostat
   - type: Item
@@ -165,6 +206,15 @@
   parent: BaseToolSurgery
   description: For cutting wood and other objects to pieces. Or sawing bones, in case of emergency.
   components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/scalpel1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
+    kind: saw
+    damageOnUse:
+      types:
+        Blunt: 30 # Having your bones affected gotta hurt a lot
   - type: Sharp
   - type: Utensil
     types:
@@ -207,6 +257,11 @@
   parent: Saw
   description: For heavy duty cutting.
   components:
+  - type: PSurgeryTool
+    audioStart:
+      path: "/Audio/Palmtree/Items/Medical/saw1.ogg"
+    audioEnd:
+      path: "/Audio/Palmtree/Items/Medical/scalpel2.ogg"
   - type: Sprite
     state: electric
   - type: Item

Resources/Prototypes/Guidebook/medical.yml

@@ -7,6 +7,7 @@
   - Chemist
   - Cloning
   - Cryogenics
+  - Surgery # Syndicate change
 
 - type: guideEntry
   id: Medical Doctor
@@ -50,3 +51,9 @@
   id: AdvancedBrute
   name: guide-entry-brute
   text: "/ServerInfo/Guidebook/Medical/AdvancedBrute.xml"
+# Syndicate change start
+- type: guideEntry
+  id: Surgery
+  name: Surgery
+  text: "/ServerInfo/Palmtree/Medical/Surgery.xml"
+# Syndicate change end

Resources/Prototypes/Guidebook/security.yml

@@ -1,12 +1,17 @@
-- type: guideEntry
+- type: guideEntry
   id: Security
   name: guide-entry-security
   text: "/ServerInfo/Guidebook/Security/Security.xml"
+# q?
   children:
   - Forensics
   - Defusal
   - CriminalRecords
-#  - SpaceLaw # TODO
+  - spacelaw 
+  - crimelist
+  - resitem
+  - resgear 
+  - substances
 
 - type: guideEntry
   id: Forensics
@@ -22,3 +27,34 @@
   id: CriminalRecords
   name: guide-entry-criminal-records
   text: "/ServerInfo/Guidebook/Security/CriminalRecords.xml"
+
+- type: guideEntry
+  id: spacelaw
+  name: guide-entry-sl
+  text: "/ServerInfo/Guidebook/Security/SpaceLaw.xml"
+
+- type: guideEntry
+  id: crimelist
+  name: guide-entry-cl
+  text: "/ServerInfo/Guidebook/Security/SLCrimeList.xml"
+
+- type: guideEntry
+  id: resitem
+  name: guide-entry-item
+  text: "/ServerInfo/Guidebook/Security/SLRestrictedWeapons.xml"
+
+- type: guideEntry
+  id: resgear
+  name: guide-entry-gear
+  text: "/ServerInfo/Guidebook/Security/SLRestrictedGear.xml"
+
+- type: guideEntry
+  id: substances
+  name: guide-entry-sb
+  text: "/ServerInfo/Guidebook/Security/SLControlledSubstances.xml"
+
+# guide-entry-sb = Substancias
+# guide-entry-sl = SpaceLaw
+# guide-entry-cl = ListaCrimes
+# guide-entry-item = Items
+# guide-entry-gear = Equipamentos