diff --git a/Resources/Prototypes/Damage/containers.yml b/Resources/Prototypes/Damage/containers.yml index a7b36f2378f..3c37b51c1cd 100644 --- a/Resources/Prototypes/Damage/containers.yml +++ b/Resources/Prototypes/Damage/containers.yml @@ -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 - type: damageContainer id: Shield diff --git a/Resources/Prototypes/Damage/modifier_sets.yml b/Resources/Prototypes/Damage/modifier_sets.yml index 82de5d2aa1e..9a181299d69 100644 --- a/Resources/Prototypes/Damage/modifier_sets.yml +++ b/Resources/Prototypes/Damage/modifier_sets.yml @@ -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 +# flatReductions: +# Radiation: 4 +# WWDP EDIT STOP - type: damageModifierSet id: HardenedCircuits coefficients: Shock: .666 - + - type: damageModifierSet id: ExtremePoisonResistance coefficients: diff --git a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml index 95b7d224d46..c22551fdda7 100644 --- a/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml +++ b/Resources/Prototypes/Entities/Clothing/Eyes/hud.yml @@ -36,7 +36,7 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: entity parent: [ClothingEyesBase, ShowMedicalIcons] @@ -314,4 +314,4 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml b/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml index d266617ae42..b8d4ef9c7f8 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/plantbot.yml @@ -48,9 +48,9 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: ShowHealthIcons damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/weldbot.yml b/Resources/Prototypes/Entities/Mobs/NPCs/weldbot.yml index 3798090ea16..24274eaa9b6 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/weldbot.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/weldbot.yml @@ -48,9 +48,9 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: ShowHealthIcons damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT diff --git a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml index 33463c621cf..49c4b07faf2 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/ipc.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/ipc.yml @@ -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: diff --git a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml index f5e85a202be..2dea25e5492 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml @@ -53,7 +53,7 @@ - type: BlindHealing damageContainers: - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: StackPrice price: 2 diff --git a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml index 05abb6b644d..4e8df3da89d 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/cable_coils.yml @@ -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 @@ -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 @@ -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 diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index aa5226e14a0..997a524ac73 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -122,7 +122,7 @@ - type: WeldingHealing # Same as Brutepack - Estacao Pirata IPCs damageContainers: - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT damage: types: Blunt: -15 diff --git a/Resources/Prototypes/Traits/physical.yml b/Resources/Prototypes/Traits/physical.yml index 09a28de2af9..aaf5c3afd9a 100644 --- a/Resources/Prototypes/Traits/physical.yml +++ b/Resources/Prototypes/Traits/physical.yml @@ -744,7 +744,7 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: trait id: CyberEyesOmni @@ -786,7 +786,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: trait id: RestrictedGear @@ -1086,7 +1086,7 @@ damageContainers: - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: trait id: OmniEyesModule @@ -1131,7 +1131,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: trait id: LightAmplificationModule @@ -1290,6 +1290,7 @@ id: SuperiorRadiationShielding category: Physical points: -4 + enable: false # WD EDIT requirements: - !type:CharacterSpeciesRequirement species: diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/apocryphal.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/apocryphal.yml index f19a0826775..1dbdd263122 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/apocryphal.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/apocryphal.yml @@ -82,7 +82,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/corporate.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/corporate.yml index 0a98575f64c..dd2712faf34 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/corporate.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/corporate.yml @@ -80,7 +80,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/engineering-responsory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/engineering-responsory.yml index 041e13bacc2..51b6284a246 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/engineering-responsory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/engineering-responsory.yml @@ -76,7 +76,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals @@ -179,4 +179,4 @@ contents: - id: OxygenTankFilled - id: ClothingModsuitResponsoryEngineering - - id: ClothingMaskBreath \ No newline at end of file + - id: ClothingMaskBreath diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/inquisitory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/inquisitory.yml index fdaacb1ba64..8e4119b1989 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/inquisitory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/inquisitory.yml @@ -74,7 +74,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/janitorial-responsory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/janitorial-responsory.yml index 39b07d4533f..9ed72ee251c 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/janitorial-responsory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/janitorial-responsory.yml @@ -76,7 +76,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/leader-responsory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/leader-responsory.yml index 6bdde48baf0..a3d3000229e 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/leader-responsory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/leader-responsory.yml @@ -76,7 +76,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals @@ -180,4 +180,4 @@ contents: - id: OxygenTankFilled - id: ClothingModsuitResponsoryLeader - - id: ClothingMaskBreath \ No newline at end of file + - id: ClothingMaskBreath diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/medical-responsory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/medical-responsory.yml index 9d2e66230c9..929e9f46461 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/medical-responsory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/medical-responsory.yml @@ -76,7 +76,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals @@ -176,4 +176,4 @@ contents: - id: OxygenTankFilled - id: ClothingModsuitResponsoryMedical - - id: ClothingMaskBreath \ No newline at end of file + - id: ClothingMaskBreath diff --git a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/security-responsory.yml b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/security-responsory.yml index 3f04574037d..df9d2285971 100644 --- a/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/security-responsory.yml +++ b/Resources/Prototypes/_EE/Entities/NanoTrasen/Modsuits/security-responsory.yml @@ -76,7 +76,7 @@ - Biological - Inorganic - Silicon - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: PointLight color: "#FFDF00" - type: SealableClothingVisuals @@ -176,4 +176,4 @@ contents: - id: OxygenTankFilled - id: ClothingModsuitResponsorySecurity - - id: ClothingMaskBreath \ No newline at end of file + - id: ClothingMaskBreath diff --git a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml index 66e0383e867..75298d6633c 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Clothing/Eyes/glasses.yml @@ -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 diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml index 787f99ca414..1ba15b1a62c 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Eyes/punk_glasses.yml @@ -73,7 +73,7 @@ - Inorganic - Silicon - Biological - - SiliconUnshielded +# - SiliconUnshielded # WWDP EDIT - type: ShowHealthIcons damageContainers: - Biological diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index 4d4885da4c1..886eae72aa5 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -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