bunch of small cleanups (#40529)
* bunch of cleanups and fixes * AND REMOVE THIS
This commit is contained in:
@@ -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-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-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 = You threw yourself on { THE($hook) }!
|
||||||
comp-kitchen-spike-hook-self-other = { CAPITALIZE(THE($victim)) } threw { REFLEXIVE($victim) } on { THE($hook) }!
|
comp-kitchen-spike-hook-self-other = { CAPITALIZE(THE($victim)) } threw { REFLEXIVE($victim) } on { THE($hook) }!
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
abstract: true
|
abstract: true
|
||||||
save: false
|
save: false
|
||||||
parent: [BaseMobSpeciesOrganic]
|
parent: [BaseMobSpeciesOrganic]
|
||||||
@@ -172,9 +172,7 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: [BaseSpeciesDummy]
|
parent: [BaseSpeciesDummy]
|
||||||
id: MobVulpkaninDummy
|
id: MobVulpkaninDummy
|
||||||
name: Vulpkanin Dummy
|
|
||||||
categories: [ HideSpawnMenu ]
|
categories: [ HideSpawnMenu ]
|
||||||
description: A dummy Vulpkanin meant to be used in character setup.
|
|
||||||
components:
|
components:
|
||||||
- type: HumanoidAppearance
|
- type: HumanoidAppearance
|
||||||
species: Vulpkanin
|
species: Vulpkanin
|
||||||
|
|||||||
@@ -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
|
# Base
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
@@ -63,7 +63,7 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: FoodFrozenBase
|
parent: FoodFrozenBase
|
||||||
id: FoodFrozenCornuto
|
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.
|
description: A Neapolitan vanilla and chocolate ice-cream cone. It menaces with a sprinkling of caramelized nuts.
|
||||||
components:
|
components:
|
||||||
- type: Item
|
- type: Item
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
id: BaseBorgModule
|
id: BaseBorgModule
|
||||||
parent: BaseItem
|
parent: BaseItem
|
||||||
name: borg module
|
name: borg module
|
||||||
@@ -1273,7 +1273,7 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
|
parent: [ BaseBorgModuleSyndicateAssault, BaseProviderBorgModule, BaseSyndicateContraband ]
|
||||||
id: BorgModuleC20r
|
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.
|
description: A weapons module that comes with a burst-fire C-20r.
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: AirlockRCDResistant
|
parent: AirlockRCDResistant
|
||||||
id: AirlockShuttle
|
id: AirlockShuttle
|
||||||
suffix: Docking
|
suffix: Docking
|
||||||
@@ -63,9 +63,7 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
id: AirlockGlassShuttle
|
id: AirlockGlassShuttle
|
||||||
parent: AirlockShuttle
|
parent: AirlockShuttle
|
||||||
name: external airlock
|
|
||||||
suffix: Glass, Docking
|
suffix: Glass, Docking
|
||||||
description: Necessary for connecting two space craft together.
|
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
|
sprite: Structures/Doors/Airlocks/Glass/shuttle.rsi
|
||||||
@@ -101,9 +99,6 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
id: AirlockGlassShuttleSyndicate
|
id: AirlockGlassShuttleSyndicate
|
||||||
parent: AirlockGlassShuttle
|
parent: AirlockGlassShuttle
|
||||||
name: external airlock
|
|
||||||
suffix: Glass, Docking
|
|
||||||
description: Necessary for connecting two space craft together.
|
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
|
sprite: Structures/Doors/Airlocks/Glass/shuttle_syndicate.rsi
|
||||||
@@ -111,9 +106,6 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: AirlockShuttle
|
parent: AirlockShuttle
|
||||||
id: AirlockShuttleSyndicate
|
id: AirlockShuttleSyndicate
|
||||||
suffix: Docking
|
|
||||||
name: external airlock
|
|
||||||
description: Necessary for connecting two space craft together.
|
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi
|
sprite: Structures/Doors/Airlocks/Standard/shuttle_syndicate.rsi
|
||||||
@@ -121,9 +113,6 @@
|
|||||||
- type: entity
|
- type: entity
|
||||||
parent: AirlockShuttle
|
parent: AirlockShuttle
|
||||||
id: AirlockShuttleXenoborg
|
id: AirlockShuttleXenoborg
|
||||||
suffix: Docking
|
|
||||||
name: external airlock
|
|
||||||
description: Necessary for connecting two space craft together.
|
|
||||||
components:
|
components:
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Doors/Airlocks/Standard/shuttle_xenoborg.rsi
|
sprite: Structures/Doors/Airlocks/Standard/shuttle_xenoborg.rsi
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
# base
|
# base
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
id: VendingMachine
|
id: VendingMachine
|
||||||
@@ -949,13 +949,11 @@
|
|||||||
parent: VendingMachineMedicalBase
|
parent: VendingMachineMedicalBase
|
||||||
id: VendingMachineMedical
|
id: VendingMachineMedical
|
||||||
name: NanoMed Plus
|
name: NanoMed Plus
|
||||||
description: It's a medical drug dispenser. Natural chemicals only!
|
|
||||||
components:
|
components:
|
||||||
- type: VendingMachine
|
- type: VendingMachine
|
||||||
pack: NanoMedPlusInventory
|
pack: NanoMedPlusInventory
|
||||||
offState: off
|
offState: off
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Machines/VendingMachines/medical.rsi
|
|
||||||
layers:
|
layers:
|
||||||
- state: "off"
|
- state: "off"
|
||||||
map: ["enum.VendingMachineVisualLayers.Base"]
|
map: ["enum.VendingMachineVisualLayers.Base"]
|
||||||
@@ -2265,7 +2263,7 @@
|
|||||||
parent: VendingMachineWallmount
|
parent: VendingMachineWallmount
|
||||||
id: VendingMachineWallMedicalCivilian
|
id: VendingMachineWallMedicalCivilian
|
||||||
name: NanoMed band-aid
|
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:
|
components:
|
||||||
- type: VendingMachine
|
- type: VendingMachine
|
||||||
pack: NanoMedCivilianWallInventory
|
pack: NanoMedCivilianWallInventory
|
||||||
@@ -2295,13 +2293,11 @@
|
|||||||
parent: VendingMachineWallMedicalCivilian
|
parent: VendingMachineWallMedicalCivilian
|
||||||
id: VendingMachineWallMedical
|
id: VendingMachineWallMedical
|
||||||
name: NanoMed
|
name: NanoMed
|
||||||
description: "It's a wall-mounted medical equipment dispenser. Natural chemicals only!"
|
|
||||||
components:
|
components:
|
||||||
- type: VendingMachine
|
- type: VendingMachine
|
||||||
pack: NanoMedInventory
|
pack: NanoMedInventory
|
||||||
offState: off
|
offState: off
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Machines/VendingMachines/wallmed.rsi
|
|
||||||
layers:
|
layers:
|
||||||
- state: "off"
|
- state: "off"
|
||||||
map: ["enum.VendingMachineVisualLayers.Base"]
|
map: ["enum.VendingMachineVisualLayers.Base"]
|
||||||
|
|||||||
Reference in New Issue
Block a user