diff --git a/Resources/Prototypes/Access/medical.yml b/Resources/Prototypes/Access/medical.yml index e2f41790dad..89bef3e516a 100644 --- a/Resources/Prototypes/Access/medical.yml +++ b/Resources/Prototypes/Access/medical.yml @@ -9,7 +9,7 @@ - type: accessLevel id: Chemistry name: id-card-access-level-chemistry - + - type: accessLevel id: Paramedic name: id-card-access-level-paramedic diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml index d4d253b58f9..0792bf14874 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_vending.yml @@ -82,7 +82,7 @@ sprite: Objects/Specific/Service/vending_machine_restock.rsi state: base product: CrateVendingMachineRestockChemVendFilled - cost: 6800 + cost: 6800 #Delta V - was 3820, see rebase PR #53 category: Medical group: market diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml index acac10f020c..a618a042d18 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chemvend.yml @@ -2,6 +2,7 @@ id: ChemVendInventory startingInventory: Jug: 4 +## Delta V - begin change of 2 -> 4, see rebase PR #53 JugAluminium: 4 JugCarbon: 4 JugChlorine: 4 @@ -22,9 +23,10 @@ JugSodium: 4 JugSugar: 4 JugSulfur: 4 +## Delta V - end change of 2 -> 4 emaggedInventory: - ToxinChemistryBottle: 6 + ToxinChemistryBottle: 6 # Delta V - changed from 1 -> 6 # DeltaV - Added other chems from emagging chem dispenser EpinephrineChemistryBottle: 6 NapalmChemistryBottle: 6 - UltravasculineChemistryBottle: 6 \ No newline at end of file + UltravasculineChemistryBottle: 6 diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 92d2d50b0fa..80b2dbede78 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -28,4 +28,4 @@ - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - - id: Portafib # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml + - id: Portafib diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml index e376b68a9cf..040c4173e33 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml @@ -8,4 +8,4 @@ - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - - id: Portafib # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml + - id: Portafib diff --git a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml index 09f348c6fad..6ecfac9866b 100644 --- a/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml +++ b/Resources/Prototypes/DeltaV/Catalog/Fills/Backpacks/StarterGear/satchel.yml @@ -8,4 +8,4 @@ - id: BoxSurvivalMedical - id: EmergencyRollerBedSpawnFolded - id: BodyBag_Folded - - id: Portafib # DeltaV - Add Portafibs, see Prototypes/DeltaV/Entities/Objects/Devices/Medical/portafib.yml + - id: Portafib diff --git a/Resources/Textures/DeltaV/Objects/Medical/portafib.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Medical/portafib.rsi/meta.json index a58b535b2d7..be1ad557025 100644 --- a/Resources/Textures/DeltaV/Objects/Medical/portafib.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Medical/portafib.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC0-1.0", - "copyright": "Created by rosieposieee (github) for Space Staiton 14 inspired by and as a reskin of assets for defib by EmoGarbage404 (github)", + "copyright": "Created by rosieposieee (github) for Space Station 14 inspired by and as a reskin of assets for defib by EmoGarbage404 (github)", "size": { "x": 32, "y": 32 @@ -25,4 +25,4 @@ "name": "screen" } ] -} \ No newline at end of file +}