Salvage Airlock (#36375)

* Salvage

* atmos a

* more muted colours

* Mapping Related to AI

* Fixed small naming inconsistency

* Revert "Fixed small naming inconsistency"

This reverts commit 985e1fd46a09e521c11dc345f470228e7907fbb9.

* Revert "Mapping Related to AI"

This reverts commit 5d5ae4feb819396c5c2a7413399ab5ce34f8683b.

* Revert "atmos a"

This reverts commit 529831e2584df27fa102ee1c970948fa3b6bab56.

* indent

---------

Co-authored-by: Milon <milonpl.git@proton.me>
This commit is contained in:
TakoDragon
2025-04-20 14:03:46 +02:00
committed by GitHub
parent 097aff5e58
commit 056b25d01a
44 changed files with 434 additions and 2 deletions

View File

@@ -223,7 +223,7 @@
board: [ DoorElectronicsCargo ]
- type: entity
parent: AirlockCargo
parent: AirlockSalvage
id: AirlockSalvageLocked
suffix: Salvage, Locked
components:
@@ -617,7 +617,7 @@
board: [ DoorElectronicsCargo ]
- type: entity
parent: AirlockCargoGlass
parent: AirlockSalvageGlass
id: AirlockSalvageGlassLocked
suffix: Salvage, Locked
components:

View File

@@ -40,6 +40,16 @@
- type: Wires
layoutId: AirlockCargo
- type: entity
parent: Airlock
id: AirlockSalvage
suffix: Salvage
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/salvage.rsi
- type: Wires
layoutId: AirlockCargo
- type: entity
parent: Airlock
id: AirlockHydroponics
@@ -207,6 +217,16 @@
- type: Wires
layoutId: AirlockCargo
- type: entity
parent: AirlockGlass
id: AirlockSalvageGlass
suffix: Salvage
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/salvage.rsi
- type: Wires
layoutId: AirlockCargo
- type: entity
parent: AirlockGlass
id: AirlockHydroponicsGlass

View File

@@ -195,6 +195,25 @@
sprite: Structures/Doors/Airlocks/Glass/medical.rsi
state: "assembly"
#Salvage
- type: entity
parent: AirlockAssembly
id: AirlockAssemblySalvage
suffix: Salvage
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/salvage.rsi
state: "assembly"
- type: entity
parent: AirlockAssembly
id: AirlockAssemblySalvageGlass
suffix: Salvage, Glass
components:
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/salvage.rsi
state: "assembly"
#Science
- type: entity
parent: AirlockAssembly

View File

@@ -12,6 +12,7 @@
hydroponics: Structures/Doors/Airlocks/Standard/hydroponics.rsi
maintenance: Structures/Doors/Airlocks/Standard/maint.rsi
medical: Structures/Doors/Airlocks/Standard/medical.rsi
salvage: Structures/Doors/Airlocks/Standard/salvage.rsi
science: Structures/Doors/Airlocks/Standard/science.rsi
security: Structures/Doors/Airlocks/Standard/security.rsi
virology: Structures/Doors/Airlocks/Standard/virology.rsi
@@ -31,6 +32,7 @@
hydroponics: Structures/Doors/Airlocks/Glass/hydroponics.rsi
maintenance: Structures/Doors/Airlocks/Glass/maint.rsi
medical: Structures/Doors/Airlocks/Glass/medical.rsi
salvage: Structures/Doors/Airlocks/Glass/salvage.rsi
security: Structures/Doors/Airlocks/Glass/security.rsi
virology: Structures/Doors/Airlocks/Glass/virology.rsi
@@ -79,6 +81,7 @@
hydroponics: Civilian
maintenance: Civilian
medical: Medical
salvage: Cargo
science: Science
security: Security
virology: Medical

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

View File

@@ -0,0 +1,195 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, salvage version made by BackeTako (github) for ss14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "assembly"
},
{
"name": "bolted_unlit"
},
{
"name": "closed"
},
{
"name": "closed_unlit"
},
{
"name": "closing",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "closing_unlit",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "deny_unlit",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "open",
"delays": [
[
1
]
]
},
{
"name": "opening",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "opening_unlit",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "panel_closing",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "panel_open",
"delays": [
[
1
]
]
},
{
"name": "panel_opening",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "sparks",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_broken",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_damaged",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
1.7
]
]
},
{
"name": "sparks_open",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "welded"
},
{
"name": "emergency_unlit",
"delays": [
[
0.4,
0.4
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 947 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 432 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 321 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 588 B

View File

@@ -0,0 +1,195 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/c6e3401f2e7e1e55c57060cdf956a98ef1fefc24, salvage version made by BackeTako (github) for ss14",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "assembly"
},
{
"name": "bolted_unlit"
},
{
"name": "closed"
},
{
"name": "closed_unlit"
},
{
"name": "closing",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "closing_unlit",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "deny_unlit",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "open",
"delays": [
[
1
]
]
},
{
"name": "opening",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "opening_unlit",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "panel_closing",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "panel_open",
"delays": [
[
1
]
]
},
{
"name": "panel_opening",
"delays": [
[
0.1,
0.1,
0.07,
0.07,
0.07,
0.2
]
]
},
{
"name": "sparks",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_broken",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "sparks_damaged",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1,
1.7
]
]
},
{
"name": "sparks_open",
"delays": [
[
0.1,
0.1,
0.1,
0.1,
0.1,
0.1
]
]
},
{
"name": "welded"
},
{
"name": "emergency_unlit",
"delays": [
[
0.4,
0.4
]
]
}
]
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 284 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 445 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 315 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 470 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 697 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 183 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 296 B