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",
"FootstepModifier",
"HeatResistance",
"Teleportable",
"ItemTeleporter",
"EntityStorage",
"Wirecutter",
@@ -60,7 +59,6 @@ namespace Content.Client
"Rotatable",
"MagicMirror",
"FloorTile",
"FootstepSound",
"ShuttleController",
"HumanInventoryController",
"UseDelay",

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -28,7 +28,7 @@
- type: Tag
id: Shovel
- type: Tag
- type: Tag
id: Teleportable
- type: Tag