more component ref removal + combining server/client comps (#13178)

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
This commit is contained in:
Nemanja
2022-12-24 23:28:21 -05:00
committed by GitHub
parent fddcc0cece
commit faca40b8d5
78 changed files with 504 additions and 643 deletions

View File

@@ -216,7 +216,6 @@
# trash: FoodPlateSmall
- type: Stack
stackType: Pancake
max: 9
count: 1
- type: Sprite
state: pancakes1
@@ -249,7 +248,6 @@
# trash: FoodPlateSmall
- type: Stack
stackType: Pancake
max: 3
count: 1
- type: Sprite
state: pancakesbb1
@@ -276,7 +274,6 @@
# trash: FoodPlateSmall
- type: Stack
stackType: Pancake
max: 3
count: 1
- type: Sprite
state: pancakescc1

View File

@@ -48,7 +48,6 @@
components:
- type: Stack
stackType: PaperRolling
max: 5
count: 5
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi
@@ -80,7 +79,6 @@
components:
- type: Stack
stackType: CigaretteFilter
max: 5
count: 5
- type: Sprite
sprite: Objects/Consumable/Smokeables/Cigarettes/paper.rsi

View File

@@ -793,7 +793,7 @@
brokenState: broken
normalState: normal-unshaded
ejectState: eject-unshaded
ejectdelay: 1.8
ejectDelay: 1.8
- type: Advertise
pack: GoodCleanFunAds
- type: Sprite

View File

@@ -4,7 +4,7 @@
id: Pancake
name: pancake
spawn: FoodBakedPancake
maxCount: 30
maxCount: 3
# Food Containers
@@ -22,14 +22,14 @@
name: rolling paper
icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigpaper }
spawn: PaperRolling
maxCount: 30
maxCount: 5
- type: stack
id: CigaretteFilter
name: cigarette filter
icon: { sprite: /Textures/Objects/Consumable/Smokeables/Cigarettes/paper.rsi, state: cigfilter }
spawn: CigaretteFilter
maxCount: 30
maxCount: 5
- type: stack
id: GroundTobacco