Fix the game (#3384)

Cleanup some old PRs and make the world green again

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
This commit is contained in:
metalgearsloth
2021-02-23 19:23:51 +11:00
committed by GitHub
parent 1e13c3b265
commit 55456253f0
7 changed files with 41 additions and 41 deletions

View File

@@ -19,7 +19,6 @@ namespace Content.Client
"EmitSoundOnUse", "EmitSoundOnUse",
"FootstepModifier", "FootstepModifier",
"HeatResistance", "HeatResistance",
"Teleportable",
"ItemTeleporter", "ItemTeleporter",
"EntityStorage", "EntityStorage",
"Wirecutter", "Wirecutter",
@@ -60,7 +59,6 @@ namespace Content.Client
"Rotatable", "Rotatable",
"MagicMirror", "MagicMirror",
"FloorTile", "FloorTile",
"FootstepSound",
"ShuttleController", "ShuttleController",
"HumanInventoryController", "HumanInventoryController",
"UseDelay", "UseDelay",

View File

@@ -4,7 +4,7 @@
description: A vending machine containing nutritional substances for plants and botanical tools. description: A vending machine containing nutritional substances for plants and botanical tools.
spriteName: nutri spriteName: nutri
startingInventory: startingInventory:
Spade: 3 HydroponicsToolSpade: 3
PlantBGoneSpray: 20 PlantBGoneSpray: 20
WeedSpray: 20 WeedSpray: 20
PestSpray: 20 PestSpray: 20

View File

@@ -19,15 +19,15 @@
state: Assistant state: Assistant
# Quartermaster # Quartermaster
- type: entity #- type: entity
id: SpawnPointQuartermaster # id: SpawnPointQuartermaster
parent: SpawnPointJobBase # parent: SpawnPointJobBase
name: spawn point (quartermaster) # name: spawn point (quartermaster)
components: # components:
- type: SpawnPoint # - type: SpawnPoint
job_id: Quartermaster # job_id: Quartermaster
- type: Sprite # - type: Sprite
state: Quartermaster # state: Quartermaster
# Cargo tech # Cargo tech
- type: entity - type: entity

View File

@@ -122,20 +122,20 @@
# - type: Icon # - type: Icon
# state: pda-chaplain # state: pda-chaplain
- type: entity #- type: entity
name: Quartermaster PDA # name: Quartermaster PDA
parent: BasePDA # parent: BasePDA
id: QuartermasterPDA # id: QuartermasterPDA
description: PDA for the guy that orders the guns. # description: PDA for the guy that orders the guns.
components: # components:
- type: PDA # - type: PDA
idCard: QuartermasterIDCard # idCard: QuartermasterIDCard
- type: Appearance # - type: Appearance
visuals: # visuals:
- type: PDAVisualizer # - type: PDAVisualizer
state: pda-qm # state: pda-qm
- type: Icon # - type: Icon
state: pda-qm # state: pda-qm
- type: entity - type: entity
name: Cargo PDA name: Cargo PDA

View File

@@ -103,17 +103,17 @@
- type: PresetIdCard - type: PresetIdCard
job: CargoTechnician job: CargoTechnician
- type: entity #- type: entity
parent: IDCardStandard # parent: IDCardStandard
id: QuartermasterIDCard # id: QuartermasterIDCard
name: quartermaster ID card # name: quartermaster ID card
components: # components:
- type: Sprite # - type: Sprite
layers: # layers:
- state: default # - state: default
- state: idquartermaster # - state: idquartermaster
- type: PresetIdCard # - type: PresetIdCard
job: Quartermaster # job: Quartermaster
- type: entity - type: entity
parent: IDCardStandard parent: IDCardStandard

View File

@@ -8,7 +8,9 @@
- type: Sprite - type: Sprite
state: produce state: produce
- type: Produce - type: Produce
- type: Grindable - type: Tag
tags:
- Grindable
- type: entity - type: entity
name: wheat name: wheat

View File

@@ -9,7 +9,7 @@
- type: Tag - type: Tag
id: FirelockElectronics id: FirelockElectronics
- type: Tag - type: Tag
id: FootstepSound id: FootstepSound
@@ -27,8 +27,8 @@
- type: Tag - type: Tag
id: Shovel id: Shovel
- type: Tag - type: Tag
id: Teleportable id: Teleportable
- type: Tag - type: Tag