Skip to content

Commit 93247e7

Browse files
Orvex07Orvex07
authored
Урон ксеносов | Количество боргов | Другие баги (#4053)
1 parent eacab3e commit 93247e7

File tree

17 files changed

+124
-96
lines changed

17 files changed

+124
-96
lines changed

‎Resources/Prototypes/Entities/Mobs/NPCs/animals.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,6 +1530,7 @@
15301530
- type: IdExaminable
15311531
- type: Tag
15321532
tags:
1533+
- MonkeyDeathgasp # Sunrise-edit
15331534
- VimPilot
15341535
- DoorBumpOpener
15351536
- AnomalyHost

‎Resources/Prototypes/Entities/Mobs/NPCs/scurret.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
prototype: ScurretDeathgasp # You monster
149149
- type: Tag
150150
tags:
151+
- ScurretDeathgasp # Sunrise-edit
151152
- DoorBumpOpener
152153
- FootstepSound
153154
- CanPilot

‎Resources/Prototypes/Voice/speech_emotes.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -569,6 +569,12 @@
569569
whitelist:
570570
components:
571571
- MobState
572+
# Sunrise-start
573+
blacklist:
574+
tags:
575+
- MonkeyDeathgasp
576+
- ScurretDeathgasp
577+
# Sunrise-end
572578
chatMessages: ["chat-emote-msg-deathgasp"]
573579
chatTriggers:
574580
- deathgasp
@@ -581,12 +587,22 @@
581587
id: MonkeyDeathgasp
582588
name: chat-emote-name-deathgasp
583589
icon: Interface/Emotes/deathgasp.png
590+
# Sunrise-start
591+
whitelist:
592+
tags:
593+
- MonkeyDeathgasp
594+
# Sunrise-end
584595
chatMessages: ["chat-emote-msg-deathgasp-monkey"]
585596

586597
- type: emote
587598
id: ScurretDeathgasp
588599
name: chat-emote-name-deathgasp
589600
icon: Interface/Emotes/deathgasp.png
601+
# Sunrise-start
602+
whitelist:
603+
tags:
604+
- ScurretDeathgasp
605+
# Sunrise-end
590606
chatMessages: ["chat-emote-msg-deathgasp-scurret"]
591607

592608
- type: emote

‎Resources/Prototypes/_Sunrise/Entities/Mobs/Cyborgs/borg_chassis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
- type: BorgSwitchableType
77
selectedBorgType: security
88
- type: Loadout
9-
prototypes: [ BorgArmorSiliconLoadoutMk2 ]
9+
prototypes: [ BorgArmorSiliconLoadout ]
1010
- type: Tag
1111
tags:
1212
- DoorBumpOpener

‎Resources/Prototypes/_Sunrise/Maps/bagel.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,15 @@
8383
Lawyer: [ 3, 3 ]
8484
# silicon
8585
StationAi: [ 1, 1 ]
86-
Borg: [ 2, 2 ]
87-
EngineerBorg: [ 2, 2 ]
88-
MiningBorg: [ 2, 2 ]
89-
JanitorBorg: [ 2, 2 ]
90-
ServiceBorg: [ 2, 2 ]
91-
ClownBorg: [ 2, 2 ]
92-
PeaceBorg: [ 2, 2 ]
93-
MedicalBorg: [ 4, 4 ]
94-
SecurityBorg: [ 4, 4 ]
86+
Borg: [ 3, 3 ]
87+
EngineerBorg: [ 1, 1 ]
88+
MiningBorg: [ 1, 1 ]
89+
JanitorBorg: [ 1, 1 ]
90+
ServiceBorg: [ 1, 1 ]
91+
ClownBorg: [ 1, 1 ]
92+
PeaceBorg: [ 1, 1 ]
93+
MedicalBorg: [ 1, 1 ]
94+
SecurityBorg: [ 1, 1 ]
9595
- type: StationGoal
9696
goals:
9797
- Shuttle

‎Resources/Prototypes/_Sunrise/Maps/barratry.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@
8181
Lawyer: [ 3, 3 ]
8282
# silicon
8383
StationAi: [ 1, 1 ]
84-
Borg: [ 2, 2 ]
85-
EngineerBorg: [ 2, 2 ]
86-
MiningBorg: [ 2, 2 ]
87-
JanitorBorg: [ 2, 2 ]
88-
ServiceBorg: [ 2, 2 ]
89-
ClownBorg: [ 2, 2 ]
90-
PeaceBorg: [ 2, 2 ]
91-
MedicalBorg: [ 4, 4 ]
92-
SecurityBorg: [ 4, 4 ]
84+
Borg: [ 3, 3 ]
85+
EngineerBorg: [ 1, 1 ]
86+
MiningBorg: [ 1, 1 ]
87+
JanitorBorg: [ 1, 1 ]
88+
ServiceBorg: [ 1, 1 ]
89+
ClownBorg: [ 1, 1 ]
90+
PeaceBorg: [ 1, 1 ]
91+
MedicalBorg: [ 1, 1 ]
92+
SecurityBorg: [ 1, 1 ]
9393
- type: StationGoal
9494
goals:
9595
- Shuttle

‎Resources/Prototypes/_Sunrise/Maps/box.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@
9292
#law (4)
9393
IAA: [ 1, 1 ]
9494
Lawyer: [ 1, 3 ]
95-
# silicon (12-23)
95+
# silicon (11)
9696
StationAi: [ 1, 1 ]
97-
Borg: [ 1, 2 ]
98-
EngineerBorg: [ 1, 2 ]
99-
MiningBorg: [ 1, 2 ]
100-
JanitorBorg: [ 1, 2 ]
101-
ServiceBorg: [ 1, 2 ]
102-
ClownBorg: [ 1, 2 ]
103-
PeaceBorg: [ 1, 2 ]
104-
MedicalBorg: [ 2, 4 ]
105-
SecurityBorg: [ 2, 4 ]
97+
Borg: [ 3, 3 ]
98+
EngineerBorg: [ 1, 1 ]
99+
MiningBorg: [ 1, 1 ]
100+
JanitorBorg: [ 1, 1 ]
101+
ServiceBorg: [ 1, 1 ]
102+
ClownBorg: [ 1, 1 ]
103+
PeaceBorg: [ 1, 1 ]
104+
MedicalBorg: [ 1, 1 ]
105+
SecurityBorg: [ 1, 1 ]
106106
- type: StationGoal
107107
goals:
108108
- Shuttle

‎Resources/Prototypes/_Sunrise/Maps/convex.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,15 +62,15 @@
6262
ResearchAssistant: [ 3, 5 ]
6363
# silicon
6464
StationAi: [ 1, 1 ]
65-
Borg: [ 2, 2 ]
66-
MedicalBorg: [ 4, 4 ]
67-
EngineerBorg: [ 2, 2 ]
68-
MiningBorg: [ 2, 2 ]
69-
JanitorBorg: [ 2, 2 ]
70-
ServiceBorg: [ 2, 2 ]
71-
ClownBorg: [ 2, 2 ]
72-
PeaceBorg: [ 2, 2 ]
73-
SecurityBorg: [ 4, 4 ]
65+
Borg: [ 3, 3 ]
66+
EngineerBorg: [ 1, 1 ]
67+
MiningBorg: [ 1, 1 ]
68+
JanitorBorg: [ 1, 1 ]
69+
ServiceBorg: [ 1, 1 ]
70+
ClownBorg: [ 1, 1 ]
71+
PeaceBorg: [ 1, 1 ]
72+
MedicalBorg: [ 1, 1 ]
73+
SecurityBorg: [ 1, 1 ]
7474
#security
7575
HeadOfSecurity: [ 1, 1 ]
7676
Warden: [ 2, 2 ]

‎Resources/Prototypes/_Sunrise/Maps/delta.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -92,17 +92,17 @@
9292
#law (2-4)
9393
IAA: [ 1, 1 ]
9494
Lawyer: [ 1, 3 ]
95-
# silicon (12-23)
95+
# silicon (11)
9696
StationAi: [ 1, 1 ]
97-
Borg: [ 1, 2 ]
98-
EngineerBorg: [ 1, 2 ]
99-
MiningBorg: [ 1, 2 ]
100-
JanitorBorg: [ 1, 2 ]
101-
ServiceBorg: [ 1, 2 ]
102-
ClownBorg: [ 1, 2 ]
103-
PeaceBorg: [ 1, 2 ]
104-
MedicalBorg: [ 2, 4 ]
105-
SecurityBorg: [ 2, 4 ]
97+
Borg: [ 3, 3 ]
98+
EngineerBorg: [ 1, 1 ]
99+
MiningBorg: [ 1, 1 ]
100+
JanitorBorg: [ 1, 1 ]
101+
ServiceBorg: [ 1, 1 ]
102+
ClownBorg: [ 1, 1 ]
103+
PeaceBorg: [ 1, 1 ]
104+
MedicalBorg: [ 1, 1 ]
105+
SecurityBorg: [ 1, 1 ]
106106
- type: StationGoal
107107
goals:
108108
- Shuttle

‎Resources/Prototypes/_Sunrise/Maps/fland.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@
8181
Lawyer: [ 3, 3 ]
8282
# silicon
8383
StationAi: [ 1, 1 ]
84-
Borg: [ 2, 2 ]
85-
EngineerBorg: [ 2, 2 ]
86-
MiningBorg: [ 2, 2 ]
87-
JanitorBorg: [ 2, 2 ]
88-
ServiceBorg: [ 2, 2 ]
89-
ClownBorg: [ 2, 2 ]
90-
PeaceBorg: [ 2, 2 ]
91-
MedicalBorg: [ 4, 4 ]
92-
SecurityBorg: [ 4, 4 ]
84+
Borg: [ 3, 3 ]
85+
EngineerBorg: [ 1, 1 ]
86+
MiningBorg: [ 1, 1 ]
87+
JanitorBorg: [ 1, 1 ]
88+
ServiceBorg: [ 1, 1 ]
89+
ClownBorg: [ 1, 1 ]
90+
PeaceBorg: [ 1, 1 ]
91+
MedicalBorg: [ 1, 1 ]
92+
SecurityBorg: [ 1, 1 ]
9393
- type: StationGoal
9494
goals:
9595
- Shuttle

0 commit comments

Comments
 (0)