From: NULL882 <104377798+NULL882@users.noreply.github.com> Date: Thu, 28 Sep 2023 17:07:12 +0000 (+0300) Subject: Necropolis and mine walls (#20578) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=c2771c24fae2908d60ce7c27075ce39798bfcbf6;p=space-station-14.git Necropolis and mine walls (#20578) --- diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml index 2bdae980d0..1a2a8c73ab 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml @@ -1273,3 +1273,21 @@ components: - type: Sprite state: zero + +- type: entity + parent: BaseSign + id: SignSurvival + name: survival sign + description: A sign. "Survival" is written on it. + components: + - type: Sprite + state: survival + +- type: entity + parent: BaseSign + id: SignNTMine + name: mine sign + description: A sign. "Mine" is written on it. + components: + - type: Sprite + state: ntmining diff --git a/Resources/Prototypes/Entities/Structures/Walls/walls.yml b/Resources/Prototypes/Entities/Structures/Walls/walls.yml index a0aeac79b6..be2927fcb9 100644 --- a/Resources/Prototypes/Entities/Structures/Walls/walls.yml +++ b/Resources/Prototypes/Entities/Structures/Walls/walls.yml @@ -970,6 +970,79 @@ node: wall +# Lavalend Walls + +- type: entity + parent: BaseWall + id: WallNecropolis + name: stone wall + components: + - type: Tag + tags: + - Wall + - type: Sprite + sprite: Structures/Walls/necropolis.rsi + - type: Icon + sprite: Structures/Walls/necropolis.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 1000 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: IconSmooth + key: walls + base: necropolis + +- type: entity + parent: BaseWall + id: WallMining + name: wall + components: + - type: Tag + tags: + - Wall + - type: Sprite + sprite: Structures/Walls/mining.rsi + - type: Icon + sprite: Structures/Walls/mining.rsi + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 700 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: IconSmooth + key: walls + base: mining + +- type: entity + parent: WallShuttleDiagonal + id: WallMiningDiagonal + name: wall + suffix: diagonal + placement: + mode: SnapgridCenter + snap: + - Wall + components: + - type: Sprite + drawdepth: Walls + sprite: Structures/Walls/mining_diagonal.rsi + state: state0 + - type: IconSmooth + mode: Diagonal + key: walls + base: state + - type: Icon + sprite: Structures/Walls/mining_diagonal.rsi + state: state0 + + # Vault Walls - type: entity diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json index 209c9c7d75..e2cbbff989 100644 --- a/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json @@ -5,7 +5,7 @@ "y": 32 }, "license": "CC-BY-SA-3.0", - "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460", + "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, except numerical signs which were created by discord: brainfood#7460, states: 'survival' and 'ntmining' from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202", "states": [ { "name": "ai", @@ -1357,6 +1357,22 @@ 1 ] ] + }, + { + "name": "survival", + "delays": [ + [ + 1 + ] + ] + }, + { + "name": "ntmining", + "delays": [ + [ + 1 + ] + ] } ] } diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/ntmining.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/ntmining.png new file mode 100644 index 0000000000..bd452d172b Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/ntmining.png differ diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/survival.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/survival.png new file mode 100644 index 0000000000..a4261fbcf8 Binary files /dev/null and b/Resources/Textures/Structures/Wallmounts/signs.rsi/survival.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/full.png b/Resources/Textures/Structures/Walls/mining.rsi/full.png new file mode 100644 index 0000000000..8103f03126 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/meta.json b/Resources/Textures/Structures/Walls/mining.rsi/meta.json new file mode 100644 index 0000000000..4ce4691c51 --- /dev/null +++ b/Resources/Textures/Structures/Walls/mining.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202 and modified.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "mining0", + "directions": 4 + }, + { + "name": "mining1", + "directions": 4 + }, + { + "name": "mining2", + "directions": 4 + }, + { + "name": "mining3", + "directions": 4 + }, + { + "name": "mining4", + "directions": 4 + }, + { + "name": "mining5", + "directions": 4 + }, + { + "name": "mining6", + "directions": 4 + }, + { + "name": "mining7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining0.png b/Resources/Textures/Structures/Walls/mining.rsi/mining0.png new file mode 100644 index 0000000000..b0f8c71170 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining0.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining1.png b/Resources/Textures/Structures/Walls/mining.rsi/mining1.png new file mode 100644 index 0000000000..d2bc3f00e9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining1.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining2.png b/Resources/Textures/Structures/Walls/mining.rsi/mining2.png new file mode 100644 index 0000000000..b0f8c71170 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining2.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining3.png b/Resources/Textures/Structures/Walls/mining.rsi/mining3.png new file mode 100644 index 0000000000..d2bc3f00e9 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining3.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining4.png b/Resources/Textures/Structures/Walls/mining.rsi/mining4.png new file mode 100644 index 0000000000..12ae4d0b8b Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining4.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining5.png b/Resources/Textures/Structures/Walls/mining.rsi/mining5.png new file mode 100644 index 0000000000..e162be41e3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining5.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining6.png b/Resources/Textures/Structures/Walls/mining.rsi/mining6.png new file mode 100644 index 0000000000..12ae4d0b8b Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining6.png differ diff --git a/Resources/Textures/Structures/Walls/mining.rsi/mining7.png b/Resources/Textures/Structures/Walls/mining.rsi/mining7.png new file mode 100644 index 0000000000..92810f3c1e Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining.rsi/mining7.png differ diff --git a/Resources/Textures/Structures/Walls/mining_diagonal.rsi/meta.json b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/meta.json new file mode 100644 index 0000000000..d908dd0c08 --- /dev/null +++ b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/meta.json @@ -0,0 +1,17 @@ +{ + "version": 1, + "size": { + "x": 32, + "y": 32 + }, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/f743754ec3ef446c8172388431effa73aeddb7ff#diff-b429dd7fccbca60d740d4887c1077a178abf1efffe57e7ae2a0b607c8a9e2202 and modified.", + "states": [ + { + "name": "state0" + }, + { + "name": "state1" + } + ] +} diff --git a/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state0.png b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state0.png new file mode 100644 index 0000000000..c8f7db2792 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state0.png differ diff --git a/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state1.png b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state1.png new file mode 100644 index 0000000000..c8f7db2792 Binary files /dev/null and b/Resources/Textures/Structures/Walls/mining_diagonal.rsi/state1.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/full.png b/Resources/Textures/Structures/Walls/necropolis.rsi/full.png new file mode 100644 index 0000000000..f03d79132b Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/full.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/meta.json b/Resources/Textures/Structures/Walls/necropolis.rsi/meta.json new file mode 100644 index 0000000000..f36c37e48b --- /dev/null +++ b/Resources/Textures/Structures/Walls/necropolis.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from https://github.com/tgstation/tgstation/commit/9dbe3253d0bc712e086ec6b5bc4a7fd69bdf337f#diff-a93b44bf8dd39fddb41a69ad1c2dd2d294244b7a46fa885ac6023ed8cdb54080 and modified.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "necropolis0", + "directions": 4 + }, + { + "name": "necropolis1", + "directions": 4 + }, + { + "name": "necropolis2", + "directions": 4 + }, + { + "name": "necropolis3", + "directions": 4 + }, + { + "name": "necropolis4", + "directions": 4 + }, + { + "name": "necropolis5", + "directions": 4 + }, + { + "name": "necropolis6", + "directions": 4 + }, + { + "name": "necropolis7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis0.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis0.png new file mode 100644 index 0000000000..608d29c03e Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis0.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis1.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis1.png new file mode 100644 index 0000000000..0c4c7d7912 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis1.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis2.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis2.png new file mode 100644 index 0000000000..608d29c03e Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis2.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis3.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis3.png new file mode 100644 index 0000000000..0c4c7d7912 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis3.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis4.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis4.png new file mode 100644 index 0000000000..8efe7109c6 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis4.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis5.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis5.png new file mode 100644 index 0000000000..28bbea2a94 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis5.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis6.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis6.png new file mode 100644 index 0000000000..8efe7109c6 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis6.png differ diff --git a/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis7.png b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis7.png new file mode 100644 index 0000000000..745e5b0ce3 Binary files /dev/null and b/Resources/Textures/Structures/Walls/necropolis.rsi/necropolis7.png differ