cmdrunematti
/
Delta-v
mirror of https://github.com/DeltaV-Station/Delta-v.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reorganized Turret Prototypes (#37863) 

* Reorganized turret prototypes

* Added circuit board to migrations

* Fixed frequencies

* Fixed typos and set the base control panel to abstract since it's technically not constructable yet

* Fixed the typo in the migrations

* Addressed changes

* Whitespace fixes

* Whitespace check fix

---------

Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
This commit is contained in:
Southbridge 2025-06-05 19:24:02 -04:00 committed by Quanteey
parent 856e2febe7
commit c7ec22e545
4 changed files with 113 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Resources/Migrations/migration.yml
View File

@ -574,7 +574,7 @@ PaxChemistryBottle: ChemistryBottlePax
MuteToxinChemistryBottle: ChemistryBottleMuteToxin
LeadChemistryBottle: ChemistryBottleLead
ToxinChemistryBottle: ChemistryBottleToxin
# 2025-03-29
ClothingBackpackDuffelSyndicateRaidBundle: ClothingBackpackSyndicateRaidBundle
@ -609,3 +609,15 @@ ClothingNeckCloakMiner: null
# 2025-05-22
MatterBinStockPart: MicroManipulatorStockPart
CapacitorStockPart: MicroManipulatorStockPart
# 2025-05-26 Turrets
WeaponEnergyTurretStation: WeaponEnergyTurretSecurity
WeaponEnergyTurretStationControlPanel: WeaponEnergyTurretSecurityControlPanel
WeaponEnergyTurretStationMachineCircuitboard: WeaponEnergyTurretSecurityMachineCircuitboard
# 2025-05-30
SpawnHonkBot: SpawnMobHonkBot
# 2025-06-01 - DeltaV: https://github.com/space-wizards/space-station-14/pull/38006 was never merged
#CrateFoodPizzaLarge: CrateFoodPizza
#CrateFoodSoftdrinksLarge: CrateFoodSoftdrinks

28
Resources/Prototypes/Entities/Objects/Devices/Circuitboards/Machine/turrets.yml
View File

@ -1,6 +1,7 @@
- type: entity
id: WeaponEnergyTurretStationMachineCircuitboard
abstract: true
parent: BaseMachineCircuitboard
id: WeaponEnergyTurretStationMachineCircuitboardBase
name: sentry turret machine board
description: A machine printed circuit board for a sentry turret.
components:
@ -13,7 +14,7 @@
TurretCompatibleWeapon:
amount: 1
defaultPrototype: WeaponLaserCannon
examineName: construction-insert-info-examine-name-laser-cannon
examineName: construction-insert-info-examine-name-laser-cannon
ProximitySensor:
amount: 1
defaultPrototype: ProximitySensor
@ -21,16 +22,27 @@
PowerCell:
amount: 1
defaultPrototype: PowerCellMedium
examineName: construction-insert-info-examine-name-power-cell
examineName: construction-insert-info-examine-name-power-cell
- type: entity
parent: WeaponEnergyTurretStationMachineCircuitboardBase
id: WeaponEnergyTurretAIMachineCircuitboard
parent: WeaponEnergyTurretStationMachineCircuitboard
name: AI sentry turret machine board
description: A machine printed circuit board for an AI sentry turret.
suffix: AI, Silicon
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: command
- type: MachineBoard
prototype: WeaponEnergyTurretAI
prototype: WeaponEnergyTurretAI
- type: entity
parent: WeaponEnergyTurretStationMachineCircuitboardBase
id: WeaponEnergyTurretSecurityMachineCircuitboard
suffix: Security
components:
- type: Sprite
sprite: Objects/Misc/module.rsi
state: security
- type: MachineBoard
prototype: WeaponEnergyTurretSecurity

54
Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_energy.yml
View File

