Skip to content

Commit

Permalink
bunch more error fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Peptide90 committed Apr 11, 2024
1 parent 5459a45 commit 1019036
Show file tree
Hide file tree
Showing 11 changed files with 30 additions and 204 deletions.
9 changes: 9 additions & 0 deletions Resources/IgnoredPrototypes/ignoredPrototypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@
#
# - /Prototypes/Guidebook
# - /Prototypes/Catalog/uplink_catalog.yml

- /Prototypes/Access
- /Prototypes/lobbyscreens.yml
- /Prototypes/radio_channels.yml
- /Prototypes/round_announcements.yml
- /Prototypes/SoundCollections/announcements.yml
# - /Prototypes/Entities/Objects/Consumable
# - /Prototypes/Entities/Objects/Weapons/Guns
# - /Prototypes/Entities/Objects/Weapons/Melee
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- type: ExaminableSolution
solution: pen
- type: Hypospray
onlyAffectsMobs: false
solutionName: pen
transferAmount: 30
- type: Appearance
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- type: Sprite
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
state: pill5
- type: Item
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: Food
forceFeedDelay: 1
Expand Down Expand Up @@ -34,6 +35,7 @@
components:
- type: Sprite
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: Item
state: pill1
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: SolutionContainerManager
Expand All @@ -53,6 +55,7 @@
- type: Sprite
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
state: pill4
- type: Item
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: SolutionContainerManager
solutions:
Expand All @@ -71,6 +74,7 @@
- type: Sprite
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
state: pill3
- type: Item
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: SolutionContainerManager
solutions:
Expand All @@ -89,6 +93,7 @@
- type: Sprite
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
state: pill2
- type: Item
sprite: Nuclear14/Objects/Specific/Medical/pills.rsi
- type: SolutionContainerManager
solutions:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
components:
- type: Sprite
sprite: Nuclear14/Objects/Tools/welder.rsi
netsync: false
layers:
- state: icon
map: ["enum.WelderLayers.Base"]
- state: welder_flame
map: ["enum.WelderLayers.Flame"]
shader: unshaded
visible: false
shader: unshaded
map: ["enum.ToggleVisuals.Layer"]
- type: Item
sprite: Nuclear14/Objects/Tools/welder.rsi
- type: PointLight
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
sprite: Nuclear14/Objects/Weapons/Melee/kitchen_knife.rsi
size: Small
state: icon
- type: Item
sprite: Nuclear14/Objects/Weapons/Melee/kitchen_knife.rsi

- type: entity
Expand Down
Original file line number Diff line number Diff line change
@@ -1,129 +1,9 @@
- type: entity
id: N14Airlock
parent: BaseStructure
parent: Airlock
name: airlock
description: It opens, it closes, and maybe crushes you.
abstract: true
placement:
mode: SnapgridCenter
components:
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Weapons/smash.ogg"
- type: InteractionOutline
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/basic.rsi
snapCardinals: true
layers:
- state: closed
map: ["enum.DoorVisualLayers.Base"]
- state: welded
map: ["enum.WeldableLayers.BaseWelded"]
- type: AnimationPlayer
- type: Physics
- type: Fixtures
fixtures:
fix1:
shape:
!type:PhysShapeAabb
bounds: "-0.49,-0.49,0.49,0.49" # don't want this colliding with walls or they won't close
density: 100
mask:
- FullTileMask
layer:
- AirlockLayer
- type: LayerChangeOnWeld
unWeldedLayer: AirlockLayer
weldedLayer: WallLayer
- type: ContainerFill
containers:
board: [ DoorElectronics ]
- type: Door
crushDamage:
types:
Blunt: 15
openSound:
path: /Audio/Machines/airlock_open.ogg
closeSound:
path: /Audio/Machines/airlock_close.ogg
denySound:
path: /Audio/Machines/airlock_deny.ogg
- type: ContainerContainer
containers:
board: !type:Container
- type: Weldable
time: 3
- type: Airlock
- type: DoorBolt
- type: Appearance
- type: WiresVisuals
- type: ApcPowerReceiver
powerLoad: 20
- type: ExtensionCableReceiver
- type: Electrified
enabled: false
usesApcPower: true
- type: WiresPanel
- type: Wires
BoardName: "Airlock Control"
LayoutId: Airlock
- type: DoorSignalControl
- type: DeviceNetwork
deviceNetId: Wireless
receiveFrequencyId: BasicDevice
- type: WirelessNetworkConnection
range: 200
- type: DeviceLinkSink
ports:
- Open
- Close
- Toggle
- AutoClose
- DoorBolt
- type: DeviceLinkSource
ports:
- DoorStatus
- type: SoundOnOverload
- type: SpawnOnOverload
- type: UserInterface
interfaces:
- key: enum.WiresUiKey.Key
type: WiresBoundUserInterface
- type: Airtight
fixVacuum: true
noAirWhenFullyAirBlocked: false
- type: RadiationBlocker
resistance: 3
- type: Occluder
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Metallic
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 500
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- type: Construction
graph: Airlock
node: airlock
containers:
- board
- type: PlacementReplacement
key: walls
- type: IconSmooth
key: walls
mode: NoSprite
- type: PaintableAirlock
group: Standard
- type: AccessReader
- type: StaticPrice
price: 150


