placement fix

This commit is contained in:
keslik
2025-03-08 19:49:47 +03:00
parent 890160037f
commit 02b29c9be6
14 changed files with 165 additions and 164 deletions

View File

@@ -28,3 +28,12 @@ ghost-role-information-mercenary-standard-rules = Вы - опытный наём
Вы не помните ничего из своей предыдущей жизни, если администратор не сказал вам обратное. Вы не помните ничего из своей предыдущей жизни, если администратор не сказал вам обратное.
Вам разрешается помнить знания об игре в целом, например, как готовить, как использовать предметы и т.д. Вам разрешается помнить знания об игре в целом, например, как готовить, как использовать предметы и т.д.
Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа. Вам [color=red]НЕ[/color] разрешается помнить, имя, внешность и т.д. вашего предыдущего персонажа.
stamp-component-stamped-name-mercenary = Контракт
ent-DoorElectronicsMercenary = { ent-DoorElectronics }
.desc = { ent-DoorElectronics.desc }
ent-AirlockMercenaryLocked = { ent-Airlock }
.suffix = Наёмник, Закрыт
.desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора.

View File

@@ -18,4 +18,3 @@ stamp-component-stamped-name-syndicate = Синдикат
stamp-component-stamped-name-ce = Старший инженер stamp-component-stamped-name-ce = Старший инженер
stamp-component-stamped-name-iaa = Агент внутренних дел stamp-component-stamped-name-iaa = Агент внутренних дел
stamp-component-stamped-name-geraldiy = Древние stamp-component-stamped-name-geraldiy = Древние
stamp-component-stamped-name-mercenary = Контракт

View File

@@ -76,5 +76,3 @@ ent-DoorElectronicsTheatre = { ent-DoorElectronics }
.desc = { ent-DoorElectronics.desc } .desc = { ent-DoorElectronics.desc }
ent-DoorElectronicsVault = { ent-DoorElectronics } ent-DoorElectronicsVault = { ent-DoorElectronics }
.desc = { ent-DoorElectronics.desc } .desc = { ent-DoorElectronics.desc }
ent-DoorElectronicsMercenary = { ent-DoorElectronics }
.desc = { ent-DoorElectronics.desc }

View File

@@ -311,6 +311,3 @@ ent-AirlockSecurityLawyerLocked = { ent-Airlock }
.desc = { ent-Airlock.desc } .desc = { ent-Airlock.desc }
ent-AirlockSyndicateLocked = { ent-Airlock } ent-AirlockSyndicateLocked = { ent-Airlock }
.desc = { ent-Airlock.desc } .desc = { ent-Airlock.desc }
ent-AirlockMercenaryLocked = { ent-Airlock }
.suffix = Наёмник, Закрыт
.desc = { ent-Airlock.desc } В углу имеется небольшой символ Администрации сектора.

View File

@@ -1,3 +0,0 @@
- type: accessLevel # WD
id: Mercenary
name: id-card-access-level-mercenary

View File

@@ -411,25 +411,3 @@
- id: Cutlass - id: Cutlass
- id: WeaponRevolverPirate - id: WeaponRevolverPirate
- id: ClothingEyesEyepatch - id: ClothingEyesEyepatch
# WD. Mercenary
- type: entity
parent: ClothingBackpackMerc
id: ClothingBackpackMercFilledStandard
suffix: Filled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampMercenaries
- id: TelescopicBaton
- id: Zipties
- id: BoxMRE
- id: ThrowingKnivesKit
- id: CrowbarRed
- id: Tourniquet
- id: Lighter
- id: CigPackBlack
- id: SpaceCash500
- id: FlashlightLantern

View File

