From 2dc5df91f74e714b2f25958e5565665057694e09 Mon Sep 17 00:00:00 2001 From: "steinhauer.erhard" Date: Wed, 27 Mar 2024 17:18:33 +0300 Subject: [PATCH] everything is contraband, boosted mod resistances to laser based weapons --- .../Entities/Clothing/Belt/belts.yml | 2 + .../Entities/Clothing/Head/helmets.yml | 3 ++ .../Entities/Clothing/Head/hoods.yml | 1 + .../Entities/Clothing/OuterClothing/armor.yml | 3 ++ .../Entities/Clothing/OuterClothing/coats.yml | 2 + .../Clothing/OuterClothing/hardsuits.yml | 1 + .../Entities/Clothing/OuterClothing/misc.yml | 4 ++ .../Clothing/OuterClothing/wintercoats.yml | 3 ++ .../Entities/Clothing/Uniforms/jumpskirts.yml | 2 + .../Entities/Clothing/Uniforms/jumpsuits.yml | 5 ++ .../Clothing/Uniforms/ship_vs_ship.yml | 4 ++ .../Objects/Weapons/Guns/Basic/base_staff.yml | 1 + .../Objects/Weapons/Guns/Basic/base_wand.yml | 1 + .../Entities/Objects/Weapons/Melee/cult.yml | 3 ++ .../_NF/Body/Organs/synthetic_organs.yml | 3 ++ .../Mobs/NPCs/base_humanoid_hostile.yml | 46 ++++++++++++------- .../Mobs/NPCs/wizardfederationmob.yml | 2 +- .../Objects/Weapons/Melee/wizard_staff.yml | 5 ++ .../_NF/Roles/Jobs/Hostile/blood_cultists.yml | 4 +- 19 files changed, 75 insertions(+), 20 deletions(-) diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index 9f8097a7f0a..2e6a1d470d5 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -592,6 +592,7 @@ - Gun - BallisticAmmoProvider - CartridgeAmmo + - type: Contraband #frontier - type: entity parent: ClothingBeltStorageBase @@ -686,3 +687,4 @@ whitelist: tags: - WizardWand + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml index c1873338e23..0efb6a04c5e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/helmets.yml @@ -70,6 +70,7 @@ sprite: Clothing/Head/Helmets/swat_syndicate.rsi - type: Clothing sprite: Clothing/Head/Helmets/swat_syndicate.rsi + - type: Contraband #frontier #Light Riot Helmet - type: entity @@ -146,6 +147,7 @@ Slash: 0.8 Piercing: 0.9 Heat: 0.9 + - type: Contraband #frontier #SCAF Helmet - type: entity @@ -227,6 +229,7 @@ sprite: Clothing/Head/Helmets/wizardhelm.rsi - type: IngestionBlocker - type: IdentityBlocker + - type: Contraband #frontier #Fire Helmet - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml index 103bfe693dd..ebb4f79f41e 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hoods.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hoods.yml @@ -112,6 +112,7 @@ tags: - HidesHair - WhitelistChameleon + - type: Contraband #frontier - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index b4d1891b881..415021c145f 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -118,6 +118,7 @@ Piercing: 0.6 Heat: 0.5 - type: GroupExamine + - type: Contraband #frontier - type: entity parent: ClothingOuterBaseLarge @@ -173,6 +174,7 @@ sprite: Clothing/OuterClothing/Armor/magusblue.rsi - type: Clothing sprite: Clothing/OuterClothing/Armor/magusblue.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterArmorHeavy @@ -184,6 +186,7 @@ sprite: Clothing/OuterClothing/Armor/magusred.rsi - type: Clothing sprite: Clothing/OuterClothing/Armor/magusred.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBaseLarge diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml index 576560dc6ca..f5256958227 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml @@ -327,6 +327,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecap.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterCoatHoSTrench @@ -338,6 +339,7 @@ sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi - type: Clothing sprite: Clothing/OuterClothing/Coats/syndicate/coatsyndiecaparmored.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index a7b53cf503c..c79b1d035d4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -666,6 +666,7 @@ - type: HeldSpeedModifier - type: ToggleableClothing clothingPrototype: ClothingHeadHelmetHardsuitWizard + - type: Contraband #frontier #Ling Space Suit - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index ed0e2e89262..2d9a9c8c735 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -127,6 +127,7 @@ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/cultrobes.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -174,6 +175,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/violetwizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -185,6 +187,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/wizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase @@ -196,6 +199,7 @@ sprite: Clothing/OuterClothing/Misc/redwizard.rsi - type: Clothing sprite: Clothing/OuterClothing/Misc/redwizard.rsi + - type: Contraband #frontier - type: entity parent: ClothingOuterBase diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml index 33f4260d83e..5deebd69ac1 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml @@ -455,6 +455,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecap.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterWarden @@ -468,6 +469,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/coatsyndiecaparmored.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterCoatToggleable @@ -481,6 +483,7 @@ sprite: Clothing/OuterClothing/WinterCoats/syndicate/wintercoatsyndie.rsi - type: ToggleableClothing clothingPrototype: ClothingHeadHatHoodWinterSyndie + - type: Contraband #frontier - type: entity parent: ClothingOuterWinterCoat diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 6375c15abb3..7c7be0d97cd 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -613,6 +613,7 @@ sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/operative_s.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformSkirtBase @@ -727,6 +728,7 @@ sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpskirt/syndieformaldress.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformSkirtBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml index 4493e400ad3..1677cce8346 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml @@ -902,6 +902,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicateblack.rsi + - type: Contraband #frontier - type: entity parent: UnsensoredClothingUniformBase @@ -913,6 +914,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatepink.rsi + - type: Contraband #frontier - type: entity parent: UnsensoredClothingUniformBase @@ -924,6 +926,7 @@ sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/pyjamasyndicatered.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase @@ -979,6 +982,7 @@ sprite: Clothing/Uniforms/Jumpsuit/operative.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/operative.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase @@ -1273,6 +1277,7 @@ sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/syndieformal.rsi + - type: Contraband #frontier - type: entity parent: ClothingUniformBase diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml index d6999a0a265..887d3656b3e 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/ship_vs_ship.yml @@ -24,6 +24,7 @@ sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/recruit_syndie.rsi + - type: Contraband #frontier #Repairman - type: entity @@ -47,6 +48,7 @@ sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/repairman_syndie.rsi + - type: Contraband #frontier #Paramedic - type: entity @@ -70,6 +72,7 @@ sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/paramedic_syndie.rsi + - type: Contraband #frontier #HEADS OF STAFF #Chief Engineer @@ -94,3 +97,4 @@ sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/ce_syndie.rsi + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml index 9cab4cac25a..68d268ad813 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_staff.yml @@ -20,4 +20,5 @@ - type: Tag tags: - WizardStaff + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml index c4a937ee2cd..bef22043e14 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_wand.yml @@ -25,3 +25,4 @@ - type: Tag tags: - WizardWand + - type: Contraband #frontier diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml index db24d3e2cd0..0b126f3503d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/cult.yml @@ -21,6 +21,7 @@ slots: - back - type: DisarmMalus + - type: Contraband #frontier - type: entity name: eldritch blade @@ -45,6 +46,7 @@ slots: - back - type: DisarmMalus + - type: Contraband #frontier - type: entity name: unholy halberd @@ -83,3 +85,4 @@ - back - type: UseDelay delay: 1 + - type: Contraband #frontier diff --git a/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml b/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml index 8ac79e2c845..23f79bb8fdf 100644 --- a/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml +++ b/Resources/Prototypes/_NF/Body/Organs/synthetic_organs.yml @@ -15,6 +15,7 @@ # - id: Poison # - id: Narcotic # - id: Toxins + - type: Contraband - type: entity id: OrganSyntheticLiver @@ -36,6 +37,7 @@ rateModifier: 10 # removes Narcotic fast - id: Toxins rateModifier: 20 # removes Toxins fast + - type: Contraband - type: entity id: OrganSyntheticKidneys @@ -51,3 +53,4 @@ maxReagents: 5 metabolizerTypes: [Human] removeEmpty: true + - type: Contraband diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml index ded5066ffd0..c08e3577eba 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/base_humanoid_hostile.yml @@ -14,6 +14,33 @@ thermalRegulationTemperatureThreshold: 25 - type: MovedByPressure +- type: entity + save: false + id: MobPassiveRegen + abstract: true + components: + - type: PassiveDamage # Slight passive regen. + allowedStates: + - Alive + damageCap: 400 + damage: + groups: + Brute: -1 + Burn: -10 + Airloss: -1 + Toxin: -7 + Genetic: -7 + +- type: entity + save: false + id: MobLaserReflect + abstract: true + components: + - type: Reflect + reflectProb: 0.7 + reflects: + - Energy + # Human NPC, uses equipment, immune to vacuum/low pressure # but otherwise should be the same as base line human mob # Going to use this prototype later for other mobs @@ -25,6 +52,7 @@ - MobAtmosNF - MobBloodstream - MobFlammable + - MobLaserReflect - BaseMobSpecies id: MobHumanoidHostileBase components: @@ -77,6 +105,7 @@ abstract: true parent: - MobAtmosNF + - MobLaserReflect - SimpleSpaceMobBase id: MobNonHumanHostileBase components: @@ -138,20 +167,3 @@ price: 1500 # Kidnapping a living person and selling them for cred is a good move. deathPenalty: 0.5 # However they really ought to be living and intact, otherwise they're worth 2x less. - type: Contraband - -- type: entity - save: false - id: MobPassiveRegen - abstract: true - components: - - type: PassiveDamage # Slight passive regen. - allowedStates: - - Alive - damageCap: 400 - damage: - groups: - Brute: -1 - Burn: -1 - Airloss: -1 - Toxin: -3 - Genetic: -3 diff --git a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml index feba71b29b1..e169cff791f 100644 --- a/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml +++ b/Resources/Prototypes/_NF/Entities/Mobs/NPCs/wizardfederationmob.yml @@ -19,7 +19,7 @@ - DeathAcidifierImplantNF - type: Reflect enabled: true - reflectProb: .25 + reflectProb: .35 spread: 90 # Immunity to Heat damage from being lit on fire - type: Flammable diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml index 73986ae96b2..e30e0863509 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/wizard_staff.yml @@ -21,6 +21,7 @@ - type: Tag tags: - WizardStaff + - type: Contraband - type: entity name: red wizard staff @@ -31,6 +32,7 @@ heldPrefix: animation - type: Sprite state: animation + - type: Contraband - type: entity name: violet wizard staff @@ -41,6 +43,7 @@ heldPrefix: chaos - type: Sprite state: chaos + - type: Contraband - type: entity name: soap wizard staff @@ -51,6 +54,7 @@ heldPrefix: healing - type: Sprite state: healing + - type: Contraband # Blood Cult - type: entity @@ -68,3 +72,4 @@ animation: WeaponArcThrust soundHit: path: /Audio/Effects/bite.ogg + - type: Contraband diff --git a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml index 230f2604931..aae13cc4ee8 100644 --- a/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml +++ b/Resources/Prototypes/_NF/Roles/Jobs/Hostile/blood_cultists.yml @@ -20,8 +20,8 @@ gloves: ClothingHandsGlovesCombat outerClothing: ClothingOuterArmorCult inhand: -# - EldritchBlade - - RitualDagger + - EldritchBlade +# - RitualDagger # Cultist (Melee) - type: startingGear