diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml index 3aff2ba7298..cb50d9b3de7 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_engines.yml @@ -1,8 +1,8 @@ - type: cargoProduct id: EngineAmeShielding icon: - sprite: Objects/Power/AME/ame_part.rsi - state: box + sprite: Objects/Power/AME/ame_jar.rsi + state: jar product: CrateEngineeringAMEShielding cost: 10000 category: Engineering diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml index 520b528a5df..9bcb9633522 100644 --- a/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/Catalog/Fills/Lockers/medical.yml @@ -144,5 +144,5 @@ - id: ClothingHandsGlovesLatex # - id: ClothingHeadsetMedical # Frontier - id: ClothingMaskSterile - - id: ClothingBeltParamedicFilled # Frontier + - id: ClothingBeltMedicalEMTFilled # Frontier - id: MedkitFilled # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml index 4ca8e1d9afc..a130a49a478 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Projectiles/projectiles.yml @@ -1091,4 +1091,3 @@ Heat: 20 # Slightly more damage than the 17heat from the Captain's Hitscan lasgun soundHit: collection: MeatLaserImpact - soundForce: true diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index e10c2d1ad43..c77665bfed4 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -270,7 +270,6 @@ - AnomalyLocatorWide - RCD - RCDAmmo - - HandheldCrewMonitor - Scalpel - Retractor - Cautery @@ -285,7 +284,6 @@ - Implanter - PillCanister - ChemistryEmptyBottle01 - - Drone - AdvancedCapacitorStockPart - AdvancedMatterBinStockPart - NanoManipulatorStockPart diff --git a/Resources/Prototypes/Tiles/planet.yml b/Resources/Prototypes/Tiles/planet.yml index 560e98066e3..c2c366c8012 100644 --- a/Resources/Prototypes/Tiles/planet.yml +++ b/Resources/Prototypes/Tiles/planet.yml @@ -118,7 +118,6 @@ West: /Textures/Tiles/Planet/Snow/snow_double_edge_west.png baseTurf: FloorDirt itemDrop: FloorTileItemSnow # Delta V - canCrowbar: false # Come back canShovel: true # Delta V isSubfloor: true footstepSounds: diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml index 138e53a3327..aaa217a6e37 100644 --- a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml +++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/medical.yml @@ -15,7 +15,7 @@ - id: ClothingHandsGlovesLatex # - id: ClothingHeadsetMedical # Frontier - id: ClothingMaskSterile - - id: ClothingBeltParamedicFilled # Frontier + - id: ClothingBeltMedicalEMTFilled # Frontier - id: MedkitFilled # Frontier - id: NitrogenTankFilled # Frontier - id: OxygenTankFilled # Frontier diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml index 9387e67f5a0..68f30ba047f 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml @@ -7,3 +7,31 @@ Silver: 750 Plasma: 1500 Uranium: 150 + +- type: latheRecipe + id: WeaponCrusher + result: WeaponCrusher + completetime: 5 + materials: + Steel: 1000 + Glass: 250 + Plastic: 100 + +- type: latheRecipe + id: WeaponCrusherDagger + result: WeaponCrusherDagger + completetime: 5 + materials: + Steel: 500 + Glass: 250 + Plastic: 50 + +- type: latheRecipe + id: WeaponCrusherGlaive + result: WeaponCrusherGlaive + completetime: 5 + materials: + Steel: 1500 + Glass: 500 + Plastic: 50 + Gold: 100 diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index b0b582391e8..20ad3a2e53c 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -57,3 +57,9 @@ - type: Tag id: SecurityUplink + +- type: Tag + id: DroneUsable + +- type: Tag + id: LightReplacer \ No newline at end of file