diff --git a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl index b620fdff8c..6d952aea5b 100644 --- a/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl +++ b/Resources/Locale/en-US/kitchen/components/kitchen-spike-component.ftl @@ -1,8 +1,8 @@ -comp-kitchen-spike-begin-hook-self = You begin dragging yourself onto { THE($hook) }! +comp-kitchen-spike-begin-hook-self = You begin dragging yourself onto { THE($hook) }! comp-kitchen-spike-begin-hook-self-other = { CAPITALIZE(THE($victim)) } begins dragging { REFLEXIVE($victim) } onto { THE($hook) }! comp-kitchen-spike-begin-hook-other-self = You begin dragging { CAPITALIZE(THE($victim)) } onto { THE($hook) }! -comp-kitchen-spike-begin-hook-other = { CAPITALIZE(THE($user)) } begins dragging { CAPITALIZE(THE($victim)) } onto { THE($hook) }!a +comp-kitchen-spike-begin-hook-other = { CAPITALIZE(THE($user)) } begins dragging { CAPITALIZE(THE($victim)) } onto { THE($hook) }! comp-kitchen-spike-hook-self = You threw yourself on { THE($hook) }! comp-kitchen-spike-hook-self-other = { CAPITALIZE(THE($victim)) } threw { REFLEXIVE($victim) } on { THE($hook) }! diff --git a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml index cb9b19fffc..e34b295879 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/vulpkanin.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity abstract: true save: false parent: [BaseMobSpeciesOrganic] @@ -172,9 +172,7 @@ - type: entity parent: [BaseSpeciesDummy] id: MobVulpkaninDummy - name: Vulpkanin Dummy categories: [ HideSpawnMenu ] - description: A dummy Vulpkanin meant to be used in character setup. components: - type: HumanoidAppearance species: Vulpkanin diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml index 7f96d07850..cc343d900b 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/frozen.yml @@ -1,4 +1,4 @@ -# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml +# When adding new food also add to random spawner located in Resources\Prototypes\Entities\Markers\Spawners\Random\Food_Drinks\food_snack.yml # Base - type: entity @@ -63,7 +63,7 @@ - type: entity parent: FoodFrozenBase id: FoodFrozenCornuto - name: strawberry ice-cream sandwich + name: cornuto description: A Neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts. components: - type: Item diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index edc0040512..8dc7e2dde4 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity id: BaseBorgModule parent: BaseItem name: borg module @@ -1273,7 +1273,7 @@ - type: entity parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ] id: BorgModuleC20r - name: C20-r ROW cyborg module + name: C-20r ROW cyborg module description: A weapons module that comes with a burst-fire C-20r. components: - type: Sprite diff --git a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml index 5f80b94250..c467f5297d 100644 --- a/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Doors/Airlocks/shuttle.yml @@ -1,4 +1,4 @@ -- type: entity +- type: entity parent: AirlockRCDResistant id: AirlockShuttle suffix: Docking @@ -63,9 +63,7 @@ - type: entity id: AirlockGlassShuttle parent: AirlockShuttle - name: external airlock suffix: Glass, Docking - description: Necessary for connecting two space craft together. components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi @@ -101,9 +99,6 @@ - type: entity id: AirlockGlassShuttleSyndicate parent: AirlockGlassShuttle - name: external airlock - suffix: Glass, Docking - description: Necessary for connecting two space craft together. components: - type: Sprite sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi @@ -111,9 +106,6 @@ - type: entity parent: AirlockShuttle id: AirlockShuttleSyndicate - suffix: Docking - name: external airlock - description: Necessary for connecting two space craft together. components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi @@ -121,9 +113,6 @@ - type: entity parent: AirlockShuttle id: AirlockShuttleXenoborg - suffix: Docking - name: external airlock - description: Necessary for connecting two space craft together. components: - type: Sprite sprite: Structures/Doors/Airlocks/Standard/shuttle_xenoborg.rsi diff --git a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml index efcfb7e1ed..9e0d2af603 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/vending_machines.yml @@ -1,4 +1,4 @@ -# base +# base - type: entity id: VendingMachine @@ -949,13 +949,11 @@ parent: VendingMachineMedicalBase id: VendingMachineMedical name: NanoMed Plus - description: It's a medical drug dispenser. Natural chemicals only! components: - type: VendingMachine pack: NanoMedPlusInventory offState: off - type: Sprite - sprite: Structures/Machines/VendingMachines/medical.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] @@ -2265,7 +2263,7 @@ parent: VendingMachineWallmount id: VendingMachineWallMedicalCivilian name: NanoMed band-aid - description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!" + description: It's a wall-mounted medical equipment dispenser. Natural chemicals only! components: - type: VendingMachine pack: NanoMedCivilianWallInventory @@ -2295,13 +2293,11 @@ parent: VendingMachineWallMedicalCivilian id: VendingMachineWallMedical name: NanoMed - description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!" components: - type: VendingMachine pack: NanoMedInventory offState: off - type: Sprite - sprite: Structures/Machines/VendingMachines/wallmed.rsi layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"]