Skip to content

Commit

Permalink
Engraved knukleduster hot fix
Browse files Browse the repository at this point in the history
  • Loading branch information
Kirus59 committed Aug 12, 2024
1 parent f4e222a commit 7dfade1
Show file tree
Hide file tree
Showing 22 changed files with 29 additions and 29 deletions.
6 changes: 3 additions & 3 deletions Resources/Locale/ru-RU/ss220/misc/case.ftl
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ent-GlassCaseEtchedBrassKnuckles = стеклянный кейс
ent-GlassCaseEngravedKnuckleduster = стеклянный кейс
.desc = Изготовлен на заказ для хранения ценных предметов. Крышка выполнена из закалённого стекла, а основание из дерева, выращенного на тропических планетах. Коробка украшена бархатной подушкой, чтобы предотвратить возможные царапины.
.suffix = Гравированный кастет
ent-GlassCaseEtchedBrassKnucklesFilled = стеклянный кейс
.desc = { ent-GlassCase.desc }
ent-GlassCaseEngravedKnuckledusterFilled = стеклянный кейс
.desc = { ent-GlassCaseEngravedKnuckleduster.desc }
.suffix = Гравированный кастет, Заполненый
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
ent-EtchedBrassKnuckles = гравированный кастет
ent-EngravedKnuckleduster = гравированный кастет
.desc = Гравированный кастет квартирмейстера, изготовленный по специальному заказу. Выдан в качестве средства борьбы с участившимися случаями краж личных вещей и материалов из отдела снабжения.
2 changes: 1 addition & 1 deletion Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
- id: ClothingHeadsetAltCargo
- id: BoxEncryptionKeyCargo
- id: ClothingWristWatchGold # SS220 Wrist Watch
- id: GlassCaseEtchedBrassKnucklesFilled # SS220 New Qm highrisk
- id: GlassCaseEngravedKnuckledusterFilled # SS220 New Qm highrisk

- type: entity
id: LockerCaptainFilledHardsuit
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Objectives/objectiveGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
MagbootsStealObjective: 1
CorgiMeatStealObjective: 1
ClipboardStealObjective: 1
EtchedBrassKnucklesStealObjective: 1 #SS220 New Qm highrisk
EngravedKnuckledusterStealObjective: 1 #SS220 New Qm highrisk
CaptainGunStealObjective: 0.5
CaptainJetpackStealObjective: 0.5
HandTeleporterStealObjective: 0.5
Expand Down
18 changes: 9 additions & 9 deletions Resources/Prototypes/SS220/Entities/Objects/Misc/case.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@

- type: entity
parent: [BaseItem, BaseItemCabinet]
id: GlassCaseEtchedBrassKnuckles
id: GlassCaseEngravedKnuckleduster
name: glass case
suffix: Etched brass knuckles
suffix: Engraved knuckleduster
description: Made to order for storing valuables. The lid is made of tempered glass, and the base is made of wood grown on tropical planets and decorated with a velvet pad to prevent possible scratches.
components:
- type: Item
size: Large
- type: Lock
- type: LockVisuals
- type: Sprite
sprite: SS220/Misc/etched_brass_knuckles_case.rsi
sprite: SS220/Misc/engraved_knuckleduster_case.rsi
layers:
- state: base
map: ["enum.StorageVisualLayers.Base"]
- state: brassknukles
- state: knuckleduster
map: ["enum.ItemCabinetVisuals.Layer"]
visible: true
- state: closed
Expand All @@ -31,7 +31,7 @@
ejectOnInteract: true
whitelist:
tags:
- EtchedBrassKnuckles
- EngravedKnuckleduster
ejectSound: /Audio/Machines/machine_switch.ogg
- type: GenericVisualizer
visuals:
Expand Down Expand Up @@ -74,14 +74,14 @@
price: 200

- type: entity
parent: GlassCaseEtchedBrassKnuckles
id: GlassCaseEtchedBrassKnucklesFilled
parent: GlassCaseEngravedKnuckleduster
id: GlassCaseEngravedKnuckledusterFilled
name: glass case
suffix: Etched brass knuckles, Filled
suffix: Engraved knuckleduster, Filled
components:
- type: AccessReader
access: [["Quartermaster"]]
- type: ContainerFill
containers:
ItemCabinet:
- EtchedBrassKnuckles
- EngravedKnuckleduster
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

#Quartermaster
- type: entity
name: brass knuckles
name: engraved knuckleduster
parent: BaseItem
id: EtchedBrassKnuckles
description: кастет
id: EngravedKnuckleduster
description: The quartermaster's engraved knuckleduster, made by special order. It was issued as a means of combating the increased cases of theft of personal belongings and materials from the supply department.
components:
- type: Sprite
sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi
state: icon
- type: Clothing
sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi
slots: [gloves]
- type: Item
size: Small
Expand All @@ -36,8 +36,8 @@
damageSound: /Audio/SS220/Weapons/brassKnukles/critical-hit.ogg
- type: Tag
tags:
- EtchedBrassKnuckles
- EngravedKnuckleduster
- type: StaticPrice
price: 1000
- type: StealTarget
stealGroup: EtchedBrassKnuckles
stealGroup: EngravedKnuckleduster
6 changes: 3 additions & 3 deletions Resources/Prototypes/SS220/Objectives/stealTargetGroups.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
state: icon

- type: stealTargetGroup
id: EtchedBrassKnuckles
name: engraved brass knuckles
id: EngravedKnuckleduster
name: engraved knuckleduster
sprite:
sprite: SS220/Objects/Weapons/Melee/etched_brass_knuckles.rsi
sprite: SS220/Objects/Weapons/Melee/engraved_knuckleduster.rsi
state: icon
4 changes: 2 additions & 2 deletions Resources/Prototypes/SS220/Objectives/traitor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

- type: entity
parent: BaseTraitorStealObjective
id: EtchedBrassKnucklesStealObjective
id: EngravedKnuckledusterStealObjective
components:
- type: NotJobRequirement
job: Quartermaster
- type: StealCondition
stealGroup: EtchedBrassKnuckles
stealGroup: EngravedKnuckleduster
owner: job-name-qm
2 changes: 1 addition & 1 deletion Resources/Prototypes/SS220/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -90,4 +90,4 @@

# New Qm highrisk
- type: Tag
id: EtchedBrassKnuckles
id: EngravedKnuckleduster
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"name": "unlocked"
},
{
"name": "brassknukles"
"name": "knuckleduster"
}
]
}

0 comments on commit 7dfade1

Please sign in to comment.