Skip to content

Commit

Permalink
Cherry-picked commit 559d7ac from space-wizards/space-station-14/master
Browse files Browse the repository at this point in the history
  • Loading branch information
Gyrandola authored and SimpleStation14 committed Apr 21, 2024
1 parent 3bf08c7 commit c2014ef
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 9 deletions.
21 changes: 12 additions & 9 deletions Resources/Prototypes/Entities/Objects/Misc/carpets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- type: Stack
stackType: FloorCarpetRed
- type: Tag
tags:
tags:
- CarpetRed
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: Carpet
Expand All @@ -34,7 +34,7 @@
- type: Stack
stackType: FloorCarpetBlack
- type: Tag
tags:
tags:
- CarpetBlack
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetBlack
Expand All @@ -53,7 +53,7 @@
- type: Stack
stackType: FloorCarpetBlue
- type: Tag
tags:
tags:
- CarpetBlue
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetBlue
Expand All @@ -72,7 +72,7 @@
- type: Stack
stackType: FloorCarpetGreen
- type: Tag
tags:
tags:
- CarpetGreen
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetGreen
Expand All @@ -91,7 +91,7 @@
- type: Stack
stackType: FloorCarpetOrange
- type: Tag
tags:
tags:
- CarpetOrange
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetOrange
Expand All @@ -109,6 +109,9 @@
heldPrefix: carpet-skyblue
- type: Stack
stackType: FloorCarpetSkyBlue
- type: Tag
tags:
- CarpetSBlue
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetSBlue
doAfter: 0.5
Expand All @@ -126,7 +129,7 @@
- type: Stack
stackType: FloorCarpetPurple
- type: Tag
tags:
tags:
- CarpetPurple
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetPurple
Expand All @@ -145,7 +148,7 @@
- type: Stack
stackType: FloorCarpetPink
- type: Tag
tags:
tags:
- CarpetPink
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetPink
Expand All @@ -164,7 +167,7 @@
- type: Stack
stackType: FloorCarpetCyan
- type: Tag
tags:
tags:
- CarpetCyan
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetCyan
Expand All @@ -183,7 +186,7 @@
- type: Stack
stackType: FloorCarpetWhite
- type: Tag
tags:
tags:
- CarpetWhite
- type: SpawnAfterInteract #Nuke after convert to FloorTile
prototype: CarpetWhite
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,9 @@
- type: Tag
id: CarpetPurple

- type: Tag
id: CarpetSBlue

- type: Tag
id: CarpetPink

Expand Down

0 comments on commit c2014ef

Please sign in to comment.