@@ -911,48 +911,3 @@
nameSegments: nameSegments:
- names_first - names_first
- names_last - names_last
# WD. Mercenary
- type: entity
name: mercenary standard spawner
id: MercenaryStandardSpawner
parent: MarkerBase
components:
- type: Sprite
layers:
- state: red
- sprite: Objects/Tools/appraisal-tool.rsi
state: icon
- type: RandomSpawner
prototypes:
- RandomHumanoidMercenaryStandard
chance: 1
- type: entity
id: RandomHumanoidMercenaryStandard
name: mercenary standard ghost role
components:
- type: Sprite
sprite: Objects/Tools/appraisal-tool.rsi
state: icon
- type: RandomHumanoidSpawner
settings: MercenaryStandard
- type: randomHumanoidSettings
id: MercenaryStandard
randomizeName: false
components:
- type: GhostRole
name: ghost-role-information-mercenary-standard-name
description: ghost-role-information-mercenary-standard-description
rules: ghost-role-information-mercenary-standard-rules
raffle:
settings: short
- type: GhostTakeoverAvailable
- type: Loadout
prototypes: [ MercenaryStandardGear ]
- type: RandomMetadata
nameSegments:
- names_first
- names_last

View File

@@ -310,11 +310,3 @@
components: components:
- type: AccessReader - type: AccessReader
access: [["Security"], ["Command"]] access: [["Security"], ["Command"]]
- type: entity # WD
parent: DoorElectronics
id: DoorElectronicsMercenary
suffix: Mercenary, Locked
components:
- type: AccessReader
access: [["Mercenary"]]

View File

@@ -656,25 +656,3 @@
- state: overlay_dirt - state: overlay_dirt
- type: Paper - type: Paper
content: book-text-janitor content: book-text-janitor
- type: entity # WD
parent: BookBase
id: BookMercenary
name: history of mercenaries from the beginning of time
description: The book tells about different forms of mercenary work in several historical periods. The author condemns the phenomenon itself, but it is still interesting to read.
components:
- type: Sprite
sprite: Objects/Misc/books.rsi
layers:
- state: paper
- state: cover_old
color: "#65802d"
- state: decor_diagonal
color: "#737334"
- state: decor_wingette_circle
color: gold
- state: icon_question
- state: detail_bookmark
color: "#0a0a09"
- type: Paper
content: book-text-merc

View File

@@ -950,16 +950,3 @@
- state: idseniorofficer - state: idseniorofficer
- type: PresetIdCard - type: PresetIdCard
job: SeniorOfficer job: SeniorOfficer
- type: entity # WD
parent: IDCardStandard
id: MercenaryIDCard
name: mercenary ID card
suffix: Merc
components:
- type: Sprite
layers:
- state: non_faction
- type: Access
tags:
- Mercenary

View File

@@ -286,16 +286,3 @@
- type: Sprite - type: Sprite
sprite: Objects/Misc/bureaucracy.rsi sprite: Objects/Misc/bureaucracy.rsi
state: stamp-inspector state: stamp-inspector
- type: entity # WD
name: mercenaries rubber stamp
parent: RubberStampBase
id: RubberStampMercenaries
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-mercenary
stampedColor: "#36451b"
stampState: "paper_stamp-mercenary"
- type: Sprite
state: stamp-mercenary

View File

@@ -1227,16 +1227,3 @@
- type: ContainerFill - type: ContainerFill
containers: containers:
board: [ DoorElectronicsSyndicateAgent ] board: [ DoorElectronicsSyndicateAgent ]
# WD
- type: entity
parent: Airlock
id: AirlockMercenaryLocked
suffix: Mercenary, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsMercenary ]
- type: Wires
layoutId: AirlockArmory

View File

@@ -450,22 +450,3 @@
back: ClothingBackpackSatchelScience back: ClothingBackpackSatchelScience
ears: ClothingHeadsetRD ears: ClothingHeadsetRD
outerClothing: ClothingOuterCoatRD outerClothing: ClothingOuterCoatRD
# WD. Mercenary
- type: startingGear
id: MercenaryStandardGear
equipment:
id: MercenaryIDCard
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercFilledStandard
head: ClothingHeadBandMerc
mask: ClothingMaskGasMerc
eyes: ClothingEyesGlassesMercenary
ears: ClothingHeadsetFreelance
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
shoes: ClothingShoesBootsMercFilled
pocket1: ClothingPouchMedical
pocket2: ClothingPouchGrenade
belt: WeaponLaserSvalinn

