Add trash carts and janitorial trash carts (#18996)
* everything * half loot
@@ -4,7 +4,8 @@ namespace Content.Server.Mousetrap;
|
|||||||
public sealed class MousetrapComponent : Component
|
public sealed class MousetrapComponent : Component
|
||||||
{
|
{
|
||||||
[ViewVariables]
|
[ViewVariables]
|
||||||
public bool IsActive;
|
[DataField("isActive")]
|
||||||
|
public bool IsActive = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Set this to change where the
|
/// Set this to change where the
|
||||||
|
|||||||
@@ -164,3 +164,91 @@
|
|||||||
amount: 2
|
amount: 2
|
||||||
- id: ClothingMaskSterile
|
- id: ClothingMaskSterile
|
||||||
amount: 2
|
amount: 2
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
id: CrateTrashCartFilled
|
||||||
|
suffix: Filled
|
||||||
|
parent: CrateTrashCart
|
||||||
|
components:
|
||||||
|
- type: StorageFill
|
||||||
|
contents:
|
||||||
|
# Food Packaging
|
||||||
|
- id: FoodPacketBoritosTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketCheesieTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketChipsTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketChocolateTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketEnergyTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketPopcornTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketSusTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketSyndiTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketChowMeinTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketDanDanTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketMRETrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketPistachioTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketSemkiTrash
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodPacketRaisinsTrash
|
||||||
|
prob: 0.1
|
||||||
|
# Cans
|
||||||
|
- id: FoodTinBeansTrash
|
||||||
|
prob: 0.15
|
||||||
|
- id: FoodTinPeachesTrash
|
||||||
|
prob: 0.15
|
||||||
|
- id: FoodTinMRETrash
|
||||||
|
prob: 0.15
|
||||||
|
# Cigarette Stuff
|
||||||
|
- id: Ash
|
||||||
|
prob: 0.15
|
||||||
|
- id: CigarSpent
|
||||||
|
prob: 0.15
|
||||||
|
- id: CigaretteSpent
|
||||||
|
prob: 0.15
|
||||||
|
# Bacteria
|
||||||
|
- id: FoodBreadMoldySlice
|
||||||
|
prob: 0.15
|
||||||
|
- id: FoodPizzaMoldySlice
|
||||||
|
prob: 0.15
|
||||||
|
# Botanical Waste
|
||||||
|
- id: TrashBananaPeel
|
||||||
|
prob: 0.15
|
||||||
|
- id: FoodCornTrash
|
||||||
|
prob: 0.15
|
||||||
|
# Misc
|
||||||
|
- id: ShardGlass
|
||||||
|
prob: 0.1
|
||||||
|
- id: DrinkGlass
|
||||||
|
prob: 0.15
|
||||||
|
- id: BrokenBottle
|
||||||
|
prob: 0.15
|
||||||
|
- id: LightTubeBroken
|
||||||
|
prob: 0.15
|
||||||
|
- id: LightBulbBroken
|
||||||
|
prob: 0.15
|
||||||
|
- id: MousetrapArmed
|
||||||
|
prob: 0.15
|
||||||
|
- id: CableApcStack10
|
||||||
|
prob: 0.15
|
||||||
|
- id: MobMouseDead
|
||||||
|
prob: 0.1
|
||||||
|
- id: RagItem
|
||||||
|
prob: 0.1
|
||||||
|
- id: Flare
|
||||||
|
prob: 0.1
|
||||||
|
- id: FoodKebabSkewer
|
||||||
|
prob: 0.1
|
||||||
|
- id: Syringe
|
||||||
|
prob: 0.1
|
||||||
|
- id: ShardGlassPlasma
|
||||||
|
prob: 0.1
|
||||||
@@ -1009,6 +1009,22 @@
|
|||||||
- type: Puller
|
- type: Puller
|
||||||
needsHands: true
|
needsHands: true
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: MobMouse
|
||||||
|
suffix: Dead
|
||||||
|
save: false
|
||||||
|
id: MobMouseDead
|
||||||
|
name: mouse
|
||||||
|
description: Squeak!
|
||||||
|
components:
|
||||||
|
- type: Damageable
|
||||||
|
damage:
|
||||||
|
types:
|
||||||
|
Bloodloss: 6
|
||||||
|
Asphyxiation: 4
|
||||||
|
Slash: 7
|
||||||
|
Blunt: 3
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: MobMouse
|
parent: MobMouse
|
||||||
id: MobMouseAdmeme
|
id: MobMouseAdmeme
|
||||||
|
|||||||
@@ -57,3 +57,13 @@
|
|||||||
- type: Tag
|
- type: Tag
|
||||||
tags:
|
tags:
|
||||||
- DroneUsable
|
- DroneUsable
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
name: mousetrap
|
||||||
|
suffix: Armed
|
||||||
|
parent: Mousetrap
|
||||||
|
id: MousetrapArmed
|
||||||
|
description: Useful for catching rodents sneaking into your kitchen.
|
||||||
|
components:
|
||||||
|
- type: Mousetrap
|
||||||
|
isActive: true
|
||||||
@@ -90,6 +90,17 @@
|
|||||||
lightRadius: 6
|
lightRadius: 6
|
||||||
lightSoftness: 1.1
|
lightSoftness: 1.1
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
suffix: Broken
|
||||||
|
parent: BaseLightbulb
|
||||||
|
name: incandescent light bulb
|
||||||
|
id: LightBulbBroken
|
||||||
|
description: A light bulb.
|
||||||
|
components:
|
||||||
|
- type: LightBulb
|
||||||
|
startingState: Broken
|
||||||
|
bulb: Bulb
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: BaseLightTube
|
parent: BaseLightTube
|
||||||
name: fluorescent light tube
|
name: fluorescent light tube
|
||||||
@@ -103,6 +114,16 @@
|
|||||||
lightSoftness: 1
|
lightSoftness: 1
|
||||||
PowerUse: 25
|
PowerUse: 25
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
suffix: Broken
|
||||||
|
parent: BaseLightTube
|
||||||
|
name: fluorescent light tube
|
||||||
|
id: LightTubeBroken
|
||||||
|
description: A light fixture.
|
||||||
|
components:
|
||||||
|
- type: LightBulb
|
||||||
|
startingState: Broken
|
||||||
|
|
||||||
- type: entity
|
- type: entity
|
||||||
parent: BaseLightTube
|
parent: BaseLightTube
|
||||||
name: led light tube
|
name: led light tube
|
||||||
|
|||||||
@@ -496,3 +496,26 @@
|
|||||||
sprite: Structures/Storage/Crates/syndicate.rsi
|
sprite: Structures/Storage/Crates/syndicate.rsi
|
||||||
- type: Sprite
|
- type: Sprite
|
||||||
sprite: Structures/Storage/Crates/syndicate.rsi
|
sprite: Structures/Storage/Crates/syndicate.rsi
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: CrateBaseWeldable
|
||||||
|
id: CrateTrashCart
|
||||||
|
name: trash cart
|
||||||
|
components:
|
||||||
|
- type: Icon
|
||||||
|
sprite: Structures/Storage/Crates/trashcart.rsi
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Structures/Storage/Crates/trashcart.rsi
|
||||||
|
|
||||||
|
- type: entity
|
||||||
|
parent: CrateBaseSecure
|
||||||
|
id: CrateTrashCartJani
|
||||||
|
name: janitorial trash cart
|
||||||
|
components:
|
||||||
|
- type: Icon
|
||||||
|
sprite: Structures/Storage/Crates/trashcart_jani.rsi
|
||||||
|
- type: Sprite
|
||||||
|
sprite: Structures/Storage/Crates/trashcart_jani.rsi
|
||||||
|
- type: AccessReader
|
||||||
|
access: [["Janitor"]]
|
||||||
|
|
||||||
|
|||||||
|
After Width: | Height: | Size: 378 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 380 B |
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "base"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "closed"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "open"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "welded"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sparking",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
]
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 233 B |
|
After Width: | Height: | Size: 206 B |
|
After Width: | Height: | Size: 270 B |
|
After Width: | Height: | Size: 410 B |
|
After Width: | Height: | Size: 262 B |
|
After Width: | Height: | Size: 412 B |
|
After Width: | Height: | Size: 185 B |
@@ -0,0 +1,45 @@
|
|||||||
|
{
|
||||||
|
"version": 1,
|
||||||
|
"license": "CC-BY-SA-3.0",
|
||||||
|
"copyright": "Modified from https://github.com/tgstation/tgstation/commit/571e401e19514e8b0216e2efbbc95302007bfe9c by potato1234x (Github) for SS14",
|
||||||
|
"size": {
|
||||||
|
"x": 32,
|
||||||
|
"y": 32
|
||||||
|
},
|
||||||
|
"states": [
|
||||||
|
{
|
||||||
|
"name": "icon"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "base"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "closed"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "open"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "welded"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "sparking",
|
||||||
|
"delays": [
|
||||||
|
[
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1,
|
||||||
|
0.1
|
||||||
|
]
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "locked"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "unlocked"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
After Width: | Height: | Size: 233 B |
|
After Width: | Height: | Size: 206 B |
|
After Width: | Height: | Size: 183 B |
|
After Width: | Height: | Size: 270 B |