Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Jabak
2024-07-23 19:02:41 +03:00
parent 2204038ce6 003452b8e1
commit 624e6a9453
19 changed files with 16347 additions and 8230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Resources/Changelog/ChangelogWhite.yml
View File

@@ -6425,3 +6425,50 @@
id: 408
time: '2024-07-22T14:24:00.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/477
- author: Aviu
changes:
- message: "\u0422\u0435\u043F\u0435\u0440\u044C \u043F\u043E\u043B\u043D\u043E\u0440\
\u0430\u0437\u043C\u0435\u0440\u043D\u0430\u044F \u0433\u0430\u0440\u043D\u0438\
\u0442\u0443\u0440\u0430 \u0438 \u0448\u043B\u0435\u043C\u044B \u0441\u043A\u0430\
\u0444\u0430\u043D\u0434\u0440\u043E\u0432 \u0442\u043E\u043B\u044C\u043A\u043E\
\ \u0447\u0430\u0441\u0442\u0438\u0447\u043D\u043E \u0437\u0430\u0449\u0438\u0449\
\u0430\u044E\u0442 \u043E\u0442 \u0441\u0432\u0435\u0442\u043E\u0448\u0443\u043C\
\u043E\u0432\u044B\u0445 \u0433\u0440\u0430\u043D\u0430\u0442, \u0432 \u043E\
\u043F\u0440\u0435\u0434\u0435\u043B\u0451\u043D\u043D\u043E\u043C \u0440\u0430\
\u0434\u0438\u0443\u0441\u0435."
type: Tweak
- message: "\u0421\u0442\u0430\u043D \u043E\u0442 \u0441\u0432\u0435\u0442\u043E\
\u0448\u0443\u043C\u043E\u0432\u044B\u0445 \u0433\u0440\u0430\u043D\u0430\u0442\
\ \u0442\u0435\u043F\u0435\u0440\u044C \u0441\u043A\u0435\u0439\u043B\u0438\u0442\
\u0441\u044F \u043E\u0442 \u0440\u0430\u0441\u0441\u0442\u043E\u044F\u043D\u0438\
\u044F."
type: Tweak
- message: "\u0413\u043E\u043B\u043E\u0432\u0430 \u0443\u043B\u044C\u044F \u0442\
\u0435\u043F\u0435\u0440\u044C \u0447\u0430\u0441\u0442\u0438\u0447\u043D\u043E\
\ \u0437\u0430\u0449\u0438\u0449\u0430\u0435\u0442 \u043E\u0442 \u0441\u0432\
\u0435\u0442\u043E\u0448\u0443\u043C\u043E\u0432\u044B\u0445 \u0433\u0440\u0430\
\u043D\u0430\u0442."
type: Add
id: 409
time: '2024-07-22T17:06:02.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/478
- author: PointPNG
changes:
- message: "\u0424\u0438\u043A\u0441 \u0412\u0430\u043D\u0434\u0435\u0440\u0431\u043E\
\u043A\u0441\u0430."
type: Fix
- message: "\u041E\u0431\u043D\u043E\u0432\u043B\u0435\u043D\u0438\u0435 \u0412\u0430\
\u0439\u0442\u041C\u0443\u0441\u0430."
type: Add
id: 410
time: '2024-07-23T02:03:31.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/482
- author: Aviu
changes:
- message: "\u0425\u0430\u043C\u0435\u043B\u0435\u043E\u043D \u043F\u0440\u043E\u0435\
\u043A\u0442\u043E\u0440 \u0442\u0435\u043F\u0435\u0440\u044C \u0440\u0430\u0431\
\u043E\u0442\u0430\u0435\u0442 \u043B\u0443\u0447\u0448\u0435."
type: Fix
id: 411
time: '2024-07-23T15:34:13.0000000+00:00'
url: https://api.github.com/repos/frosty-dev/ss14-core/pulls/484