View File

@@ -0,0 +1,156 @@
# Equipment
- type: entity
parent: ClothingBackpackMerc
id: ClothingBackpackMercFilledStandard
suffix: Filled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: RubberStampMercenaries
- id: TelescopicBaton
- id: Zipties
- id: BoxMRE
- id: ThrowingKnivesKit
- id: CrowbarRed
- id: Tourniquet
- id: Lighter
- id: CigPackBlack
- id: SpaceCash500
- id: FlashlightLantern
- type: startingGear
id: MercenaryStandardGear
equipment:
id: MercenaryIDCard
jumpsuit: ClothingUniformJumpsuitMercenary
back: ClothingBackpackMercFilledStandard
head: ClothingHeadBandMerc
mask: ClothingMaskGasMerc
eyes: ClothingEyesGlassesMercenary
ears: ClothingHeadsetFreelance
gloves: ClothingHandsMercGlovesCombat
outerClothing: ClothingOuterVestWebMerc
shoes: ClothingShoesBootsMercFilled
pocket1: ClothingPouchMedical
pocket2: ClothingPouchGrenade
belt: WeaponLaserSvalinn
# Role
- type: entity
name: mercenary standard spawner
id: MercenaryStandardSpawner
parent: MarkerBase
components:
- type: Sprite
layers:
- state: red
- sprite: Clothing\Mask\merc.rsi
state: icon
- type: RandomSpawner
prototypes:
- RandomHumanoidMercenaryStandard
chance: 1
- type: entity
id: RandomHumanoidMercenaryStandard
name: mercenary standard ghost role
components:
- type: Sprite
sprite: Clothing\Mask\merc.rsi
state: icon
- type: RandomHumanoidSpawner
settings: MercenaryStandard
- type: randomHumanoidSettings
id: MercenaryStandard
randomizeName: false
components:
- type: GhostRole
name: ghost-role-information-mercenary-standard-name
description: ghost-role-information-mercenary-standard-description
rules: ghost-role-information-mercenary-standard-rules
raffle:
settings: short
- type: GhostTakeoverAvailable
- type: Loadout
prototypes: [ MercenaryStandardGear ]
- type: RandomMetadata
nameSegments:
- names_first
- names_last
# Book
- type: entity
parent: BookBase
id: BookMercenary
name: history of mercenaries from the beginning of time
description: The book tells about different forms of mercenary work in several historical periods. The author condemns the phenomenon itself, but it is still interesting to read.
components:
- type: Sprite
sprite: Objects/Misc/books.rsi
layers:
- state: paper
- state: cover_old
color: "#65802d"
- state: decor_diagonal
color: "#737334"
- state: decor_wingette_circle
color: gold
- state: icon_question
- state: detail_bookmark
color: "#0a0a09"
- type: Paper
content: book-text-merc
# Stamp
- type: entity
name: mercenaries rubber stamp
parent: RubberStampBase
id: RubberStampMercenaries
suffix: DO NOT MAP
components:
- type: Stamp
stampedName: stamp-component-stamped-name-mercenary
stampedColor: "#36451b"
stampState: "paper_stamp-mercenary"
- type: Sprite
state: stamp-mercenary
# Airlock
- type: accessLevel
id: Mercenary
name: id-card-access-level-mercenary
- type: entity
parent: DoorElectronics
id: DoorElectronicsMercenary
suffix: Mercenary, Locked
components:
- type: AccessReader
access: [["Mercenary"]]
- type: entity
parent: IDCardStandard
id: MercenaryIDCard
name: mercenary ID card
suffix: Merc
components:
- type: Sprite
layers:
- state: non_faction
- type: Access
tags:
- Mercenary
- type: entity
parent: Airlock
id: AirlockMercenaryLocked
suffix: Mercenary, Locked
components:
- type: ContainerFill
containers:
board: [ DoorElectronicsMercenary ]
- type: Wires
layoutId: AirlockArmory