Merge pull request Simple-Station#12 from Tropica1Owl/Pogmed

Surgery situation got even worse
gluesniffler · Aug 26, 2024 · eff0a2b · eff0a2b
2 parents 1b0e9f8 + 95d8aa7
commit eff0a2b
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 60 deletions.
diff --git a/Content.Server/Palmtree/CookieClicker/Components/CookieClickerComponent.cs b/Content.Server/Palmtree/CookieClicker/Components/CookieClickerComponent.cs
diff --git a/Content.Server/Palmtree/CookieClicker/Components/IncrementorComponent.cs b/Content.Server/Palmtree/CookieClicker/Components/IncrementorComponent.cs
diff --git a/Content.Server/Palmtree/CookieClicker/CookieClickerSystem.cs b/Content.Server/Palmtree/CookieClicker/CookieClickerSystem.cs
diff --git a/Content.Server/Palmtree/Surgery/Components/ValidPatientComponent.cs b/Content.Server/Palmtree/Surgery/Components/ValidPatientComponent.cs
@@ -4,19 +4,7 @@ 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.
-    {// I'll make this better later with a proper list of steps, I just need a first version for now
-        [DataField("incised")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool incised = false;
-
-        [DataField("retracted")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool retracted = false;
-
-        [DataField("clamped")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public bool clamped = false;
-
+    {
         public List<string> procedures = new List<string>();
     }
 }
diff --git a/Content.Server/Palmtree/Surgery/Components/ValidSurgeryToolComponent.cs b/Content.Server/Palmtree/Surgery/Components/ValidSurgeryToolComponent.cs
@@ -10,10 +10,6 @@ public partial class PSurgeryToolComponent : Component
         [ViewVariables(VVAccess.ReadWrite)]
         public string kind = "scalpel";
 
-        [DataField("infectionDamage")]
-        [ViewVariables(VVAccess.ReadWrite)]
-        public float infectionDamage = 1.0f;
-
         [DataField("useDelay")]
         [ViewVariables(VVAccess.ReadWrite)]
         public float useDelay = 3.0f;

diff --git a/Content.Server/Palmtree/Surgery/SurgerySystem.cs b/Content.Server/Palmtree/Surgery/SurgerySystem.cs
@@ -133,6 +133,7 @@ private void OnProcedureFinished(EntityUid uid, PSurgeryToolComponent tool, Surg
                             {
                                 _mind.TransferTo(targetMindId, uid, mind: targetMind);
                             }
+                            repeatableProcedure = true;
                         }
                         else
                         {
@@ -152,14 +153,15 @@ private void OnProcedureFinished(EntityUid uid, PSurgeryToolComponent tool, Surg
                             }
                             else
                             {
-                                if (targetHasMind)
+                                if (targetHasMind && !deviceHasMind)
                                 {
                                     _mind.TransferTo(targetMindId, uid, mind: targetMind);
                                 }
-                                if (deviceHasMind)
+                                if (deviceHasMind && !targetHasMind)
                                 {
                                     _mind.TransferTo(deviceMindId, args.Target, mind: deviceMind);
                                 }
+                                repeatableProcedure = true;
                             }
                         }
                         else

diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
@@ -12,7 +12,8 @@
       - id: Cautery
       - id: Retractor
       - id: Scalpel
-      - id: SurgeryItemBloodFilter
+      - id: SurgeryItemBloodFilter # Syndie change
+      - id: PhantomLinkCard # Syndie change
 
 - type: entity
   id: ClothingBackpackDuffelCBURNFilled

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/medical.yml b/Resources/Prototypes/Catalog/Fills/Crates/medical.yml
@@ -68,7 +68,8 @@
       - id: Saw
       - id: Hemostat
       - id: ClothingMaskSterile
-      - id: SurgeryItemBloodFilter
+      - id: SurgeryItemBloodFilter # Syndie change
+      - id: PhantomLinkCard # Syndie change
 
 - type: entity
   id: CrateMedicalScrubs

diff --git a/Resources/Prototypes/Entities/Mobs/Species/base.yml b/Resources/Prototypes/Entities/Mobs/Species/base.yml
@@ -7,6 +7,7 @@
   id: BaseMobSpecies
   abstract: true
   components:
+  - type: PPatient
   - type: Sprite
     layers:
     - map: [ "enum.HumanoidVisualLayers.Chest" ]

diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -5,7 +5,6 @@
   name: Urist McHands
   abstract: true
   components:
-  - type: PPatient # Allows this mob to receive operations
   - type: Hunger
   - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
     sprite: Mobs/Species/Human/parts.rsi

diff --git a/Resources/Prototypes/Palmtree/Entities/Objects/Specific/Medical/surgery.yml b/Resources/Prototypes/Palmtree/Entities/Objects/Specific/Medical/surgery.yml
@@ -47,3 +47,27 @@
   - type: Tag
     tags:
       - SurgeryTool
+
+# Placeholder PAIs, aka semi-automatic ghost roles
+
+- type: entity
+  parent: BaseItem
+  id: PhantomLinkCard
+  name: phantomlink card
+  description: Mysterious technology used to extract the soul of living things for conversion into borgs, this one can also insert consciousness into other bodies.
+  components:
+  - type: PSurgeryTool # Palmtree change - I don't need to explain this one, do I?
+    kind: phantomlink
+    useDelay: 5 # You gotta be sure.
+    damageOnUse:
+      types:
+        Shock: 50 # This is not good for your head
+  - type: BorgBrain
+  - type: Sprite
+    sprite: Objects/Fun/pai.rsi
+    layers:
+    - state: pai-base
+    - state: syndicate-pai-off-overlay
+      shader: unshaded
+      map: ["screen"]
+  - type: BlockMovement