Apc and light construction partial fix (#5030)

* Fix APC placement type

* Fix wall tags.

* Change wall light placement to match how it actually is now

* Change spawn-entity wall light snap mode

Separate commit so it can be nixed out for JREV

* Default switch placement mode to SnapgridCenter
This commit is contained in:
20kdc
2021-10-26 15:15:02 +01:00
committed by GitHub
parent 9c3a603e7e
commit 632a4bcd95
5 changed files with 30 additions and 7 deletions

View File

@@ -53,6 +53,7 @@
- !type:DoActsBehavior
acts: ["Destruction"]
placement:
mode: SnapgridCenter
snap:
- Wallmount

View File

@@ -21,6 +21,7 @@
- key: enum.SignalTransmitterUiKey.Key
type: SignalPortSelectorBoundUserInterface
placement:
mode: SnapgridCenter
snap:
- Wallmount
@@ -41,6 +42,7 @@
outputs:
- name: pressed
placement:
mode: SnapgridCenter
snap:
- Wallmount
@@ -65,5 +67,6 @@
- type: ApcNetworkConnection
- type: ApcNetSwitch
placement:
mode: SnapgridCenter
snap:
- Wallmount

View File

@@ -5,6 +5,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/brick.rsi
@@ -34,6 +35,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/clock.rsi
@@ -63,6 +65,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/clown.rsi
@@ -93,6 +96,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/cult.rsi
@@ -123,6 +127,7 @@
components:
- type: Tag
tags:
- Wall
- Debug
- RCDDeconstructWhitelist
- type: Sprite
@@ -153,6 +158,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/diamond.rsi
@@ -182,6 +188,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/gold.rsi
@@ -211,6 +218,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/ice.rsi
@@ -240,6 +248,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/metal.rsi
@@ -269,6 +278,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/plasma.rsi
@@ -298,6 +308,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/plastic.rsi
@@ -359,6 +370,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/riveted.rsi
@@ -388,6 +400,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/sandstone.rsi
@@ -417,6 +430,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/silver.rsi
@@ -446,6 +460,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/solid.rsi
@@ -506,6 +521,7 @@
components:
- type: Tag
tags:
- Wall
- RCDDeconstructWhitelist
- type: Sprite
sprite: Structures/Walls/wood.rsi

View File

@@ -10,11 +10,13 @@
sprite: Structures/Wallmounts/Lighting/light_tube.rsi
state: off
objectType: Structure
placementMode: WallmountLight
placementMode: SnapgridCenter
canRotate: true
canBuildInImpassable: true
canBuildInImpassable: false
conditions:
- !type:WallmountCondition {}
# Need an *additional* condition here that forces there to be a wall in the opposite direction to the one used for placement.
# Also see below. Didn't add it b/c construction ECS work going on. Cheers, - 20kdc
- !type:TileNotBlocked {}
- type: construction
name: small wall light
@@ -28,11 +30,12 @@
sprite: Structures/Wallmounts/Lighting/light_small.rsi
state: off
objectType: Structure
placementMode: WallmountLight
placementMode: SnapgridCenter
canRotate: true
canBuildInImpassable: true
canBuildInImpassable: false
conditions:
- !type:WallmountCondition {}
# Same here. - 20kdc
- !type:TileNotBlocked {}
- type: construction
name: light switch

View File

@@ -10,7 +10,7 @@
sprite: Structures/Power/apc.rsi
state: apc0
objectType: Structure
placementMode: AlignWallProper
placementMode: SnapgridCenter
canBuildInImpassable: true
- type: construction