From aef75f6cda8b3d8696705976dc895b30b6c2bc39 Mon Sep 17 00:00:00 2001 From: py01 Date: Tue, 15 Oct 2019 01:59:38 -0700 Subject: [PATCH] removes skewium (#47056) * removes skewium and rotatium * Revert "removes skewium and rotatium" This reverts commit 878fc4903b3b44dd96e021993368e9ce89918e4c. * removes only skewium --- code/modules/cargo/bounties/reagent.dm | 1 - .../chemistry/reagents/toxin_reagents.dm | 36 ------------------- .../reagents/chemistry/recipes/toxins.dm | 7 ---- 3 files changed, 44 deletions(-) diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm index a9bf985d6ca..f7b48b45cc3 100644 --- a/code/modules/cargo/bounties/reagent.dm +++ b/code/modules/cargo/bounties/reagent.dm @@ -175,7 +175,6 @@ /datum/reagent/consumable/frostoil,\ /datum/reagent/toxin/slimejelly,\ /datum/reagent/teslium/energized_jelly,\ - /datum/reagent/toxin/skewium,\ /datum/reagent/toxin/mimesbane,\ /datum/reagent/medicine/strange_reagent,\ /datum/reagent/nitroglycerin,\ diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index f4f338a1df8..ee44c84eedc 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -721,42 +721,6 @@ animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING) ..() -/datum/reagent/toxin/skewium - name = "Skewium" - description = "A strange, dull coloured liquid that appears to warp back and forth inside its container. Causes any consumer to experience a visual phenomena similar to said warping." - silent_toxin = TRUE - reagent_state = LIQUID - color = "#ADBDCD" - metabolization_rate = 0.8 * REAGENTS_METABOLISM - toxpwr = 0.25 - taste_description = "skewing" - -/datum/reagent/toxin/skewium/on_mob_life(mob/living/carbon/M) - if(M.hud_used) - if(current_cycle >= 5 && current_cycle % 3 == 0) - var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"]) - var/matrix/skew = matrix() - var/intensity = 8 - skew.set_skew(rand(-intensity,intensity), rand(-intensity,intensity)) - var/matrix/newmatrix = skew - - if(prob(33)) // 1/3rd of the time, let's make it stack with the previous matrix! Mwhahahaha! - var/obj/screen/plane_master/PM = M.hud_used.plane_masters["[GAME_PLANE]"] - newmatrix = skew * PM.transform - - for(var/whole_screen in screens) - animate(whole_screen, transform = newmatrix, time = 5, easing = QUAD_EASING, loop = -1) - animate(transform = -newmatrix, time = 5, easing = QUAD_EASING) - return ..() - -/datum/reagent/toxin/skewium/on_mob_end_metabolize(mob/living/M) - if(M && M.hud_used) - var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"]) - for(var/whole_screen in screens) - animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING) - ..() - - /datum/reagent/toxin/anacea name = "Anacea" description = "A toxin that quickly purges medicines and metabolizes very slowly." diff --git a/code/modules/reagents/chemistry/recipes/toxins.dm b/code/modules/reagents/chemistry/recipes/toxins.dm index d2c52227e30..4544f4b675c 100644 --- a/code/modules/reagents/chemistry/recipes/toxins.dm +++ b/code/modules/reagents/chemistry/recipes/toxins.dm @@ -101,13 +101,6 @@ required_reagents = list(/datum/reagent/toxin/mindbreaker = 1, /datum/reagent/teslium = 1, /datum/reagent/toxin/fentanyl = 1) mix_message = "After sparks, fire, and the smell of mindbreaker, the mix is constantly spinning with no stop in sight." -/datum/chemical_reaction/skewium - name = "Skewium" - id = "Skewium" - results = list(/datum/reagent/toxin/skewium = 5) - required_reagents = list(/datum/reagent/toxin/rotatium = 2, /datum/reagent/toxin/plasma = 2, /datum/reagent/toxin/acid = 1) - mix_message = "Wow! it turns out if you mix rotatium with some plasma and sulphuric acid, it gets even worse!" - /datum/chemical_reaction/anacea name = "Anacea" id = /datum/reagent/toxin/anacea