From 300e58fadccc1d011b95aabb2126c80d6e31bccb Mon Sep 17 00:00:00 2001 From: Roudenn Date: Sat, 30 Nov 2024 21:29:18 +0300 Subject: [PATCH] fix --- .../Inventory/ClientInventorySystem.cs | 10 --- .../Backmen/Surgery/SurgerySystem.cs | 15 ++++ .../Backmen/Targeting/TargetingSystem.cs | 3 - .../Surgery/SharedSurgerySystem.Steps.cs | 1 + Content.Shared/Body/Part/BodyPartComponent.cs | 6 +- .../Body/Systems/SharedBodySystem.Parts.cs | 2 - .../Locale/en-US/surgery/surgery-popup.ftl | 53 ------------ Resources/Locale/en-US/surgery/surgery-ui.ftl | 14 ---- .../Prototypes/Recipes/Lathes/medical.yml | 52 ------------ .../_Backmen/Recipes/Lathes/robotics.yml | 80 +++++++++++++++++++ .../_Backmen/Recipes/Lathes/security.yml | 12 +++ .../_Backmen/Recipes/Lathes/surgery.yml | 52 +++++++++++- .../_Backmen/Research/civilianservices.yml | 52 ++++++++++++ .../_Shitmed/Recipes/Lathes/medical.yml | 59 -------------- .../_Shitmed/Recipes/Lathes/robotics.yml | 80 ------------------- .../_Shitmed/Recipes/Lathes/security.yml | 11 --- .../_Shitmed/Research/civilianservices.yml | 52 ------------ 17 files changed, 214 insertions(+), 340 deletions(-) delete mode 100644 Resources/Locale/en-US/surgery/surgery-popup.ftl delete mode 100644 Resources/Locale/en-US/surgery/surgery-ui.ftl delete mode 100644 Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml delete mode 100644 Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml delete mode 100644 Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml delete mode 100644 Resources/Prototypes/_Shitmed/Research/civilianservices.yml diff --git a/Content.Client/Inventory/ClientInventorySystem.cs b/Content.Client/Inventory/ClientInventorySystem.cs index bfe0098b23a..6c421b1d66c 100644 --- a/Content.Client/Inventory/ClientInventorySystem.cs +++ b/Content.Client/Inventory/ClientInventorySystem.cs @@ -40,7 +40,6 @@ public override void Initialize() SubscribeLocalEvent(OnPlayerAttached); SubscribeLocalEvent(OnPlayerDetached); - SubscribeLocalEvent(OnRefreshInventorySlots); SubscribeLocalEvent(OnShutdown); SubscribeLocalEvent((_, comp, args) => @@ -182,15 +181,6 @@ public void UpdateSlot(EntityUid owner, InventorySlotsComponent component, strin EntitySlotUpdate?.Invoke(newData); } - public void OnRefreshInventorySlots(EntityUid owner, InventorySlotsComponent component, RefreshInventorySlotsEvent args) - { - if (!component.SlotData.TryGetValue(args.SlotName, out var slotData) - || _playerManager.LocalEntity != owner) - return; - - OnSlotRemoved?.Invoke(slotData); - } - public bool TryAddSlotDef(EntityUid owner, InventorySlotsComponent component, SlotDefinition newSlotDef) { SlotData newSlotData = newSlotDef; //convert to slotData diff --git a/Content.Server/Backmen/Surgery/SurgerySystem.cs b/Content.Server/Backmen/Surgery/SurgerySystem.cs index ca5f87393e2..96aa90f718d 100644 --- a/Content.Server/Backmen/Surgery/SurgerySystem.cs +++ b/Content.Server/Backmen/Surgery/SurgerySystem.cs @@ -102,6 +102,21 @@ private void SetDamage(EntityUid body, targetPart: _body.GetTargetBodyPart(partComp)); } + private void AttemptStartSurgery(Entity ent, EntityUid user, EntityUid target) + { + if (!IsLyingDown(target, user)) + return; + + if (user == target && !_config.GetCVar(Shared.Backmen.CCVar.CCVars.CanOperateOnSelf)) + { + _popup.PopupEntity(Loc.GetString("surgery-error-self-surgery"), user, user); + return; + } + + _ui.OpenUi(target, SurgeryUIKey.Key, user); + RefreshUI(target); + } + private void OnUtilityVerb(Entity ent, ref GetVerbsEvent args) { if (!args.CanInteract diff --git a/Content.Server/Backmen/Targeting/TargetingSystem.cs b/Content.Server/Backmen/Targeting/TargetingSystem.cs index c50a84e98d3..3202de8f008 100644 --- a/Content.Server/Backmen/Targeting/TargetingSystem.cs +++ b/Content.Server/Backmen/Targeting/TargetingSystem.cs @@ -1,9 +1,6 @@ using Content.Shared.Backmen.Targeting; using Content.Shared.Body.Systems; using Content.Shared.Mobs; -using Content.Shared.Backmen.Targeting; -using Content.Shared.Backmen.Targeting.Events; -using Content.Shared.Body.Part; namespace Content.Server.Backmen.Targeting; public sealed class TargetingSystem : SharedTargetingSystem diff --git a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs index 2aad78e381a..5d743d3741d 100644 --- a/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs +++ b/Content.Shared/Backmen/Surgery/SharedSurgerySystem.Steps.cs @@ -15,6 +15,7 @@ using Content.Shared.Popups; using Robust.Shared.Prototypes; using System.Linq; +using Content.Shared._Shitmed.Medical.Surgery; using Content.Shared.Backmen.Mood; using Content.Shared.Backmen.Surgery.Body.Events; using Content.Shared.Backmen.Surgery.Body.Organs; diff --git a/Content.Shared/Body/Part/BodyPartComponent.cs b/Content.Shared/Body/Part/BodyPartComponent.cs index 1496e00ba85..09ded4f46c3 100644 --- a/Content.Shared/Body/Part/BodyPartComponent.cs +++ b/Content.Shared/Body/Part/BodyPartComponent.cs @@ -12,7 +12,7 @@ namespace Content.Shared.Body.Part; [RegisterComponent, NetworkedComponent, AutoGenerateComponentState] -[Access(typeof(SharedBodySystem))] +//[Access(typeof(SharedBodySystem))] public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent { // Need to set this on container changes as it may be several transform parents up the hierarchy. @@ -36,7 +36,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent public string ToolName { get; set; } = "A body part"; [DataField, AlwaysPushInheritance] - public string SlotId = ""; + public string SlotId { get; set; } = ""; [DataField, AutoNetworkedField] public bool? Used { get; set; } = null; @@ -153,7 +153,7 @@ public sealed partial class BodyPartComponent : Component, ISurgeryToolComponent public bool IsVital; [DataField, AutoNetworkedField] - public BodyPartSymmetry Symmetry = BodyPartSymmetry.None; + public BodyPartSymmetry Symmetry { get; set; } = BodyPartSymmetry.None; /// /// When attached, the part will ensure these components on the entity, and delete them on removal. diff --git a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs index cad07494c46..0c18ba33c9b 100644 --- a/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs +++ b/Content.Shared/Body/Systems/SharedBodySystem.Parts.cs @@ -36,8 +36,6 @@ private void InitializeParts() // Shitmed Change Start SubscribeLocalEvent(OnMapInit); SubscribeLocalEvent(OnBodyPartRemove); - SubscribeLocalEvent(OnBodyPartInserted); - SubscribeLocalEvent(OnBodyPartRemoved); SubscribeLocalEvent(OnAmputateAttempt); SubscribeLocalEvent(OnPartEnableChanged); } diff --git a/Resources/Locale/en-US/surgery/surgery-popup.ftl b/Resources/Locale/en-US/surgery/surgery-popup.ftl deleted file mode 100644 index dd49176148b..00000000000 --- a/Resources/Locale/en-US/surgery/surgery-popup.ftl +++ /dev/null @@ -1,53 +0,0 @@ -surgery-popup-step-SurgeryStepOpenIncisionScalpel = {$user} is making an incision on {$target}'s {$part}. -surgery-popup-step-SurgeryStepClampBleeders = {$user} is clamping the bleeders on {$target}'s {$part}. -surgery-popup-step-SurgeryStepRetractSkin = {$user} is retracting the skin on {$target}'s {$part}. -surgery-popup-step-SurgeryStepSawBones = {$user} is sawing through the bones on {$target}'s {$part}. -surgery-popup-step-SurgeryStepPriseOpenBones = {$user} is prising the bones open on {$target}'s {$part}. -surgery-popup-step-SurgeryStepCloseBones = {$user} is closing the bones on {$target}'s {$part}. -surgery-popup-step-SurgeryStepMendRibcage = {$user} is mending the ribcage on {$target}'s {$part}. -surgery-popup-step-SurgeryStepCloseIncision = {$user} is closing the incision on {$target}'s {$part}. - -surgery-popup-step-SurgeryStepInsertFeature = {$user} is inserting something onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachHead-step-SurgeryStepInsertFeature = {$user} is attaching a head onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachLeftArm-step-SurgeryStepInsertFeature = {$user} is attaching a left arm onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachRightArm-step-SurgeryStepInsertFeature = {$user} is attaching a right arm onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachLeftLeg-step-SurgeryStepInsertFeature = {$user} is attaching a left leg onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachRightLeg-step-SurgeryStepInsertFeature = {$user} is attaching a right leg onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachLeftHand-step-SurgeryStepInsertFeature = {$user} is attaching a left hand onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachRightHand-step-SurgeryStepInsertFeature = {$user} is attaching a right hand onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachLeftFoot-step-SurgeryStepInsertFeature = {$user} is attaching a left foot onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachRightFoot-step-SurgeryStepInsertFeature = {$user} is attaching a right foot onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachLegs-step-SurgeryStepInsertFeature = {$user} is attaching legs onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachHands-step-SurgeryStepInsertFeature = {$user} is attaching hands onto {$target}'s {$part}! -surgery-popup-procedure-SurgeryAttachFeet-step-SurgeryStepInsertFeature = {$user} is attaching feet onto {$target}'s {$part}! - -surgery-popup-step-SurgeryStepSealWounds = {$user} is sealing the wounds on {$target}'s {$part}. -surgery-popup-step-SurgeryStepSawFeature = {$user} is sawing through the bones on {$target}'s {$part}. -surgery-popup-step-SurgeryStepClampInternalBleeders = {$user} is clamping the internal bleeders on {$target}'s {$part}. -surgery-popup-step-SurgeryStepRemoveFeature = {$user} is amputating {$target}'s {$part}! -surgery-popup-step-SurgeryStepCarefulIncisionScalpel = {$user} is carefully making an incision on {$target}'s {$part}. -surgery-popup-step-SurgeryStepRepairBruteTissue = {$user} is repairing the damaged tissues on {$target}'s {$part}! -surgery-popup-step-SurgeryStepRepairBurnTissue = {$user} is repairing the burnt tissues on {$target}'s {$part}! -surgery-popup-step-SurgeryStepSealTendWound = {$user} is sealing the wounds on {$target}'s {$part}. -surgery-popup-step-SurgeryStepInsertItem = {$user} is inserting something into {$target}'s {$part}! -surgery-popup-step-SurgeryStepRemoveItem = {$user} is removing something from {$target}'s {$part}! - -surgery-popup-step-SurgeryStepRemoveOrgan = {$user} is removing an organ from {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertOrgan = {$user} is inserting an organ into {$target}'s {$part}! - -surgery-popup-procedure-SurgeryRemoveBrain-step-SurgeryStepRemoveOrgan = {$user} is removing the brain from {$target}'s {$part}! -surgery-popup-procedure-SurgeryRemoveHeart-step-SurgeryStepRemoveOrgan = {$user} is removing the heart from {$target}'s {$part}! -surgery-popup-procedure-SurgeryRemoveLiver-step-SurgeryStepRemoveOrgan = {$user} is removing the liver from {$target}'s {$part}! -surgery-popup-procedure-SurgeryRemoveLungs-step-SurgeryStepRemoveOrgan = {$user} is removing the lungs from {$target}'s {$part}! -surgery-popup-procedure-SurgeryRemoveEyes-step-SurgeryStepRemoveOrgan = {$user} is removing the eyes from {$target}'s {$part}! -surgery-popup-procedure-SurgeryRemoveStomach-step-SurgeryStepRemoveOrgan = {$user} is removing the stomach from {$target}'s {$part}! - -surgery-popup-procedure-SurgeryInsertBrain-step-SurgeryStepInsertOrgan = {$user} is inserting a brain into {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertLungs = {$user} is inserting lungs into {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertLiver = {$user} is inserting a liver into {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertEyes = {$user} is inserting eyes into {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertHeart = {$user} is inserting a heart into {$target}'s {$part}! -surgery-popup-step-SurgeryStepInsertStomach = {$user} is inserting a stomach into {$target}'s {$part}! - -surgery-popup-step-SurgeryStepSealOrganWound = {$user} is sealing the wounds on {$target}'s {$part}. -surgery-popup-step-SurgeryStepLobotomize = {$user} is drilling a hole into {$target}'s {$part}. \ No newline at end of file diff --git a/Resources/Locale/en-US/surgery/surgery-ui.ftl b/Resources/Locale/en-US/surgery/surgery-ui.ftl deleted file mode 100644 index 415395f7815..00000000000 --- a/Resources/Locale/en-US/surgery/surgery-ui.ftl +++ /dev/null @@ -1,14 +0,0 @@ -surgery-verb-text = Start surgery -surgery-verb-message = Begin surgery on this entity. -surgery-ui-window-title = Surgery -surgery-ui-window-require = Requires -surgery-ui-window-parts = < Parts -surgery-ui-window-surgeries = < Surgeries -surgery-ui-window-steps = < Steps -surgery-ui-window-steps-error-skills = You have no surgical skills. -surgery-ui-window-steps-error-table = You need an operating table for this. -surgery-ui-window-steps-error-armor = You need to remove their armor! -surgery-ui-window-steps-error-tools = Missing tools. -surgery-error-laying = They need to be laying down! -surgery-error-self-surgery = You can't perform surgery on yourself! -surgery-part-damage-evaded = {$user} narrowly evaded! diff --git a/Resources/Prototypes/Recipes/Lathes/medical.yml b/Resources/Prototypes/Recipes/Lathes/medical.yml index a7f444001f6..08250290ec7 100644 --- a/Resources/Prototypes/Recipes/Lathes/medical.yml +++ b/Resources/Prototypes/Recipes/Lathes/medical.yml @@ -215,55 +215,3 @@ materials: Steel: 100 Plastic: 100 - -# Shitmed Recipes - -- type: latheRecipe - id: MedicalCyberneticEyes - result: MedicalCyberneticEyes - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: EnergyScalpel - result: EnergyScalpel - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Gold: 150 - -- type: latheRecipe - id: AdvancedRetractor - result: AdvancedRetractor - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Silver: 150 - -- type: latheRecipe - id: EnergyCautery - result: EnergyCautery - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Plasma: 150 - -- type: latheRecipe - id: OmnimedTool - result: OmnimedTool - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Gold: 150 - Silver: 150 - Plasma: 150 diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml index c9db0667ef0..25efb88e60b 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Lathes/robotics.yml @@ -6,3 +6,83 @@ Steel: 500 Plasma: 100 +- type: latheRecipe + id: BorgModuleSurgery + result: BorgModuleSurgery + category: Robotics + completetime: 3 + materials: + Steel: 250 + Glass: 250 + Plastic: 250 + +- type: latheRecipe + id: BorgModuleAdvancedSurgery + result: BorgModuleAdvancedSurgery + category: Robotics + completetime: 3 + materials: + Steel: 500 + Glass: 500 + Plastic: 250 + Gold: 50 + +- type: latheRecipe + id: JawsOfLifeLeftArm + result: JawsOfLifeLeftArm + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: JawsOfLifeRightArm + result: JawsOfLifeRightArm + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: SpeedLeftLeg + result: SpeedLeftLeg + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: SpeedRightLeg + result: SpeedRightLeg + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: BasicCyberneticEyes + result: BasicCyberneticEyes + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml index 1a5c2a5cf51..2e04b730461 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Lathes/security.yml @@ -39,3 +39,15 @@ Plastic: 500 Gold: 250 Uranium: 50 + +- type: latheRecipe + id: SecurityCyberneticEyes + result: SecurityCyberneticEyes + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 diff --git a/Resources/Prototypes/_Backmen/Recipes/Lathes/surgery.yml b/Resources/Prototypes/_Backmen/Recipes/Lathes/surgery.yml index 3195e494ede..29549ed5051 100644 --- a/Resources/Prototypes/_Backmen/Recipes/Lathes/surgery.yml +++ b/Resources/Prototypes/_Backmen/Recipes/Lathes/surgery.yml @@ -1,11 +1,61 @@ - type: latheRecipe id: BoneGel result: BoneGel - completetime: 10 + completetime: 2 materials: Plastic: 200 Plasma: 200 +- type: latheRecipe + id: MedicalCyberneticEyes + result: MedicalCyberneticEyes + category: Robotics + completetime: 5 + materials: + Steel: 1000 + Glass: 500 + Plastic: 500 + Gold: 300 + Silver: 300 + +- type: latheRecipe + id: EnergyScalpel + result: EnergyScalpel + completetime: 2 + materials: + Steel: 600 + Glass: 150 + Gold: 150 + +- type: latheRecipe + id: AdvancedRetractor + result: AdvancedRetractor + completetime: 2 + materials: + Steel: 600 + Glass: 150 + Silver: 150 + +- type: latheRecipe + id: EnergyCautery + result: EnergyCautery + completetime: 2 + materials: + Steel: 600 + Glass: 150 + Plasma: 150 + +- type: latheRecipe + id: OmnimedTool + result: OmnimedTool + completetime: 2 + materials: + Steel: 1200 + Glass: 300 + Gold: 300 + Silver: 300 + Plasma: 300 + - type: latheRecipe id: SynthHeart result: BioSynthHeart diff --git a/Resources/Prototypes/_Backmen/Research/civilianservices.yml b/Resources/Prototypes/_Backmen/Research/civilianservices.yml index c593a09f44b..d673a9f2d83 100644 --- a/Resources/Prototypes/_Backmen/Research/civilianservices.yml +++ b/Resources/Prototypes/_Backmen/Research/civilianservices.yml @@ -46,3 +46,55 @@ - ShadokinStandardTranslatorImplanter - ValyrianStandardTranslatorImplanter +# Tier 1 + +# Tier 2 + +- type: technology + id: AdvancedTreatment + name: research-technology-advanced-treatment + icon: + sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi + state: e-scalpel-on + discipline: CivilianServices + tier: 2 + cost: 10000 + recipeUnlocks: + - BorgModuleAdvancedTreatment + - BorgModuleDefibrillator + - EnergyScalpel + - EnergyCautery + - AdvancedRetractor + - BorgModuleAdvancedSurgery + +- type: technology + id: CyberneticEnhancements + name: research-technology-cybernetic-enhancements + icon: + sprite: _Shitmed/Mobs/Species/IPC/organs.rsi + state: eyes + discipline: CivilianServices + tier: 2 + cost: 15000 + recipeUnlocks: + - JawsOfLifeLeftArm + - JawsOfLifeRightArm + - SpeedLeftLeg + - SpeedRightLeg + - BasicCyberneticEyes + - SecurityCyberneticEyes + - MedicalCyberneticEyes + +# Tier 3 + +- type: technology + id: HighEndSurgery + name: research-technology-high-end-surgery + icon: + sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi + state: omnimed + discipline: CivilianServices + tier: 3 + cost: 10000 + recipeUnlocks: + - OmnimedTool diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml deleted file mode 100644 index fc1665cbaed..00000000000 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/medical.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Shitmed Recipes - -- type: latheRecipe - id: BoneGel - result: BoneGel - completetime: 2 - materials: - Plastic: 200 - Plasma: 200 - -- type: latheRecipe - id: MedicalCyberneticEyes - result: MedicalCyberneticEyes - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: EnergyScalpel - result: EnergyScalpel - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Gold: 150 - -- type: latheRecipe - id: AdvancedRetractor - result: AdvancedRetractor - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Silver: 150 - -- type: latheRecipe - id: EnergyCautery - result: EnergyCautery - completetime: 2 - materials: - Steel: 600 - Glass: 150 - Plasma: 150 - -- type: latheRecipe - id: OmnimedTool - result: OmnimedTool - completetime: 2 - materials: - Steel: 1200 - Glass: 300 - Gold: 300 - Silver: 300 - Plasma: 300 diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml deleted file mode 100644 index 66b21379f0a..00000000000 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/robotics.yml +++ /dev/null @@ -1,80 +0,0 @@ -- type: latheRecipe - id: BorgModuleSurgery - result: BorgModuleSurgery - category: Robotics - completetime: 3 - materials: - Steel: 250 - Glass: 250 - Plastic: 250 - -- type: latheRecipe - id: BorgModuleAdvancedSurgery - result: BorgModuleAdvancedSurgery - category: Robotics - completetime: 3 - materials: - Steel: 500 - Glass: 500 - Plastic: 250 - Gold: 50 - -- type: latheRecipe - id: JawsOfLifeLeftArm - result: JawsOfLifeLeftArm - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: JawsOfLifeRightArm - result: JawsOfLifeRightArm - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: SpeedLeftLeg - result: SpeedLeftLeg - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: SpeedRightLeg - result: SpeedRightLeg - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 - -- type: latheRecipe - id: BasicCyberneticEyes - result: BasicCyberneticEyes - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 \ No newline at end of file diff --git a/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml b/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml deleted file mode 100644 index 3367add7e91..00000000000 --- a/Resources/Prototypes/_Shitmed/Recipes/Lathes/security.yml +++ /dev/null @@ -1,11 +0,0 @@ -- type: latheRecipe - id: SecurityCyberneticEyes - result: SecurityCyberneticEyes - category: Robotics - completetime: 5 - materials: - Steel: 1000 - Glass: 500 - Plastic: 500 - Gold: 300 - Silver: 300 \ No newline at end of file diff --git a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml b/Resources/Prototypes/_Shitmed/Research/civilianservices.yml deleted file mode 100644 index 1e6c4d6b8a4..00000000000 --- a/Resources/Prototypes/_Shitmed/Research/civilianservices.yml +++ /dev/null @@ -1,52 +0,0 @@ -# Tier 1 - -# Tier 2 - -- type: technology - id: AdvancedTreatment - name: research-technology-advanced-treatment - icon: - sprite: _Shitmed/Objects/Specific/Medical/Surgery/e-scalpel.rsi - state: e-scalpel-on - discipline: CivilianServices - tier: 2 - cost: 10000 - recipeUnlocks: - - BorgModuleAdvancedTreatment - - BorgModuleDefibrillator - - EnergyScalpel - - EnergyCautery - - AdvancedRetractor - - BorgModuleAdvancedSurgery - -- type: technology - id: CyberneticEnhancements - name: research-technology-cybernetic-enhancements - icon: - sprite: _Shitmed/Mobs/Species/IPC/organs.rsi - state: eyes - discipline: CivilianServices - tier: 2 - cost: 15000 - recipeUnlocks: - - JawsOfLifeLeftArm - - JawsOfLifeRightArm - - SpeedLeftLeg - - SpeedRightLeg - - BasicCyberneticEyes - - SecurityCyberneticEyes - - MedicalCyberneticEyes - -# Tier 3 - -- type: technology - id: HighEndSurgery - name: research-technology-high-end-surgery - icon: - sprite: _Shitmed/Objects/Specific/Medical/Surgery/omnimed.rsi - state: omnimed - discipline: CivilianServices - tier: 3 - cost: 10000 - recipeUnlocks: - - OmnimedTool \ No newline at end of file