From: Alex <129697969+Lomcastar@users.noreply.github.com> Date: Tue, 9 May 2023 23:50:03 +0000 (+0300) Subject: Proximity mine wet floor sign (#16284) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=571f33654b5774c20b7f407488de3cd4835c870b;p=space-station-14.git Proximity mine wet floor sign (#16284) --- diff --git a/Resources/Locale/en-US/store/uplink-catalog.ftl b/Resources/Locale/en-US/store/uplink-catalog.ftl index 5a298f9eac..20c7778c2c 100644 --- a/Resources/Locale/en-US/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/store/uplink-catalog.ftl @@ -169,6 +169,9 @@ uplink-hot-potato-desc = Once activated, this time bomb can't be dropped - only uplink-chimp-ammo-name = Box of 10 Omega Cartridges. uplink-chimp-ammo-desc = A box of 10 omega particle cartridges for the CHIMP. Omega particles inflict severe burns and cause anomalies to go supercritical. +uplink-proximity-mine-name = Proximity Mine +uplink-proximity-mine-desc = A mine disguised as a wet floor sign. + # Armor uplink-chameleon-name = Chameleon Kit uplink-chameleon-desc = A backpack full of items that contain chameleon technology allowing you to disguise as pretty much anything on the station, and more! diff --git a/Resources/Prototypes/Catalog/uplink_catalog.yml b/Resources/Prototypes/Catalog/uplink_catalog.yml index 1421ee0318..f1d60874d5 100644 --- a/Resources/Prototypes/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/Catalog/uplink_catalog.yml @@ -683,6 +683,20 @@ whitelist: - Scientist +- type: listing + id: uplinkProximityMine + name: uplink-proximity-mine-name + description: uplink-proximity-mine-desc + productEntity: WetFloorSignMineExplosive + cost: + Telecrystal: 4 + categories: + - UplinkJob + conditions: + - !type:BuyerJobCondition + whitelist: + - Janitor + # Armor - type: listing diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 0fe1fe40ea..0c0da46a7b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -167,6 +167,52 @@ tags: - WetFloorSign + +- type: entity + name: wet floor sign + suffix: Explosive + description: Caution! Wet Floor! + parent: BaseItem + id: WetFloorSignMineExplosive + components: + - type: Sprite + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi + state: caution + - type: Item + sprite: Objects/Specific/Janitorial/wet_floor_sign.rsi + size: 15 + - type: StepTrigger + intersectRatio: 0.2 + requiredTriggeredSpeed: 0 + - type: CollisionWake + enabled: false + - type: Physics + bodyType: Dynamic + - type: Fixtures + fixtures: + slips: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + hard: false + layer: + - LowImpassable + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.2,-0.2,0.2,0.2" + density: 30 + mask: + - ItemMask + - type: LandMine + - type: ExplodeOnTrigger + - type: Explosive + explosionType: Default + maxIntensity: 5 # about a ~67.5 total damage + totalIntensity: 60 # about a ~3 tile radius + canCreateVacuum: false + - type: DeleteOnTrigger + - type: entity name: janitorial trolley id: JanitorialTrolley