diff --git a/Content.Server/Mousetrap/MousetrapComponent.cs b/Content.Server/Mousetrap/MousetrapComponent.cs index fb31964eec..2cf75e35cb 100644 --- a/Content.Server/Mousetrap/MousetrapComponent.cs +++ b/Content.Server/Mousetrap/MousetrapComponent.cs @@ -4,7 +4,8 @@ namespace Content.Server.Mousetrap; public sealed class MousetrapComponent : Component { [ViewVariables] - public bool IsActive; + [DataField("isActive")] + public bool IsActive = false; /// /// Set this to change where the diff --git a/Resources/Prototypes/Catalog/Fills/Crates/service.yml b/Resources/Prototypes/Catalog/Fills/Crates/service.yml index ed6970400d..f3c0904574 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/service.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/service.yml @@ -164,3 +164,91 @@ amount: 2 - id: ClothingMaskSterile 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml index 5f64b7a8c0..1cba1ecd2f 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/animals.yml @@ -1009,6 +1009,22 @@ - type: Puller 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 parent: MobMouse id: MobMouseAdmeme diff --git a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml index 310f1d598d..b5fc3b8cff 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/mousetrap.yml @@ -57,3 +57,13 @@ - type: Tag tags: - 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 \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index a6d1ed80ca..17b7ec179e 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -90,6 +90,17 @@ lightRadius: 6 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 parent: BaseLightTube name: fluorescent light tube @@ -103,6 +114,16 @@ lightSoftness: 1 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 parent: BaseLightTube name: led light tube diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index a789004e59..1f40fa15a6 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -496,3 +496,26 @@ sprite: Structures/Storage/Crates/syndicate.rsi - type: Sprite 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"]] + diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png new file mode 100644 index 0000000000..85d7c29992 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png new file mode 100644 index 0000000000..1c11bc8942 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png new file mode 100644 index 0000000000..6c212de328 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json new file mode 100644 index 0000000000..c4315ace71 --- /dev/null +++ b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/meta.json @@ -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 + ] + ] + } + ] +} diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png new file mode 100644 index 0000000000..58f97286f2 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png new file mode 100644 index 0000000000..87b78b9b46 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/sparking.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png new file mode 100644 index 0000000000..cad0a0f18a Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart.rsi/welded.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png new file mode 100644 index 0000000000..dc61d52d0c Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/base.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png new file mode 100644 index 0000000000..b4dc8828b3 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/closed.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png new file mode 100644 index 0000000000..6cbe507174 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/icon.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png new file mode 100644 index 0000000000..4c3d5df9e7 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/locked.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json new file mode 100644 index 0000000000..b45e84deb3 --- /dev/null +++ b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png new file mode 100644 index 0000000000..58f97286f2 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/open.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png new file mode 100644 index 0000000000..87b78b9b46 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/sparking.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png new file mode 100644 index 0000000000..61625a29c2 Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/unlocked.png differ diff --git a/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png new file mode 100644 index 0000000000..cad0a0f18a Binary files /dev/null and b/Resources/Textures/Structures/Storage/Crates/trashcart_jani.rsi/welded.png differ