Skip to content

Commit

Permalink
Mirror 26447: Curtains fix (#450)
Browse files Browse the repository at this point in the history
## Mirror of PR #26447: [Curtains
fix](space-wizards/space-station-14#26447) from
<img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `55b146a16c74d9b1ef4991f3ad3e22b15267f56f`

PR opened by <img
src="https://avatars.githubusercontent.com/u/141568243?v=4"
width="16"/><a href="https://github.com/Futuristic-OK">
Futuristic-OK</a> at 2024-03-26 13:45:20 UTC - merged at 2024-03-26
16:03:54 UTC

---

PR changed 2 files with 13 additions and 31 deletions.

The PR had the following labels:
- No C#


---

<details open="true"><summary><h1>Original Body</h1></summary>

> <!-- Please read these guidelines before opening your PR:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
> <!-- The text between the arrows are comments - they will not be
visible on your PR. -->
> 
> ## About the PR
> <!-- What did you change in this PR? -->
>  Now curtains can be built and opened inside walls and windows, etc.
> (There is a mistake that if the curtain is opened outside the 180
degree range, the sound of the curtains opening will not be played by
the player himself. All the surrounding players and ghosts will still
hear the sound.
> ## Why / Balance
> <!-- Why was it changed? Link any discussions or issues here. Please
discuss how this would affect game balance. -->
>  Why not?
> ## Technical details
> <!-- If this is a code change, summarize at high level how your new
code works. This makes it easier to review. -->
>  A few lines of code
> ## Media
> <!-- 
> PRs which make ingame changes (adding clothing, items, new features,
etc) are required to have media attached that showcase the changes.
> Small fixes/refactors are exempt.
> Any media may be used in SS14 progress reports, with clear credit
given.
> 
> If you're unsure whether your PR will require media, ask a maintainer.
> 
> Check the box below to confirm that you have in fact seen this (put an
X in the brackets, like [X]):
> -->
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> <!--
> List any breaking changes, including namespace, public
class/method/field changes, prototype renames; and provide instructions
for fixing them. This will be pasted in #codebase-changes.
> -->
> Erm... Nothing?
> 
> **Changelog**
> <!--
> Make players aware of new features and changes that could affect how
they play the game by adding a Changelog entry. Please read the
Changelog guidelines located at:
https://docs.spacestation14.io/en/getting-started/pr-guideline#changelog
> -->
> - tweak: Сurtains can be built and opened inside full tiles
> 
> <!--
> Make sure to take this Changelog template out of the comment block in
order for it to show up.
> 🆑
> - tweak: Сurtains can be built and opened inside full tiles
> -->
> 


</details>

Co-authored-by: SimpleStation14 <Unknown>
  • Loading branch information
SimpleStation14 authored Jun 14, 2024
1 parent 2138b8a commit 8594381
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 31 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
MaterialCloth1:
min: 1
max: 2
- type: WallMount
arc: 360

- type: entity
id: HospitalCurtains
Expand Down Expand Up @@ -350,4 +352,4 @@
graph: Curtains
node: CurtainsWhiteOpen
- type: Physics
canCollide: false
canCollide: false
40 changes: 10 additions & 30 deletions Resources/Prototypes/Recipes/Construction/furniture.yml
Original file line number Diff line number Diff line change
Expand Up @@ -731,9 +731,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsBlack
Expand All @@ -748,9 +746,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsBlue
Expand All @@ -765,9 +761,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsCyan
Expand All @@ -782,9 +776,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsGreen
Expand All @@ -799,9 +791,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsOrange
Expand All @@ -816,9 +806,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsPink
Expand All @@ -833,9 +821,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsPurple
Expand All @@ -850,9 +836,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsRed
Expand All @@ -867,9 +851,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: CurtainsWhite
Expand All @@ -884,9 +866,7 @@
state: closed
objectType: Structure
placementMode: SnapgridCenter
canBuildInImpassable: false
conditions:
- !type:TileNotBlocked
canBuildInImpassable: true

- type: construction
id: Bookshelf
Expand Down

0 comments on commit 8594381

Please sign in to comment.