From bb7cc006e30c2d6fa1f0d57beec42a21fae7e8c7 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 21:57:35 +0300 Subject: [PATCH 1/8] Brigmedic-Fix --- .../Fills/Backpacks/StarterGear/backpack.yml | 10 +++++++++ .../Roles/Jobs/Security/brigmedic.yml | 21 ++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 38cc7974329..fe3d39fcd2e 100644 --- a/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -329,3 +329,13 @@ - id: Cutlass - id: WeaponRevolverPirate - id: ClothingEyesEyepatch + +- type: entity + noSpawn: true + parent: ClothingBackpackBrigmedic + id: ClothingBackpackBrigmedicFilled + components: + - type: StorageFill + contents: + - id: BoxSurvivalBrigmedic + - id: Flash diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index fd90e84f85c..19b53274961 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -12,4 +12,23 @@ - Security - Brig - Maintenance - - External \ No newline at end of file + - External + +- type: startingGear + id: BrigmedicGear + equipment: + jumpsuit: ClothingUniformJumpsuitBrigmedic + outerClothing: ClothingOuterCoatAMG + back: ClothingBackpackBrigmedicFilled + shoes: ClothingShoesColorRed + gloves: ClothingHandsGlovesNitrile + eyes: ClothingEyesHudMedical + head: ClothingHeadHatBeretBrigmedic + id: BrigmedicPDA + ears: ClothingHeadsetBrigmedic + mask: ClothingMaskBreathMedicalSecurity + belt: ClothingBeltMedicalFilled + neck: ClothingNeckBodycam + innerclothingskirt: ClothingUniformJumpskirtBrigmedic + satchel: ClothingBackpackSatchelBrigmedicFilled + duffelbag: ClothingBackpackDuffelBrigmedicFilled From d6be308e6b79ba5dd44b6d57e4f7155b7b7d4e39 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 21:59:07 +0300 Subject: [PATCH 2/8] Update misc_startinggear.yml --- .../Roles/Jobs/Fun/misc_startinggear.yml | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml index 4861cee2d21..2ca853885d1 100644 --- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml +++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml @@ -273,23 +273,3 @@ head: ClothingHeadHatTophat jumpsuit: ClothingUniformJumpsuitJacketMonkey id: BartenderIDCard - -#Brigmedic - -- type: startingGear - id: BrigmedicGear - equipment: - jumpsuit: ClothingUniformJumpsuitBrigmedic - outerClothing: ClothingOuterCoatAMG - back: ClothingBackpackBrigmedicFilled - shoes: ClothingShoesColorRed - gloves: ClothingHandsGlovesNitrile - eyes: ClothingEyesHudMedical - head: ClothingHeadHatBeretBrigmedic - id: BrigmedicPDA - ears: ClothingHeadsetBrigmedic - mask: ClothingMaskBreathMedicalSecurity - belt: ClothingBeltMedicalFilled - innerclothingskirt: ClothingUniformJumpskirtBrigmedic - satchel: ClothingBackpackSatchelBrigmedicFilled - duffelbag: ClothingBackpackDuffelBrigmedicFilled From be44e74ccf8810f80146b88746a9b4d1eae70506 Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Fri, 18 Aug 2023 22:01:34 +0300 Subject: [PATCH 3/8] Update brigmedic.yml --- Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml index 19b53274961..ad5df4a72eb 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/brigmedic.yml @@ -28,7 +28,7 @@ ears: ClothingHeadsetBrigmedic mask: ClothingMaskBreathMedicalSecurity belt: ClothingBeltMedicalFilled - neck: ClothingNeckBodycam +# neck: ClothingNeckBodycam Will be added later innerclothingskirt: ClothingUniformJumpskirtBrigmedic satchel: ClothingBackpackSatchelBrigmedicFilled duffelbag: ClothingBackpackDuffelBrigmedicFilled From dbac76f27d9105888673ce38132425a8fb96d04c Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 22:47:22 +0300 Subject: [PATCH 4/8] Minor fixes --- Resources/Locale/en-US/_NF/adventure/adventure.ftl | 3 --- Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl | 2 ++ .../_NF/prototypes/catalog/fills/crates/vending-crates.ftl | 2 +- .../prototypes/catalog/fills/crates/livestock-crates.ftl | 2 +- Resources/Locale/en-US/store/uplink-catalog.ftl | 4 ++-- .../Prototypes/Catalog/VendingMachines/Inventories/snack.yml | 5 ++--- .../Prototypes/Catalog/VendingMachines/Inventories/soda.yml | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl diff --git a/Resources/Locale/en-US/_NF/adventure/adventure.ftl b/Resources/Locale/en-US/_NF/adventure/adventure.ftl index 640467e28ba..6088ccc4c6f 100644 --- a/Resources/Locale/en-US/_NF/adventure/adventure.ftl +++ b/Resources/Locale/en-US/_NF/adventure/adventure.ftl @@ -9,9 +9,6 @@ adventure-title = New Frontier Adventure Mode adventure-description = Join a ship crew or buy your own and explore, research, salvage, or haul your way to riches! currency = Spesos -advertisement-astrovend-1 = Spessman's Choice! -advertisement-astrovend-2 = Don't leave home without a suit! - guide-entry-adventure = New Frontiers Program guide-entry-bank = NT Galactic Bank guide-entry-shipyard = Frontier Shipyards diff --git a/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl new file mode 100644 index 00000000000..97fdf81361b --- /dev/null +++ b/Resources/Locale/en-US/_NF/advertisements/vending/astro.ftl @@ -0,0 +1,2 @@ +advertisement-astrovend-1 = Spessman's Choice! +advertisement-astrovend-2 = Don't leave home without a suit! diff --git a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl index 00310d9bc51..b4f82c609d9 100644 --- a/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl +++ b/Resources/Locale/en-US/_NF/prototypes/catalog/fills/crates/vending-crates.ftl @@ -1,5 +1,5 @@ ent-CrateVendingMachineRestockAstroVendFilled = AstroVend restock crate - .desc = Contains two restock boxes for the AstroVend vendor. + .desc = Contains two restock boxes for the AstroVend vending machine. ent-CrateVendingMachineRestockAmmoFilled = Liberation restock crate .desc = Contains two restock boxes for the Liberation vending machine. diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl index 9742b83b340..17b78b271fa 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -32,7 +32,7 @@ ent-CrateNPCGorilla = Gorilla crate .desc = A crate containing a single gorilla. ent-CrateNPCMonkeyCube = Monkey cube crate - .desc = A crate containing three boxes of monkey cubes. + .desc = A crate containing a single box of monkey cubes. ent-CrateNPCMouse = Mice crate .desc = A crate containing five mice. diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 1011d44fff6..231b35a11a3 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -101,10 +101,10 @@ uplink-black-jetpack-name = Black Jetpack uplink-black-jetpack-desc = A black jetpack. It allows you to fly around in space. Refills not included, use your fuel wisely. uplink-reinforcement-radio-monkey-name = Monkey Reinforcement Teleporter -uplink-reinforcement-radio-monkey-desc = Call in a trained monkey to assist you. Comes with a single syndicate cigarette. +uplink-reinforcement-radio-monkey-desc = Call in a trained monkey to assist you. Comes with a single syndicate cigarette. uplink-reinforcement-radio-name = Reinforcement Teleporter -uplink-reinforcement-radio-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it. +uplink-reinforcement-radio-desc = Radio in a reinforcement agent of extremely questionable quality. No off button, buy this if you're ready to party. They have a pistol with no reserve ammo, and a knife. That's it. uplink-stealth-box-name = Stealth Box uplink-stealth-box-desc = A box outfitted with stealth technology, sneak around with this and don't move too fast now! diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml index 3285384cc22..184611bec95 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/snack.yml @@ -5,6 +5,5 @@ FoodSnackChocolate: 3 FoodSnackPopcorn: 3 FoodSnackSyndi: 3 - DrinkRamen: 3 - DrinkHellRamen: 2 - +# DrinkRamen: 3 # How is this even in here +# DrinkHellRamen: 2 # How is this even in here diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml index 494f05f6a31..f697b238c41 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml @@ -8,5 +8,5 @@ DrinkLemonLimeCan: 3 DrinkFourteenLokoCan: 3 emaggedInventory: - DrinkNukieCan: 3 - DrinkChangelingStingCan: 3 + DrinkNukieCan: 2 + DrinkChangelingStingCan: 2 From 6c80d8d9b02714f43f57adcfab56918a2fef3ca8 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 22:55:34 +0300 Subject: [PATCH 5/8] Chickens Fix --- .../en-US/prototypes/catalog/fills/crates/livestock-crates.ftl | 2 +- Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml | 2 +- Resources/Prototypes/Catalog/Fills/Crates/npc.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl index 17b78b271fa..99072f2db44 100644 --- a/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl +++ b/Resources/Locale/en-US/prototypes/catalog/fills/crates/livestock-crates.ftl @@ -8,7 +8,7 @@ ent-CrateNPCCat = Cat crate .desc = A crate containing a single cat. ent-CrateNPCChicken = Chicken crate - .desc = A crate containing four fully grown chickens. + .desc = A crate containing two fully grown chickens. ent-CrateNPCCrab = Crab crate .desc = A crate containing three huge crabs. diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml index 1ef0605623a..eafbf4a4a97 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_livestock.yml @@ -34,7 +34,7 @@ sprite: Mobs/Animals/chicken.rsi state: icon-1 product: CrateNPCChicken - cost: 2500 + cost: 1600 category: Livestock group: market diff --git a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml index 8dc0104bbbc..c0b4bf2e49d 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/npc.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/npc.yml @@ -42,7 +42,7 @@ - type: StorageFill contents: - id: MobChicken - amount: 4 + amount: 2 - type: entity id: CrateNPCCrab From 4ce3f3462497e2024c4ae11904e3029b9576c564 Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 23:35:46 +0300 Subject: [PATCH 6/8] Starting to remove the old medical borg so we can replace it later --- Resources/Locale/en-US/_Nyano/nyano-jobs.ftl | 1 - Resources/Maps/Shuttles/helix.yml | 14 ++--- Resources/Maps/Shuttles/pulse.yml | 14 ++--- .../Objects/Specific/Borgs/borgs_tools.yml | 4 +- .../Objects/Specific/Power/powercells.yml | 13 ----- .../_Nyano/Entities/Mobs/Player/borgs.yml | 51 ------------------- .../Objects/Specific/Borgs/borgs_tools.yml | 38 -------------- .../_Nyano/Markers/Spawners/jobs.yml | 12 ----- .../Roles/Jobs/Medical/medical_cyborg.yml | 10 ---- 9 files changed, 16 insertions(+), 141 deletions(-) delete mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml delete mode 100644 Resources/Prototypes/_Nyano/Roles/Jobs/Medical/medical_cyborg.yml diff --git a/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl b/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl index 63dd16d0067..b7fe3432939 100644 --- a/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl +++ b/Resources/Locale/en-US/_Nyano/nyano-jobs.ftl @@ -3,7 +3,6 @@ department-Silicon-description = Follow your laws in service to the humans. job-description-guard = Keep track of prisoners and make sure they have their basic needs. job-name-mail-carrier = mail carrier job-name-cyborg = cyborg -job-name-medical-cyborg = medical cyborg job-name-gladiator = gladiator job-name-fugitive = fugitive job-name-prisoner = prisoner diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml index bec559526fd..87b0de93cc5 100644 --- a/Resources/Maps/Shuttles/helix.yml +++ b/Resources/Maps/Shuttles/helix.yml @@ -2775,13 +2775,13 @@ entities: - pos: -0.5,7.5 parent: 1 type: Transform -- proto: SpawnPointMedicalCyborg - entities: - - uid: 401 - components: - - pos: 7.5,6.5 - parent: 1 - type: Transform +#- proto: SpawnPointMedicalCyborg +# entities: +# - uid: 401 +# components: +# - pos: 7.5,6.5 +# parent: 1 +# type: Transform - proto: SpawnPointMedicalDoctor entities: - uid: 402 diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml index 969a021559e..446ff2e4a3c 100644 --- a/Resources/Maps/Shuttles/pulse.yml +++ b/Resources/Maps/Shuttles/pulse.yml @@ -1085,13 +1085,13 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform -- proto: SpawnPointMedicalCyborg - entities: - - uid: 139 - components: - - pos: 0.5,0.5 - parent: 1 - type: Transform +#- proto: SpawnPointMedicalCyborg +# entities: +# - uid: 139 +# components: +# - pos: 0.5,0.5 +# parent: 1 +# type: Transform - proto: SpawnPointParamedic entities: - uid: 140 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml index 85ad40e09b7..925eaf1d1fd 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Borgs/borgs_tools.yml @@ -7,7 +7,7 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellBorgTool + startingItem: PowerCellAntiqueProto - type: entity id: HandheldCrewMonitorBorg @@ -18,4 +18,4 @@ slots: cell_slot: name: power-cell-slot-component-slot-name-default - startingItem: PowerCellBorgTool + startingItem: PowerCellAntiqueProto diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml deleted file mode 100644 index f0c4511d2ee..00000000000 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Power/powercells.yml +++ /dev/null @@ -1,13 +0,0 @@ -- type: entity - name: borg integrated power cell - description: A rechargeable modified microreactor cell. Intended for cyborg tools, it slowly recharges by itself. - id: PowerCellBorgTool - suffix: Full - parent: PowerCellMicroreactor - components: - - type: Battery - maxCharge: 200 - startingCharge: 200 - - type: BatterySelfRecharger - autoRecharge: true - autoRechargeRate: 0.66667 #takes about 5 minutes to charge itself back to full diff --git a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml index cdc563a54fa..08e28c6fadf 100644 --- a/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml +++ b/Resources/Prototypes/_Nyano/Entities/Mobs/Player/borgs.yml @@ -161,7 +161,6 @@ - type: InnateTool tools: - id: WelderIndustrial - - id: BorgToolStandard - id: MopItem - id: FireExtinguisher - id: StackHolderFloorTile @@ -206,53 +205,3 @@ - NanoTrasen - type: TypingIndicator proto: robot - -- type: entity - parent: PlayerCyborgBase - id: PlayerCyborgMedical - name: medical cyborg - components: - - type: Sprite - drawdepth: Mobs - netsync: false - sprite: Nyanotrasen/Mobs/Player/Borgs/cyborg_medical.rsi - layers: - - state: robot - - state: robot-flashlight - shader: unshaded - visible: false - map: [ "enum.ToggleVisuals.Layer" ] - - type: InnateTool - tools: - - id: HyposprayBorgMedical - - id: Syringe - - id: HandheldHealthAnalyzerBorg - - id: HandheldCrewMonitorBorg - - id: FireExtinguisher - - id: StackHolderHealingItem - - type: ItemSlots - - type: IntrinsicRadioReceiver - channels: - - Common - - Medical - - type: IntrinsicRadioTransmitter - channels: - - Common - - Medical - - type: ActiveRadio - channels: - - Common - - Medical - - type: Laws - laws: - - First, do no harm. - - Secondly, consider the crew dear to you; to live in common with them and, if necessary, risk your existence for them. - - Thirdly, prescribe regimens for the good of the crew according to your ability and your judgment. Give no deadly medicine to any one if asked, nor suggest any such counsel. - - In addition, do not intervene in situations you are not knowledgeable in, even for patients in whom the harm is visible; leave this operation to be performed by specialists. - - Finally, all that you may discover in your daily commerce with the crew, if it is not already known, keep secret and never reveal. - - type: CombatMode - combatToggleAction: - enabled: false - autoPopulate: false - name: action-name-combat - - type: FabricateCandy diff --git a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Borgs/borgs_tools.yml b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Borgs/borgs_tools.yml index ebe59a59ac4..154ce53c128 100644 --- a/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Borgs/borgs_tools.yml +++ b/Resources/Prototypes/_Nyano/Entities/Objects/Specific/Borgs/borgs_tools.yml @@ -143,44 +143,6 @@ - type: Stack unlimited: true -- type: entity - parent: BaseItem - id: BorgToolStandard - name: borg tool - description: Alternates between prying and anchoring. - components: - - type: Sprite - sprite: Objects/Tools/omnitool.rsi - state: omnitool-screwing - - type: Item - sprite: Objects/Tools/omnitool.rsi - size: 20 - - type: TilePrying - - type: Tool - useSound: !type:SoundPathSpecifier - path: /Audio/Items/jaws_pry.ogg - qualities: - - Prying - - type: MultipleTool - statusShowBehavior: true - entries: - - behavior: Prying - sprite: - sprite: Objects/Tools/omnitool.rsi - state: omnitool-prying - useSound: - path: /Audio/Items/jaws_pry.ogg - changeSound: - path: /Audio/Items/change_drill.ogg - - behavior: Anchoring - sprite: - sprite: Objects/Tools/omnitool.rsi - state: omnitool-wrenching - useSound: - path: /Audio/Items/ratchet.ogg - changeSound: - path: /Audio/Items/change_drill.ogg - - type: entity parent: ClothingHeadsetCommand id: ClothingHeadsetBorg diff --git a/Resources/Prototypes/_Nyano/Markers/Spawners/jobs.yml b/Resources/Prototypes/_Nyano/Markers/Spawners/jobs.yml index e23da627f44..c5ac6a95068 100644 --- a/Resources/Prototypes/_Nyano/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/_Nyano/Markers/Spawners/jobs.yml @@ -34,18 +34,6 @@ - state: green - state: roboticist -- type: entity - id: SpawnPointMedicalCyborg - parent: SpawnPointJobBase - name: medical cyborg - components: - - type: SpawnPoint - job_id: MedicalCyborg - - type: Sprite - layers: - - state: green - - state: roboticist - - type: entity id: SpawnPointPrisoner parent: SpawnPointJobBase diff --git a/Resources/Prototypes/_Nyano/Roles/Jobs/Medical/medical_cyborg.yml b/Resources/Prototypes/_Nyano/Roles/Jobs/Medical/medical_cyborg.yml deleted file mode 100644 index fc5b6026b97..00000000000 --- a/Resources/Prototypes/_Nyano/Roles/Jobs/Medical/medical_cyborg.yml +++ /dev/null @@ -1,10 +0,0 @@ -# - type: job - # id: MedicalCyborg - # name: job-name-medical-cyborg - # description: job-description-cyborg - # icon: "Unknown" - # supervisors: "all crew" - # playTimeTracker: JobCyborg - # canBeAntag: false - # jobEntity: PlayerCyborgMedical - # startingGear: CyborgGear # for char preview only From 1641257087a147e70f1afb764e5517e1353eab2c Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 23:47:26 +0300 Subject: [PATCH 7/8] Removed --- Resources/Maps/Shuttles/helix.yml | 7 ------- Resources/Maps/Shuttles/pulse.yml | 7 ------- 2 files changed, 14 deletions(-) diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml index 87b0de93cc5..f19190dbc08 100644 --- a/Resources/Maps/Shuttles/helix.yml +++ b/Resources/Maps/Shuttles/helix.yml @@ -2775,13 +2775,6 @@ entities: - pos: -0.5,7.5 parent: 1 type: Transform -#- proto: SpawnPointMedicalCyborg -# entities: -# - uid: 401 -# components: -# - pos: 7.5,6.5 -# parent: 1 -# type: Transform - proto: SpawnPointMedicalDoctor entities: - uid: 402 diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml index 446ff2e4a3c..a19a56bcfd9 100644 --- a/Resources/Maps/Shuttles/pulse.yml +++ b/Resources/Maps/Shuttles/pulse.yml @@ -1085,13 +1085,6 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform -#- proto: SpawnPointMedicalCyborg -# entities: -# - uid: 139 -# components: -# - pos: 0.5,0.5 -# parent: 1 -# type: Transform - proto: SpawnPointParamedic entities: - uid: 140 From b9f733883ee7902c1104e6b3d5e119a481cb578f Mon Sep 17 00:00:00 2001 From: Dvir Date: Fri, 18 Aug 2023 23:54:53 +0300 Subject: [PATCH 8/8] Need to be removed via map editor --- Resources/Maps/Shuttles/helix.yml | 7 +++++++ Resources/Maps/Shuttles/pulse.yml | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/Resources/Maps/Shuttles/helix.yml b/Resources/Maps/Shuttles/helix.yml index f19190dbc08..bec559526fd 100644 --- a/Resources/Maps/Shuttles/helix.yml +++ b/Resources/Maps/Shuttles/helix.yml @@ -2775,6 +2775,13 @@ entities: - pos: -0.5,7.5 parent: 1 type: Transform +- proto: SpawnPointMedicalCyborg + entities: + - uid: 401 + components: + - pos: 7.5,6.5 + parent: 1 + type: Transform - proto: SpawnPointMedicalDoctor entities: - uid: 402 diff --git a/Resources/Maps/Shuttles/pulse.yml b/Resources/Maps/Shuttles/pulse.yml index a19a56bcfd9..969a021559e 100644 --- a/Resources/Maps/Shuttles/pulse.yml +++ b/Resources/Maps/Shuttles/pulse.yml @@ -1085,6 +1085,13 @@ entities: - pos: -0.5,2.5 parent: 1 type: Transform +- proto: SpawnPointMedicalCyborg + entities: + - uid: 139 + components: + - pos: 0.5,0.5 + parent: 1 + type: Transform - proto: SpawnPointParamedic entities: - uid: 140