Skip to content

Commit fb66455

Browse files
authored
Боты, чу-чуть про ботов и бейджики доступа (#303)
* fix-translate * commit2 * Revert "commit2" This reverts commit 47e4a12. * Revert "fix-translate" This reverts commit 65cd54a. * Reapply "fix-translate" This reverts commit ab4df34. * Reapply "commit2" This reverts commit caaab7e. * coolpr
1 parent 883362a commit fb66455

File tree

21 files changed

+175
-4
lines changed

21 files changed

+175
-4
lines changed
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
construction-recipe-boxhug-cardboard = коробка обнимашек
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
extended-access-group = Расширенный доступ
22
all-access-group = Полный доступ
3+
ancillary-access-group = Служебный доступ
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
ent-BoxHugEmpty = { ent-BoxHug }
2+
.desc = { ent-BoxHug.desc }
3+
.suffix = Пустой

Resources/Locale/ru-RU/ss14-ru/prototypes/_wega/entities/objects/misc/identification_cards.ftl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ ent-BlueShieldIDCard = ID-карта офицера синий щит
1212
.desc = { ent-IDCardStandard.desc }
1313
ent-PostmanIDCard = ID-карта почтальона
1414
.desc = { ent-IDCardStandard.desc }
15+
ent-IDCardNeck = бейджик служебного доступа
16+
.desc = Специальный бейджик с доступами служебной группы, позволяя проходить в большенство помещений. Снимайте только его перед использованием!

Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
PassengerPDA: 5
55
ClearPDA: 5
66
PassengerIDCard: 5
7+
IDCardNeck: 2 # Corvax-Wega-Add
78
ClothingHeadsetGrey: 5
89
RubberStampApproved: 1
910
RubberStampDenied: 1

Resources/Prototypes/Entities/Mobs/Cyborgs/xenoborgs.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
damageContainers:
4949
- Inorganic
5050
- Silicon
51+
- Android #Corvax-Wega-android-health-display
5152
- type: ItemSlots
5253
slots:
5354
cell_slot:

Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

Lines changed: 27 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
dataset: FirebotAd
161161

162162
- type: entity
163-
parent: MobSiliconBase
163+
parent: [ MobSiliconBase, MobCombat ] # Corvax-Wega-Add
164164
id: MobHonkBot
165165
name: honkbot
166166
description: Horrifying.
@@ -221,6 +221,16 @@
221221
path: /Audio/Items/bikehorn.ogg
222222
params:
223223
variation: 0.125
224+
# Corvax-Wega-start
225+
- type: MeleeWeapon
226+
attackRate: 0.75
227+
hidden: true
228+
soundHit:
229+
collection: BananiumHorn
230+
damage:
231+
groups:
232+
Brute: 0
233+
# Corvax-Wega-end
224234

225235
- type: entity
226236
parent: MobHonkBot
@@ -391,7 +401,7 @@
391401
templateId: head
392402

393403
- type: entity
394-
parent: MobSiliconBase
404+
parent: [MobSiliconBase, StripableInventoryBase] # Corvax-Wega-Add
395405
id: MobSupplyBot
396406
name: supplybot
397407
description: Delivers cargo!
@@ -433,6 +443,10 @@
433443
interfaces:
434444
enum.StorageUiKey.Key:
435445
type: StorageBoundUserInterface
446+
# Corvax-Wega-start
447+
enum.StrippingUiKey.Key:
448+
type: StrippableBoundUserInterface
449+
# Corvax-Wega-end
436450
- type: ContainerContainer
437451
containers:
438452
storagebase: !type:Container
@@ -460,6 +474,17 @@
460474
- Supply
461475
- type: Puller
462476
needsHands: false
477+
# Corvax-Wega-start
478+
- type: Body
479+
prototype: HugBot
480+
- type: ComplexInteraction
481+
- type: Hands
482+
showInHands: false
483+
canBeStripped: true
484+
- type: Inventory
485+
templateId: bots
486+
- type: OfferGiver
487+
# Corvax-Wega-end
463488

464489
- type: entity
465490
parent: [ MobSiliconBase, MobCombat ]

Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
id: ParamedicPDA
2929
ears: ClothingHeadsetMedical
3030
belt: ClothingBeltMedicalEMTFilled
31+
neck: IDCardNeck
3132
storage:
3233
back:
3334
- EmergencyRollerBedSpawnFolded

Resources/Prototypes/_Wega/Access/misc.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,23 @@
2626
- Theatre
2727
- GenpopEnter
2828
- GenpopLeave
29+
30+
- type: accessGroup
31+
id: AncillaryAccess
32+
name: ancillary-access-group
33+
consoleAvaible: true
34+
tags:
35+
- Bar
36+
- Cargo
37+
- Chapel
38+
- Engineering
39+
- External
40+
- Hydroponics
41+
- Janitor
42+
- Kitchen
43+
- Maintenance
44+
- Medical
45+
- Research
46+
- Salvage
47+
- Service
48+
- Theatre

Resources/Prototypes/_Wega/Catalog/Fills/Boxes/misc.yml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,22 @@
66
- type: EntityTableContainerFill
77
containers:
88
entity_storage: !type:NestedSelector
9-
tableId: MaintenanceLockerLoot
9+
tableId: MaintenanceLockerLoot
10+
11+
- type: entity
12+
parent: BoxCardboard
13+
id: BoxHugEmpty
14+
name: box of hugs
15+
suffix: empty
16+
description: A special box for sensitive people.
17+
components:
18+
- type: Sprite
19+
layers:
20+
- state: box_hug
21+
- state: heart
22+
- type: Item
23+
heldPrefix: hug
24+
- type: Tag
25+
tags:
26+
- BoxCardboard
27+
- BoxHug

0 commit comments

Comments
 (0)