diff --git a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml index 31e5f99752..bab5a79728 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml @@ -5,7 +5,6 @@ description: A hand-held mass scanner. components: - type: Item - size: Normal sprite: Objects/Tools/handheld_mass_scanner.rsi - type: Sprite sprite: Objects/Tools/handheld_mass_scanner.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml index 3058721072..84a66d1836 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/knife.yml @@ -114,7 +114,7 @@ - type: entity name: survival knife - parent: [CombatKnife, BaseSecurityCargoContraband] + parent: [BaseSecurityCargoContraband, CombatKnife] id: SurvivalKnife description: Weapon of first and last resort for combatting space carp. components: @@ -129,7 +129,7 @@ - type: entity name: kukri knife - parent: [CombatKnife, BaseSecurityCargoContraband] + parent: [BaseSecurityCargoContraband, CombatKnife] id: KukriKnife description: Professionals have standards. Be polite. Be efficient. Have a plan to kill everyone you meet. components: