tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename toolboxes to make more sense.

Browse Source 
Also adds filled version of emergency toolboxes, currently empty.
This commit is contained in:
Pieter-Jan Briers
2020-05-22 17:48:35 +02:00
parent c711bd8322
commit a8e2900052
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Content.IntegrationTests/Tests/HumanInventoryUniformSlotsTest.cs
View File

@@ -40,7 +40,7 @@ namespace Content.IntegrationTests.Tests
uniform = entityMan.SpawnEntity("JanitorUniform", MapCoordinates.Nullspace); uniform = entityMan.SpawnEntity("JanitorUniform", MapCoordinates.Nullspace);
idCard = entityMan.SpawnEntity("AssistantIDCard", MapCoordinates.Nullspace); idCard = entityMan.SpawnEntity("AssistantIDCard", MapCoordinates.Nullspace);
pocketItem = entityMan.SpawnEntity("FlashlightLantern", MapCoordinates.Nullspace); pocketItem = entityMan.SpawnEntity("FlashlightLantern", MapCoordinates.Nullspace);
var tooBigItem = entityMan.SpawnEntity("RedToolboxItem", MapCoordinates.Nullspace); var tooBigItem = entityMan.SpawnEntity("ToolboxEmergency", MapCoordinates.Nullspace);
inventory = human.GetComponent<InventoryComponent>(); inventory = human.GetComponent<InventoryComponent>();

4
Resources/Maps/stationstation.yml
View File

@@ -1976,7 +1976,7 @@ entities:
rot: -1.5707963267949 rad rot: -1.5707963267949 rad
type: Transform type: Transform
- uid: 253 - uid: 253
type: YellowToolboxItemFilled type: ToolboxElectricalFilled
components: components:
- parent: 0 - parent: 0
pos: -0.8099712,-5.21454 pos: -0.8099712,-5.21454
@@ -1988,7 +1988,7 @@ entities:
type: Robust.Server.GameObjects.Components.Container.Container type: Robust.Server.GameObjects.Components.Container.Container
type: ContainerContainer type: ContainerContainer
- uid: 254 - uid: 254
type: YellowToolboxItemFilled type: ToolboxElectricalFilled
components: components:
- parent: 0 - parent: 0
pos: -0.5597038,-5.679647 pos: -0.5597038,-5.679647

13
Resources/Prototypes/Entities/Items/toolbox.yml
View File

@@ -14,7 +14,7 @@
- type: entity - type: entity
name: Emergency Toolbox name: Emergency Toolbox
parent: ToolboxBase parent: ToolboxBase
id: RedToolboxItem id: ToolboxEmergency
description: A bright red toolbox, stocked with emergency tools description: A bright red toolbox, stocked with emergency tools
components: components:
- type: Sprite - type: Sprite
@@ -23,6 +23,11 @@
- type: Icon - type: Icon
texture: Objects/Tools/toolbox_r.png texture: Objects/Tools/toolbox_r.png
- type: entity
id: ToolboxEmergencyFilled
parent: ToolboxEmergency
suffix: Filled
- type: entity - type: entity
name: Mechanical Toolbox name: Mechanical Toolbox
parent: ToolboxBase parent: ToolboxBase
@@ -37,7 +42,7 @@
- type: entity - type: entity
name: Electrical Toolbox name: Electrical Toolbox
parent: ToolboxBase parent: ToolboxBase
id: YellowToolboxItem id: ToolboxElectrical
description: A toolbox typically stocked with electrical gear description: A toolbox typically stocked with electrical gear
components: components:
- type: Sprite - type: Sprite
@@ -46,9 +51,9 @@
texture: Objects/Tools/Toolbox_y.png texture: Objects/Tools/Toolbox_y.png
- type: entity - type: entity
id: YellowToolboxItemFilled id: ToolboxElectricalFilled
name: Electrical Toolbox name: Electrical Toolbox
suffix: Filled suffix: Filled
parent: YellowToolboxItem parent: ToolboxElectrical
components: components:
- type: ToolboxElectricalFill - type: ToolboxElectricalFill