@ -1,7 +1,8 @@
- type: entity
abstract: true
parent: [BaseWeaponEnergyTurret, ConstructibleMachine]
id: WeaponEnergyTurretStation
name: security turret
id: WeaponEnergyTurretStationBase
name: sentry turret
description: A high-tech autonomous weapons system designed to keep unauthorized personnel out of sensitive areas.
components:
- type: Fixtures
@ -72,8 +73,6 @@
- type: NpcFactionMember
factions:
- AllHostile
- type: AccessReader
access: [["Security"]]
- type: ProjectileBatteryAmmoProvider
proto: BulletEnergyTurretDisabler
fireCost: 100
@ -83,11 +82,6 @@
fireCost: 100
- proto: BulletEnergyTurretLaser
fireCost: 100
- type: TurretTargetSettings
exemptAccessLevels:
- Security
- Borg
- BasicSilicon
- type: DeployableTurret
retractedDamageModifierSetId: Metallic
deployedDamageModifierSetId: FlimsyMetallic
@ -140,16 +134,13 @@
locked: true
unlockOnClick: false
- type: LockedWiresPanel
- type: Machine
board: WeaponEnergyTurretStationMachineCircuitboard
- type: UseDelay
delay: 1.2
- type: entity
parent: WeaponEnergyTurretStation
parent: WeaponEnergyTurretStationBase
id: WeaponEnergyTurretAI
name: AI sentry turret
description: A high-tech autonomous weapons system under the direct control of a local artifical intelligence.
suffix: AI, Silicon
components:
- type: AccessReader
access: [["StationAi"], ["ResearchDirector"]]
@ -163,3 +154,38 @@
receiveFrequencyId: TurretControlAI
transmitFrequencyId: TurretAI
- type: entity
parent: WeaponEnergyTurretStationBase
id: WeaponEnergyTurretSecurity
suffix: Security
components:
- type: AccessReader
access: [["StationAi"], ["Security"]]
- type: TurretTargetSettings
exemptAccessLevels:
- Security
- Borg
- BasicSilicon
- type: Machine
board: WeaponEnergyTurretSecurityMachineCircuitboard
- type: DeviceNetwork
receiveFrequencyId: TurretControl
transmitFrequencyId: Turret
- type: entity
parent: WeaponEnergyTurretStationBase
id: WeaponEnergyTurretCommand
suffix: Command
components:
- type: AccessReader
access: [["StationAi"], ["Command"]]
- type: TurretTargetSettings
exemptAccessLevels:
- Command
- Borg
- BasicSilicon
- type: Machine
board: WeaponEnergyTurretSecurityMachineCircuitboard
- type: DeviceNetwork
receiveFrequencyId: TurretControl
transmitFrequencyId: Turret

53
Resources/Prototypes/Entities/Structures/Wallmounts/turret_controls.yml
View File

@ -45,10 +45,11 @@
- Wallmount
- type: entity
abstract: true
parent: WeaponEnergyTurretControlPanelFrame
id: WeaponEnergyTurretStationControlPanel
name: security turret control panel
description: A wall-mounted interface for remotely configuring the operational parameters of linked security turrets.
id: WeaponEnergyTurretStationControlPanelBase
name: sentry turret control panel
description: A wall-mounted interface for remotely configuring the operational parameters of linked sentry turrets.
components:
- type: Appearance
- type: Sprite
@ -79,13 +80,6 @@
0: { state: stun }
1: { state: lethal }
- type: StationAiWhitelist
- type: AccessReader
access: [["Security"]]
- type: TurretTargetSettings
exemptAccessLevels:
- Security
- Borg
- BasicSilicon
- type: DeployableTurretController
accessGroups:
- Cargo
@ -172,10 +166,9 @@
# node: finish
- type: entity
parent: WeaponEnergyTurretStationControlPanel
parent: WeaponEnergyTurretStationControlPanelBase
id: WeaponEnergyTurretAIControlPanel
name: AI sentry turret control panel
description: A wall-mounted interface that allows a local artifical intelligence to adjust the operational parameters of linked sentry turrets.
suffix: AI, Silicon
components:
- type: AccessReader
access: [["StationAi"], ["ResearchDirector"]]
@ -196,3 +189,37 @@
accessLevels:
- BasicSilicon
- Borg
- type: entity
parent: WeaponEnergyTurretStationControlPanelBase
id: WeaponEnergyTurretSecurityControlPanel
suffix: Security
components:
- type: AccessReader
access: [["StationAi"], ["Security"]]
#- type: ContainerFill - Will be added in a later PR
# containers:
# board:
# - WeaponEnergyTurretSecurityControlPanelElectronics
- type: TurretTargetSettings
exemptAccessLevels:
- Security
- BasicSilicon
- Borg
- type: entity
parent: WeaponEnergyTurretStationControlPanelBase
id: WeaponEnergyTurretCommandControlPanel
suffix: Command
components:
- type: AccessReader
access: [["StationAi"], ["Command"]]
#- type: ContainerFill - Will be added in a later PR
# containers:
# board:
# - WeaponEnergyTurretCommandControlPanelElectronics
- type: TurretTargetSettings
exemptAccessLevels:
- Command
- BasicSilicon
- Borg