- type: entity
parent: N14Airlock
Expand All @@ -143,6 +23,4 @@
denySound:
path: /Audio/Machines/airlock_deny.ogg
- type: Sprite
sprite: Nuclear14/Structures/Doors/FalloutDoors/vaultdoor.rsi
- type: PaintableAirlock
group: External
sprite: Nuclear14/Structures/Doors/FalloutDoors/vaultdoor.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@
supplyRampRate: 500
- type: WallMount
- type: WiresPanel
- type: Wires
BoardName: "APC"
LayoutId: APC
- type: WiresVisuals
- type: Damageable
damageContainer: Inorganic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,10 @@
- type: entity
abstract: true
id: N14PowerStorageBase
parent: BaseMachine
parent: BaseSMES
name: energy storage unit
description: A high-capacity energy storage unit.
placement:
mode: SnapgridCenter
components:
- type: AmbientSound
volume: -7
range: 3
sound:
path: /Audio/Ambience/Objects/periodic_beep.ogg
- type: Sprite
sprite: Nuclear14/Structures/Power/powerstorage.rsi
snapCardinals: true
Expand All @@ -28,59 +21,6 @@
- map: ["enum.SmesVisualLayers.Output"]
state: "smes-op1"
shader: unshaded
- type: Smes
- type: Appearance
- type: Battery
startingCharge: 0
- type: ExaminableBattery
- type: NodeContainer
examinable: true
nodes:
input:
!type:CableDeviceNode
nodeGroupID: HVPower
output:
!type:CableTerminalPortNode
nodeGroupID: HVPower
- type: BatteryCharger
voltage: High
node: output
- type: BatteryDischarger
voltage: High
node: input
- type: PowerNetworkBattery
maxSupply: 150000
maxChargeRate: 5000
supplyRampTolerance: 5000
supplyRampRate: 1000
- type: PointLight
radius: 1.5
energy: 1.6
color: "#c9c042"
castShadows: false
- type: WiresPanel
- type: Wires
BoardName: "SMES" # N14TODO: change board.
LayoutId: SMES
- type: Machine
board: SMESMachineCircuitboard
- type: StationInfiniteBatteryTarget
- type: Electrified
onHandInteract: false
onInteractUsing: false
onBump: false
requirePower: true
highVoltageNode: input
mediumVoltageNode: output
- type: BatterySensor
- type: DeviceNetwork
deviceNetId: AtmosDevices
receiveFrequencyId: AtmosMonitor
transmitFrequencyId: AtmosMonitor
prefix: device-address-prefix-smes
sendBroadcastAttemptEvent: true
examinableAddress: true
- type: WiredNetworkConnection
- type: Damageable
damageContainer: Inorganic
damageModifierSet: StrongMetallic
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,6 @@
intensitySlope: 2
totalIntensity: 200
- type: WiresPanel
- type: Wires
BoardName: "Substation"
LayoutId: Substation
- type: Machine
board: SubstationMachineCircuitboard
- type: StationInfiniteBatteryTarget
Expand Down
12 changes: 6 additions & 6 deletions Resources/Prototypes/SoundCollections/announcements.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
- type: soundCollection
id: RoundEnd
files:
- /Audio/Announcements/RoundEnd/apc_destroyed.ogg
- /Audio/Announcements/RoundEnd/disappointed.ogg
- /Audio/Announcements/RoundEnd/notevenpaidforthis.ogg
# - type: soundCollection
# id: RoundEnd
# files:
# - /Audio/Announcements/RoundEnd/apc_destroyed.ogg
# - /Audio/Announcements/RoundEnd/disappointed.ogg
# - /Audio/Announcements/RoundEnd/notevenpaidforthis.ogg
6 changes: 3 additions & 3 deletions Resources/Prototypes/round_announcements.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
- type: roundAnnouncement
id: Welcome
sound: /Audio/Announcements/welcome.ogg
# - type: roundAnnouncement
# id: Welcome
# sound: /Audio/Announcements/welcome.ogg

0 comments on commit 1019036

Please sign in to comment.