diff --git a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml index d305bc1346..1ac15b06dd 100644 --- a/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml +++ b/Resources/Prototypes/_Starlight/Entities/Objects/Specific/Medical/bandaid.yml @@ -100,22 +100,6 @@ - ReagentId: TranexamicAcid #Sunrise-Edit Quantity: 3 #Sunrise-Edit -- type: entity - id: PatchViagra - name: Viarga patch - parent: BasePatch - components: - - type: Sprite - state: bandaid-clown - - type: SolutionContainerManager - solutions: - patch: - maxVol: 20 - reagents: - - ReagentId: Aphrodisiac - Quantity: 20 - - - type: entity id: PatchMedical name: medical patch diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml index 4c9de5e93c..bda2193a37 100644 --- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/chemical-containers.yml @@ -1,16 +1,3 @@ -- type: entity - id: AphrodisiacChemistryBottle - name: aphrodisiac bottle - parent: BaseChemistryBottleFilled - components: - - type: SolutionContainerManager - solutions: - drink: - maxVol: 30 - reagents: - - ReagentId: Aphrodisiac - Quantity: 30 - - type: entity id: PolytrinicAcidChemistryBottle suffix: polytrinic acid diff --git a/Resources/Prototypes/_Sunrise/Reagents/fun.yml b/Resources/Prototypes/_Sunrise/Reagents/fun.yml index 6ae639aa34..b9f808bf8f 100644 --- a/Resources/Prototypes/_Sunrise/Reagents/fun.yml +++ b/Resources/Prototypes/_Sunrise/Reagents/fun.yml @@ -1,29 +1,3 @@ -- type: reagent - id: Aphrodisiac - name: reagent-name-aphrodisiac - group: Special - desc: reagent-desc-aphrodisiac - physicalDesc: reagent-physical-desc-aphrodisiac - flavor: funny - color: "#FF00E8" - metabolisms: - Narcotic: - effects: - - !type:PopupMessage - type: Local - messages: [ "aphrodisiac-effect1", "aphrodisiac-effect2" ] - probability: 0.1 - - !type:GenericStatusEffect - key: LoveEffect - component: LoveVision - time: 10.0 # Полная баночка = 5 минут - type: Add - - !type:Jitter - refresh: false - time: 1.0 # Полная баночка = 1 минута тряски - amplitude: 2 - frequency: 5 - - type: reagent id: Celliminol name: reagent-name-celliminol diff --git a/Resources/Prototypes/_Sunrise/Recipes/Reactions/fun.yml b/Resources/Prototypes/_Sunrise/Recipes/Reactions/fun.yml index dde609a72a..e69de29bb2 100644 --- a/Resources/Prototypes/_Sunrise/Recipes/Reactions/fun.yml +++ b/Resources/Prototypes/_Sunrise/Recipes/Reactions/fun.yml @@ -1,17 +0,0 @@ -- type: reaction - id: Aphrodisiac - minTemp: 120 - maxTemp: 300 - effects: - - !type:SpawnEntity - entity: EffectHearts - priority: 100 - reactants: - Omnizine: - amount: 2 - Leporazine: - amount: 3 - Wine: - amount: 3 - products: - Aphrodisiac: 5 diff --git a/Resources/migration.yml b/Resources/migration.yml index d5edd175b7..80429a911e 100644 --- a/Resources/migration.yml +++ b/Resources/migration.yml @@ -855,6 +855,9 @@ GrenadeFlash: GrenadeFlashTimer GrenadeFrag: GrenadeFragTimer WeaponEnergyGunMini: WeaponMiniEnergyGun GunSafeCombineSmallArms: SpawnerSafeSmallArms +AphrodisiacChemistryBottle: null +PatchViagra: null + MagazinePPSH41: MagazinePistolSubMachineGunPPSHExtended MagazinePPSH41Extended: null WeaponSTG44: null