2
Resources/Locale/en-US/chameleon-projector/chameleon-projector.ftl
View File

@@ -1,2 +1,4 @@
chameleon-projector-inside-container = There's no room to scan that!
chameleon-projector-invalid = You can't disguise as that!
chameleon-projector-success = Projected new disguise.
chameleon-projector-set-disguise = Set Disguise

23969
Resources/Maps/White/WhiteMoose.yml
View File

File diff suppressed because it is too large Load Diff

76
Resources/Maps/White/WonderBox.yml
View File

@@ -22599,6 +22599,21 @@ entities:
parent: 2
- proto: Bola
entities:
- uid: 15785
components:
- type: Transform
pos: -16.008087,52.70469
parent: 2
- uid: 15786
components:
- type: Transform
pos: -15.883086,52.60045
parent: 2
- uid: 15808
components:
- type: Transform
pos: -15.737252,52.746384
parent: 2
- uid: 15989
components:
- type: Transform
@@ -74162,23 +74177,6 @@ entities:
- type: Transform
pos: 66.5,-59.5
parent: 2
- proto: Bola
entities:
- uid: 15785
components:
- type: Transform
pos: -15.931884,52.728363
parent: 2
- uid: 15786
components:
- type: Transform
pos: -15.885009,52.478363
parent: 2
- uid: 15808
components:
- type: Transform
pos: -15.619384,52.650238
parent: 2
- proto: d20Dice
entities:
- uid: 9515
@@ -127001,6 +126999,11 @@ entities:
- type: Transform
pos: 10.5,-0.5
parent: 2
- uid: 16546
components:
- type: Transform
pos: 27.5,0.5
parent: 2
- uid: 16547
components:
- type: Transform
@@ -129818,6 +129821,11 @@ entities:
- type: Transform
pos: 59.5,-2.5
parent: 2
- uid: 18913
components:
- type: Transform
pos: 4.5,-40.5
parent: 2
- proto: ProtolatheMachineCircuitboard
entities:
- uid: 16922
@@ -146917,14 +146925,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -59.5,5.5
parent: 2
- proto: SurvivalKnife
entities:
- uid: 19231
components:
- type: Transform
parent: 19230
- type: Physics
canCollide: False
- proto: SynthesizerInstrument
entities:
- uid: 16
@@ -150693,22 +150693,12 @@ entities:
parent: 2
- proto: ToiletEmpty
entities:
- uid: 19230
- uid: 16721
components:
- type: Transform
rot: -1.5707963267948966 rad
rot: 3.141592653589793 rad
pos: -35.5,38.5
parent: 2
- type: ContainerContainer
containers:
stash: !type:ContainerSlot
showEnts: False
occludes: True
ent: 19231
disposals: !type:Container
showEnts: False
occludes: True
ents: []
- uid: 19840
components:
- type: Transform
@@ -174139,6 +174129,12 @@ entities:
parent: 2
- proto: WindoorSecureArmoryLocked
entities:
- uid: 18569
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -8.5,50.5
parent: 2
- uid: 23349
components:
- type: Transform
@@ -174201,12 +174197,6 @@ entities:
- type: Transform
pos: 11.5,48.5
parent: 2
- uid: 23358
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: -8.5,50.5
parent: 2
- uid: 23395
components:
- type: Transform

2
Resources/Prototypes/Entities/Clothing/Ears/headsets_alt.yml
View File

@@ -9,7 +9,7 @@
state: icon_alt
- type: Clothing
equippedPrefix: alt
- type: FlashSoundSuppression # WD
- type: FlashSoundSuppression
- type: entity
parent: ClothingHeadsetAlt

24
Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
View File

