Adds pullable component to multiple entities. (#1501)

* First Commit

* Hello

* Mop Bucket
This commit is contained in:
Swept
2020-07-28 06:46:13 +00:00
committed by GitHub
parent c579187673
commit fe3637c1b0
11 changed files with 29 additions and 24 deletions

View File

@@ -14,6 +14,8 @@
state: stool_base state: stool_base
- type: Strap - type: Strap
position: Stand position: Stand
- type: Anchorable
- type: Pullable
- type: entity - type: entity
name: bar stool name: bar stool
@@ -42,6 +44,8 @@
state: officechair_white state: officechair_white
- type: Strap - type: Strap
position: Stand position: Stand
- type: Anchorable
- type: Pullable
- type: entity - type: entity
name: dark office chair name: dark office chair
@@ -59,6 +63,8 @@
state: officechair_dark state: officechair_dark
- type: Strap - type: Strap
position: Stand position: Stand
- type: Anchorable
- type: Pullable
- type: entity - type: entity
name: chair name: chair
@@ -76,6 +82,8 @@
state: chair state: chair
- type: Strap - type: Strap
position: Stand position: Stand
- type: Anchorable
- type: Pullable
- type: entity - type: entity
name: wooden chair name: wooden chair
@@ -87,6 +95,8 @@
color: "white" color: "white"
- type: Icon - type: Icon
state: wooden_chair state: wooden_chair
- type: Anchorable
- type: Pullable
- type: entity - type: entity
name: bed name: bed

View File

@@ -7,11 +7,10 @@
- type: Collidable - type: Collidable
- type: Sprite - type: Sprite
sprite: Constructible/Misc/potted_plants.rsi sprite: Constructible/Misc/potted_plants.rsi
- type: Icon - type: Icon
sprite: Constructible/Misc/potted_plants.rsi sprite: Constructible/Misc/potted_plants.rsi
- type: PottedPlantHide - type: PottedPlantHide
- type: Pullable
- type: entity - type: entity
id: PottedPlantRandom id: PottedPlantRandom

View File

@@ -13,7 +13,6 @@
- state: invaders - state: invaders
shader: unshaded shader: unshaded
map: ["enum.ComputerVisualizer+Layers.Screen"] map: ["enum.ComputerVisualizer+Layers.Screen"]
- type: Appearance - type: Appearance
visuals: visuals:
- type: ComputerVisualizer - type: ComputerVisualizer
@@ -21,3 +20,5 @@
key: "" key: ""
body: arcade body: arcade
bodyBroken: arcade bodyBroken: arcade
- type: Anchorable
- type: Pullable

View File

@@ -10,7 +10,9 @@
texture: Constructible/Power/dispensers.rsi/booze_dispenser.png texture: Constructible/Power/dispensers.rsi/booze_dispenser.png
- type: ReagentDispenser - type: ReagentDispenser
pack: BoozeDispenserInventory pack: BoozeDispenserInventory
- type: Anchorable
- type: Pullable
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: BoozeDispenserInventory id: BoozeDispenserInventory
inventory: inventory:

View File

@@ -11,7 +11,9 @@
- type: ReagentDispenser - type: ReagentDispenser
pack: ChemDispenserStandardInventory pack: ChemDispenserStandardInventory
- type: PowerReceiver - type: PowerReceiver
- type: Anchorable
- type: Pullable
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: ChemDispenserStandardInventory id: ChemDispenserStandardInventory
inventory: inventory:

View File

@@ -31,3 +31,4 @@
interfaces: interfaces:
- key: enum.ChemMasterUiKey.Key - key: enum.ChemMasterUiKey.Key
type: ChemMasterBoundUserInterface type: ChemMasterBoundUserInterface
- type: Pullable

View File

@@ -10,7 +10,6 @@
texture: Constructible/Power/dispensers.rsi/soda_dispenser.png texture: Constructible/Power/dispensers.rsi/soda_dispenser.png
- type: ReagentDispenser - type: ReagentDispenser
pack: SodaDispenserInventory pack: SodaDispenserInventory
- type: reagentDispenserInventory - type: reagentDispenserInventory
id: SodaDispenserInventory id: SodaDispenserInventory
inventory: inventory:
@@ -20,3 +19,5 @@
- chem.Ice - chem.Ice
- chem.H2O - chem.H2O
- chem.Cream - chem.Cream
- type: Anchorable
- type: Pullable

View File

@@ -50,6 +50,7 @@
BoardName: "Vending Machine" BoardName: "Vending Machine"
LayoutId: Vending LayoutId: Vending
- type: Anchorable - type: Anchorable
- type: Pullable
- type: entity - type: entity
parent: VendingMachine parent: VendingMachine

View File

@@ -22,4 +22,5 @@
damage: 200 damage: 200
tools: tools:
- Welding - Welding
- type: Anchorable
- type: Pullable

View File

@@ -9,6 +9,8 @@
texture: Constructible/Misc/watertank.png texture: Constructible/Misc/watertank.png
- type: Icon - type: Icon
texture: Constructible/Misc/watertank.png texture: Constructible/Misc/watertank.png
- type: Anchorable
- type: Pullable
- type: entity - type: entity
parent: WaterTank parent: WaterTank

View File

@@ -7,15 +7,12 @@
- type: Sprite - type: Sprite
sprite: Objects/Specific/Janitorial/mop.rsi sprite: Objects/Specific/Janitorial/mop.rsi
state: mop state: mop
- type: Icon - type: Icon
sprite: Objects/Specific/Janitorial/mop.rsi sprite: Objects/Specific/Janitorial/mop.rsi
state: mop state: mop
- type: Item - type: Item
size: 10 size: 10
sprite: Objects/Specific/Janitorial/mop.rsi sprite: Objects/Specific/Janitorial/mop.rsi
- type: Mop - type: Mop
- type: Solution - type: Solution
maxVol: 10 maxVol: 10
@@ -42,7 +39,7 @@
- type: Collidable - type: Collidable
shapes: shapes:
- !type:PhysShapeAabb - !type:PhysShapeAabb
bounds: "-0.25,-0.25,0.25,0.25" bounds: "-0.40,-0.25,0.25,0.25"
mask: mask:
- Impassable - Impassable
- Opaque - Opaque
@@ -53,6 +50,7 @@
mass: 5 mass: 5
Anchored: false Anchored: false
- type: CanSpill - type: CanSpill
- type: Pullable
- type: entity - type: entity
parent: BaseItem parent: BaseItem
@@ -92,11 +90,9 @@
- type: Sprite - type: Sprite
sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
state: caution state: caution
- type: Icon - type: Icon
sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
state: caution state: caution
- type: Item - type: Item
sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi
@@ -109,14 +105,11 @@
- type: Sprite - type: Sprite
sprite: Objects/Specific/Janitorial/soap.rsi sprite: Objects/Specific/Janitorial/soap.rsi
state: soap state: soap
- type: Icon - type: Icon
sprite: Objects/Specific/Janitorial/soap.rsi sprite: Objects/Specific/Janitorial/soap.rsi
state: soap state: soap
- type: Item - type: Item
sprite: Objects/Specific/Janitorial/soap.rsi sprite: Objects/Specific/Janitorial/soap.rsi
- type: Slippery - type: Slippery
paralyzeTime: 2.5 paralyzeTime: 2.5
@@ -129,7 +122,6 @@
components: components:
- type: Sprite - type: Sprite
state: soapnt state: soapnt
- type: Icon - type: Icon
state: soapnt state: soapnt
@@ -141,7 +133,6 @@
components: components:
- type: Sprite - type: Sprite
state: soapdeluxe state: soapdeluxe
- type: Icon - type: Icon
state: soapdeluxe state: soapdeluxe
@@ -153,10 +144,8 @@
components: components:
- type: Sprite - type: Sprite
state: soapsyndie state: soapsyndie
- type: Icon - type: Icon
state: soapsyndie state: soapsyndie
- type: Slippery - type: Slippery
paralyzeTime: 5 paralyzeTime: 5
@@ -168,10 +157,8 @@
components: components:
- type: Sprite - type: Sprite
state: soapgibs state: soapgibs
- type: Icon - type: Icon
state: soapgibs state: soapgibs
- type: Slippery - type: Slippery
paralyzeTime: 2 paralyzeTime: 2
@@ -183,9 +170,7 @@
components: components:
- type: Sprite - type: Sprite
state: soapomega state: soapomega
- type: Icon - type: Icon
state: soapomega state: soapomega
- type: Slippery - type: Slippery
paralyzeTime: 7 paralyzeTime: 7