diff --git a/Resources/Prototypes/_Mono/Decals/techfloor.yml b/Resources/Prototypes/_Mono/Decals/techfloor.yml index 136e06ecfcf..950e0a1397c 100644 --- a/Resources/Prototypes/_Mono/Decals/techfloor.yml +++ b/Resources/Prototypes/_Mono/Decals/techfloor.yml @@ -26,6 +26,34 @@ sprite: _Mono/Decals/techfloor.rsi state: cornern +- type: decal + id: TechFullCornerE + tags: ["station", "markings"] + sprite: + sprite: _Mono/Decals/techfloor.rsi + state: fullcornere + +- type: decal + id: TechFullCornerW + tags: ["station", "markings"] + sprite: + sprite: _Mono/Decals/techfloor.rsi + state: fullcornerw + +- type: decal + id: TechFullCornerS + tags: ["station", "markings"] + sprite: + sprite: _Mono/Decals/techfloor.rsi + state: fullcorners + +- type: decal + id: TechFullCornerN + tags: ["station", "markings"] + sprite: + sprite: _Mono/Decals/techfloor.rsi + state: fullcornern + - type: decal id: TechE tags: ["station", "markings"] diff --git a/Resources/Prototypes/_Mono/Decals/trimlinewarn.yml b/Resources/Prototypes/_Mono/Decals/trimlinewarn.yml index b5f5dd49026..4d6649fad97 100644 --- a/Resources/Prototypes/_Mono/Decals/trimlinewarn.yml +++ b/Resources/Prototypes/_Mono/Decals/trimlinewarn.yml @@ -53,3 +53,10 @@ sprite: sprite: _Mono/Decals/trimlinewarn.rsi state: warnwest + +- type: decal + id: TrimWarnLiveFire + tags: ["station", "markings"] + sprite: + sprite: _Mono/Decals/trimlinewarn.rsi + state: warnlivefire diff --git a/Resources/Prototypes/_Mono/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_Mono/Entities/Structures/Furniture/tables.yml new file mode 100644 index 00000000000..1314b65c100 --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Structures/Furniture/tables.yml @@ -0,0 +1,75 @@ + +- type: entity + id: Battletable + name: battle table + parent: BaseStructure + description: A futuristic-looking battle planning table. + components: + - type: Sprite + sprite: _Mono/Structures/Furniture/Tables/battletable.rsi + state: full + - type: Icon + sprite: _Mono/Structures/Furniture/Tables/battletable.rsi + state: full + - type: Damageable + damageContainer: StructuralInorganic + damageModifierSet: Metallic + - type: PointLight + color: "#7eaeca" + radius: 1 + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 125 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 100 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -6 + - !type:SpawnEntitiesBehavior + spawn: + SheetSteel1: + min: 1 + max: 1 + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Animateable + - type: PlaceableSurface + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeAabb + bounds: "-0.45,-0.45,0.45,0.45" + density: 55 + mask: # tables should collide with other tables + - TableMask + layer: + - TableLayer + - BulletImpassable # Goobstation - Crawling + - type: Climbable + - type: Bonkable + bonkDamage: + types: + Blunt: 4 + - type: Clickable + - type: FootstepModifier + footstepSoundCollection: + collection: FootstepHull + - type: Tag + tags: + - ForceFixRotations + - type: RequireProjectileTarget # Goobstation - Crawling + ignoreThrow: true + # Mono + - type: ShipRepairable + repairTime: 1 + repairCost: 2 diff --git a/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornere.png b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornere.png new file mode 100644 index 00000000000..93201bc71df Binary files /dev/null and b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornere.png differ diff --git a/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornern.png b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornern.png new file mode 100644 index 00000000000..d50ac1f70b1 Binary files /dev/null and b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornern.png differ diff --git a/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcorners.png b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcorners.png new file mode 100644 index 00000000000..82171317e57 Binary files /dev/null and b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcorners.png differ diff --git a/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornerw.png b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornerw.png new file mode 100644 index 00000000000..a4935fdd096 Binary files /dev/null and b/Resources/Textures/_Mono/Decals/techfloor.rsi/fullcornerw.png differ diff --git a/Resources/Textures/_Mono/Decals/techfloor.rsi/meta.json b/Resources/Textures/_Mono/Decals/techfloor.rsi/meta.json index a913d2d4843..dfe71b283d9 100644 --- a/Resources/Textures/_Mono/Decals/techfloor.rsi/meta.json +++ b/Resources/Textures/_Mono/Decals/techfloor.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Shiptest and modified for use.", + "copyright": "Taken from Shiptest and modified for use. Fullcorner states made by Onezero0 for Monolith.", "size": { "x": 32, "y": 32 @@ -19,6 +19,18 @@ { "name": "corners" }, + { + "name": "fullcornere" + }, + { + "name": "fullcornern" + }, + { + "name": "fullcornerw" + }, + { + "name": "fullcorners" + }, { "name": "teche" }, diff --git a/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/meta.json b/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/meta.json index c0b88b0b9a1..505724d5516 100644 --- a/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/meta.json +++ b/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "Taken from Shiptest and modified for use.", + "copyright": "Taken from Shiptest and modified for Monolith use. Live-fire made by Onezero0 for Monolith.", "size": { "x": 32, "y": 32 @@ -30,6 +30,9 @@ }, { "name": "warnsouthwest" + }, + { + "name": "warnlivefire" } ] } diff --git a/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/warnlivefire.png b/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/warnlivefire.png new file mode 100644 index 00000000000..6abbfddd7d2 Binary files /dev/null and b/Resources/Textures/_Mono/Decals/trimlinewarn.rsi/warnlivefire.png differ diff --git a/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/full.png b/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/full.png new file mode 100644 index 00000000000..54f818895df Binary files /dev/null and b/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/full.png differ diff --git a/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/meta.json b/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/meta.json new file mode 100644 index 00000000000..9cd32da535f --- /dev/null +++ b/Resources/Textures/_Mono/Structures/Furniture/Tables/battletable.rsi/meta.json @@ -0,0 +1,14 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by Onezero0 for Monolith", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + } + ] +}