@@ -185,7 +185,7 @@
Piercing: 0.9
Heat: 0.9
- type: FlashImmunity # WD edit
- type: FlashSoundSuppression # WD edit
- type: FlashSoundSuppression
#Brigmedic Hardsuit
- type: entity
@@ -214,7 +214,7 @@
highPressureMultiplier: 0.6
lowPressureMultiplier: 1000
- type: FlashImmunity # WD edit
- type: FlashSoundSuppression # WD edit
- type: FlashSoundSuppression
#Warden's Hardsuit
- type: entity
@@ -241,7 +241,7 @@
Piercing: 0.9
Heat: 0.9
- type: FlashImmunity # WD edit
- type: FlashSoundSuppression # WD edit
- type: FlashSoundSuppression
#Captain's Hardsuit
- type: entity
@@ -259,7 +259,7 @@
highPressureMultiplier: 0.3
lowPressureMultiplier: 1000
- type: FlashImmunity # WD edit
- type: FlashSoundSuppression # WD edit
- type: FlashSoundSuppression
#Inspector's Hardsuit
- type: entity
@@ -423,6 +423,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Blood-red Medic Hardsuit
- type: entity
@@ -450,6 +451,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Syndicate Elite Hardsuit
- type: entity
@@ -479,6 +481,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Syndicate Commander Hardsuit
- type: entity
@@ -506,6 +509,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Cybersun Juggernaut Hardsuit
- type: entity
@@ -531,6 +535,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Wizard Hardsuit
- type: entity
@@ -557,6 +562,9 @@
Piercing: 0.9
Heat: 0.9
- type: WizardClothes
- type: EyeProtection
- type: FlashImmunity
- type: FlashSoundSuppression
#Organic Space Suit
- type: entity
@@ -632,6 +640,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#ERT Chaplain Hardsuit
- type: entity
@@ -672,6 +681,7 @@
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#ERT Medical Hardsuit
- type: entity
parent: ClothingHeadHelmetHardsuitSyndieElite
@@ -688,6 +698,7 @@
color: "#adffec"
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#ERT Security Hardsuit
- type: entity
@@ -712,6 +723,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#ERT Janitor Hardsuit
- type: entity
@@ -729,6 +741,7 @@
color: "#cbadff"
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#CBURN Hardsuit
- type: entity
@@ -770,6 +783,7 @@
Heat: 0.9
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
#Deathsquad Hardsuit
- type: entity
@@ -797,6 +811,8 @@
Caustic: 0.95
- type: EyeProtection # WD edit
- type: FlashImmunity # WD
- type: FlashSoundSuppression
maxRange: 0
- type: ShowHealthBars
damageContainers:
- Biological

22
Resources/Prototypes/Entities/Objects/Devices/chameleon_projector.yml
View File

@@ -15,15 +15,12 @@
blacklist:
components:
- ChameleonDisguise # no becoming kleiner
- InsideEntityStorage # no clark kent going in phone booth and becoming superman
- MindContainer # no
- Pda # PDAs currently make you invisible /!\
polymorph:
entity: ChameleonDisguise
disguiseProto: ChameleonDisguise
- type: entity
noSpawn: true
parent: BaseMob
id: ChameleonDisguise
name: Urist McKleiner
components:
@@ -31,20 +28,11 @@
- type: Sprite
sprite: /Textures/Mobs/Species/Human/parts.rsi
state: full
# so people can attempt to pick it up
- type: Item
# so it can take damage
# projector system sets health to be proportional to mass
- type: Transform
noRot: true # players rotation and anchor is used instead
- type: InteractionOutline
- type: Clickable
- type: Damageable
- type: MobState
- type: MobThresholds
thresholds:
0: Alive
1: Critical
200: Dead
- type: MovementSpeedModifier
baseWalkSpeed: 1 # precise movement for the perfect spot
baseSprintSpeed: 5 # the jig is up
- type: ChameleonDisguise
# actions

1
Resources/Prototypes/_White/Entities/Clothing/Head/hive_head.yml
View File

@@ -20,6 +20,7 @@
- type: DeleteOnChangelingRefund
- type: FlashImmunity
- type: EyeProtection
- type: FlashSoundSuppression
- type: HiveHead
- type: entity