Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions Resources/Prototypes/Damage/containers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,16 @@
- Heat
- Shock

- type: damageContainer
id: SiliconUnshielded
supportedGroups:
- Brute
supportedTypes:
- Heat
- Shock
- Radiation
# WWDP EDIT START
#- type: damageContainer
# id: SiliconUnshielded
# supportedGroups:
# - Brute
# supportedTypes:
# - Heat
# - Shock
# - Radiation
# WWDP EDIT STOP
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# WWDP EDIT END


- type: damageContainer
id: Shield
Expand Down
16 changes: 9 additions & 7 deletions Resources/Prototypes/Damage/modifier_sets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,19 +406,21 @@
Blunt: 1
Slash: 1
Piercing: 1
flatReductions:
Radiation: 1
# WWDP EDIT START
# flatReductions:
# Radiation: 1

- type: damageModifierSet
id: SuperiorRadiationShielding
flatReductions:
Radiation: 4
#- type: damageModifierSet
# id: SuperiorRadiationShielding
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Тебе кролик указал, что у тебя этот damageModifierSet используется в одном из трейтов.
Ты ничего не поменял, но пометил его доёб, как "резолвед".
Почему?

# flatReductions:
# Radiation: 4
# WWDP EDIT STOP
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

# WWDP EDIT END


- type: damageModifierSet
id: HardenedCircuits
coefficients:
Shock: .666

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

\n

- type: damageModifierSet
id: ExtremePoisonResistance
coefficients:
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Clothing/Eyes/hud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT

- type: entity
parent: [ClothingEyesBase, ShowMedicalIcons]
Expand Down Expand Up @@ -314,4 +314,4 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: ShowHealthIcons
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Mobs/NPCs/weldbot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,9 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: ShowHealthIcons
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
12 changes: 7 additions & 5 deletions Resources/Prototypes/Entities/Mobs/Player/ipc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,14 @@
- SiliconEmotes
- SiliconMob
- type: Damageable
damageContainer: SiliconUnshielded
damageContainer: Silicon # WWDP EDIT: "SiliconUnshielded" --> "Silicon"
damageModifierSet: IPC
- type: Barotrauma
damage:
types:
Heat: 0.55 #per second, scales with pressure and other constants. Uniquely Heat instead of blunt, to simulate mechanical overheating in vacuum. IPCs are normally air cooled.
# WWDP EDIT START
# - type: Barotrauma
# damage:
# types:
# Heat: 0.55 #per second, scales with pressure and other constants. Uniquely Heat instead of blunt, to simulate mechanical overheating in vacuum. IPCs are normally air cooled.
# WWDP EDIT STOP
- type: Bloodstream
bloodlossDamage:
types:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
- type: BlindHealing
damageContainers:
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: StackPrice
price: 2

Expand Down
6 changes: 3 additions & 3 deletions Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
delay: 1.8
damageContainers:
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
damage:
types: # these are all split across multiple types. IPCs can still take cold damage, they just heavily resist it.
Heat: -8
Expand Down Expand Up @@ -161,7 +161,7 @@
delay: 1.2
damageContainers:
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
damage:
types: # these are all split across multiple types. IPCs can still take cold damage, they just heavily resist it.
Heat: -4
Expand Down Expand Up @@ -246,7 +246,7 @@
delay: 0.6
damageContainers:
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
damage:
types: # these are all split across multiple types. IPCs can still take cold damage, they just heavily resist it.
Heat: -2
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Objects/Tools/welders.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
- type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs
damageContainers:
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
damage:
types:
Blunt: -15
Expand Down
9 changes: 5 additions & 4 deletions Resources/Prototypes/Traits/physical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,7 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT

- type: trait
id: CyberEyesOmni
Expand Down Expand Up @@ -786,7 +786,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT

- type: trait
id: RestrictedGear
Expand Down Expand Up @@ -1086,7 +1086,7 @@
damageContainers:
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT

- type: trait
id: OmniEyesModule
Expand Down Expand Up @@ -1131,7 +1131,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT

- type: trait
id: LightAmplificationModule
Expand Down Expand Up @@ -1290,6 +1290,7 @@
id: SuperiorRadiationShielding
category: Physical
points: -4
enable: false # WD EDIT
requirements:
- !type:CharacterSpeciesRequirement
species:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down Expand Up @@ -179,4 +179,4 @@
contents:
- id: OxygenTankFilled
- id: ClothingModsuitResponsoryEngineering
- id: ClothingMaskBreath
- id: ClothingMaskBreath
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down Expand Up @@ -180,4 +180,4 @@
contents:
- id: OxygenTankFilled
- id: ClothingModsuitResponsoryLeader
- id: ClothingMaskBreath
- id: ClothingMaskBreath
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down Expand Up @@ -176,4 +176,4 @@
contents:
- id: OxygenTankFilled
- id: ClothingModsuitResponsoryMedical
- id: ClothingMaskBreath
- id: ClothingMaskBreath
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: PointLight
color: "#FFDF00"
- type: SealableClothingVisuals
Expand Down Expand Up @@ -176,4 +176,4 @@
contents:
- id: OxygenTankFilled
- id: ClothingModsuitResponsorySecurity
- id: ClothingMaskBreath
- id: ClothingMaskBreath
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: ShowHealthIcons
damageContainers:
- Biological
- Inorganic
- Silicon
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: Construction # WWDP
graph: GlassesMedSecHUD
node: glassesMedSec
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
- Inorganic
- Silicon
- Biological
- SiliconUnshielded
# - SiliconUnshielded # WWDP EDIT
- type: ShowHealthIcons
damageContainers:
- Biological
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,10 @@
- type: Healing # Used for replacing rad-fried circuitry in Silicons
delay: 3
damageContainers:
- SiliconUnshielded
- Silicon # WWDP EDIT: "SiliconUnshielded" --> "Silicon"
damage:
types: # Circuits are very expensive and hard to obtain. Probably needs to be adjusted after testing.
Radiation: -25
# Radiation: -25 # WWDP EDIT
Heat: -10
Shock: -20

Expand Down
Loading