Skip to content

Commit 190255d

Browse files
Chedd-Errorfunkystationbot
Chedd-Error
and
funkystationbot
authored
the time of inflatables is nigh (funky-station#2141)
* the entirety of inflatables have been made more convenient * ripvalves * chore: Automatically update REUSE headers * appease the yaml linter * chore: Automatically update REUSE headers * listened to Ork's feedback, also added an inflatable dock * chore: Automatically update REUSE headers * maybe this appeases the ubuntu test * chore: Automatically update REUSE headers * ubuntu appeaser part 2 * chore: Automatically update REUSE headers * migration because why the hell not --------- Co-authored-by: funkystationbot <funky@funkystation.org>
1 parent 391f369 commit 190255d

42 files changed

Lines changed: 447 additions & 59 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Resources/Locale/en-US/_Funkystation/tiles/tiles.ftl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tiles-inflatable-plating = inflatable floor

‎Resources/Maps/_Funkystation/core.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@
5454
# SPDX-FileCopyrightText: 2025 JoulesBerg <104539820+JoulesBerg@users.noreply.github.com>
5555
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
5656
# SPDX-FileCopyrightText: 2025 Teasq <Xerithin@gmail.com>
57+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
5758
# SPDX-FileCopyrightText: 2025 beef42 <bjarketp@gmail.com>
5859
# SPDX-FileCopyrightText: 2025 corresp0nd <46357632+corresp0nd@users.noreply.github.com>
5960
# SPDX-FileCopyrightText: 2025 kbarkevich <24629810+kbarkevich@users.noreply.github.com>
@@ -142163,7 +142164,7 @@ entities:
142163142164
- type: Transform
142164142165
pos: 29.5,-4.5
142165142166
parent: 2
142166-
- proto: InflatableWallStack5
142167+
- proto: InflatableWallStack
142167142168
entities:
142168142169
- uid: 1466
142169142170
components:

‎Resources/Maps/_Funkystation/gate.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
# SPDX-FileCopyrightText: 2025 Mish <bluscout78@yahoo.com>
5757
# SPDX-FileCopyrightText: 2025 Steve <marlumpy@gmail.com>
5858
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
59+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
5960
# SPDX-FileCopyrightText: 2025 corresp0nd <46357632+corresp0nd@users.noreply.github.com>
6061
# SPDX-FileCopyrightText: 2025 kbarkevich <24629810+kbarkevich@users.noreply.github.com>
6162
# SPDX-FileCopyrightText: 2025 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
@@ -143539,7 +143540,7 @@ entities:
143539143540
- type: Transform
143540143541
pos: -116.67446,24.249916
143541143542
parent: 2
143542-
- proto: InflatableWallStack5
143543+
- proto: InflatableWallStack
143543143544
entities:
143544143545
- uid: 1895
143545143546
components:

‎Resources/Maps/core.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,8 @@
4646
# SPDX-FileCopyrightText: 2024 Verm <32827189+Vermidia@users.noreply.github.com>
4747
# SPDX-FileCopyrightText: 2024 rottenheadphones <juaelwe@outlook.com>
4848
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
49+
# SPDX-FileCopyrightText: 2025 Teasq <Xerithin@gmail.com>
50+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
4951
# SPDX-FileCopyrightText: 2025 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
5052
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
5153
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
@@ -103585,7 +103587,7 @@ entities:
103585103587
- type: Transform
103586103588
pos: 29.5,-4.5
103587103589
parent: 2
103588-
- proto: InflatableWallStack5
103590+
- proto: InflatableWallStack
103589103591
entities:
103590103592
- uid: 1466
103591103593
components:

‎Resources/Maps/gate.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
# SPDX-FileCopyrightText: 2025 Mish <bluscout78@yahoo.com>
5656
# SPDX-FileCopyrightText: 2025 Steve <marlumpy@gmail.com>
5757
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
58+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
5859
# SPDX-FileCopyrightText: 2025 marc-pelletier <113944176+marc-pelletier@users.noreply.github.com>
5960
# SPDX-FileCopyrightText: 2025 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
6061
# SPDX-FileCopyrightText: 2025 rottenheadphones <juaelwe@outlook.com>
@@ -143537,7 +143538,7 @@ entities:
143537143538
- type: Transform
143538143539
pos: -116.67446,24.249916
143539143540
parent: 2
143540-
- proto: InflatableWallStack5
143541+
- proto: InflatableWallStack
143541143542
entities:
143542143543
- uid: 1895
143543143544
components:

‎Resources/Prototypes/Catalog/Cargo/cargo_emergency.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
# SPDX-FileCopyrightText: 2024 Tadeo <td12233a@gmail.com>
1515
# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
1616
# SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
17+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
1718
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
1819
#
1920
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -68,13 +69,14 @@
6869
category: cargoproduct-category-name-emergency
6970
group: market
7071

72+
# Funky inflatables
7173
- type: cargoProduct
7274
id: EmergencyInflatablewall
7375
icon:
74-
sprite: Objects/Misc/inflatable_wall.rsi
76+
sprite: _Funkystation/Objects/Misc/inflatables.rsi
7577
state: item_wall
7678
product: CrateEmergencyInflatablewall
77-
cost: 500
79+
cost: 550
7880
category: cargoproduct-category-name-emergency
7981
group: market
8082

‎Resources/Prototypes/Catalog/Fills/Boxes/general.yml‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
# SPDX-FileCopyrightText: 2025 Janet Blackquill <uhhadd@gmail.com>
4242
# SPDX-FileCopyrightText: 2025 QueerCats <jansencheng3@gmail.com>
4343
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
44+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
4445
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
4546
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
4647
#
@@ -250,24 +251,6 @@
250251
- id: Brutepack
251252
amount: 3
252253

253-
- type: entity
254-
name: inflatable wall box
255-
parent: BoxCardboard
256-
id: BoxInflatable
257-
description: Inflatable walls are not to be used as floatation devices.
258-
components:
259-
- type: StorageFill
260-
contents:
261-
- id: InflatableWallStack
262-
amount: 2
263-
- id: InflatableDoorStack
264-
amount: 2
265-
- type: Sprite
266-
layers:
267-
- state: box
268-
- state: inflatable
269-
270-
271254
- type: entity
272255
name: hatsune miku day bag
273256
parent: ClothingBackpackDuffel

‎Resources/Prototypes/Catalog/Fills/Crates/emergency.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# SPDX-FileCopyrightText: 2024 degradka <69397649+degradka@users.noreply.github.com>
1717
# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
1818
# SPDX-FileCopyrightText: 2024 metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
19+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
1920
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
2021
#
2122
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -125,15 +126,19 @@
125126
- id: DrinkShotGlass
126127
amount: 2
127128

129+
# Funky inflatables
128130
- type: entity
129131
id: CrateEmergencyInflatablewall
130132
parent: CratePlastic
131-
name: inflatable wall crate
132-
description: Three stacks of inflatable walls for when the stations metal walls don't want to hold atmosphere anymore.
133+
name: inflatables crate
134+
description: A crate with a total of 15 inflatable walls, 5 inflatable doors, and 32 inflatable floors. Just twist and pull the ripvalve on each and watch them expand into airtight structures!
133135
components:
134136
- type: StorageFill
135137
contents:
136138
- id: BoxInflatable
139+
amount: 1
140+
- id: BoxInflatableFloor
141+
amount: 1
137142

138143
- type: entity
139144
id: CrateGenericBiosuit

‎Resources/Prototypes/Catalog/Fills/Lockers/engineer.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
# SPDX-FileCopyrightText: 2024 a_person <alexanderbeaumont05@hotmail.com>
3333
# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
3434
# SPDX-FileCopyrightText: 2024 marc-pelletier <113944176+marc-pelletier@users.noreply.github.com>
35+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
3536
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
3637
#
3738
# SPDX-License-Identifier: AGPL-3.0-or-later AND MIT
@@ -174,6 +175,7 @@
174175
- id: ClothingShoesBootsMag
175176
- id: RCD
176177
- id: RCDAmmo
178+
- id: BoxInflatable # Funky change
177179

178180
- type: entity
179181
id: LockerEngineerFilled
@@ -187,6 +189,7 @@
187189
- id: trayScanner
188190
- id: RCD
189191
- id: RCDAmmo
192+
- id: BoxInflatable # Funky change
190193

191194
- type: entity
192195
id: ClosetRadiationSuitFilled

‎Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
# SPDX-FileCopyrightText: 2024 Ubaser <134914314+UbaserB@users.noreply.github.com>
1717
# SPDX-FileCopyrightText: 2024 lzk <124214523+lzk228@users.noreply.github.com>
1818
# SPDX-FileCopyrightText: 2025 Tay <td12233a@gmail.com>
19+
# SPDX-FileCopyrightText: 2025 Zergologist <114537969+Chedd-Error@users.noreply.github.com>
1920
# SPDX-FileCopyrightText: 2025 slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2021
# SPDX-FileCopyrightText: 2025 taydeo <td12233a@gmail.com>
2122
#
@@ -31,7 +32,8 @@
3132
NetworkConfigurator: 5
3233
PowerCellMedium: 5
3334
ClothingHandsGlovesColorYellow: 6
34-
BoxInflatable: 2
35+
BoxInflatable: 4 # 2 < 4 Funky change
36+
BoxInflatableFloor: 2 # Funky change
3537
ClothingHeadHatCone: 4
3638
contrabandInventory:
3739
CowToolboxFilled: 1

0 commit comments

Comments
 (0)