From bab7a4d7883af8a5e5d82781a31a415b05b74e47 Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 24 Sep 2014 20:59:04 +0300 Subject: [PATCH 1/2] Telebaton Nerf Changes the weaken to stunbaton levels. Original derp by me. --- code/game/objects/items/weapons/swords_axes_etc.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/swords_axes_etc.dm b/code/game/objects/items/weapons/swords_axes_etc.dm index a5c01637..ec2185ee 100644 --- a/code/game/objects/items/weapons/swords_axes_etc.dm +++ b/code/game/objects/items/weapons/swords_axes_etc.dm @@ -181,7 +181,7 @@ // var/obj/item/c_hand UNFUCK WHEN YOU HAVE TIME AND KNOWLEDGE // var/hand if(user.zone_sel.selecting == "r_leg" || user.zone_sel.selecting == "l_leg") - target.Weaken(20) + target.Weaken(10) //nerfed, because yes. /* if(user.zone_sel.selecting == "l_hand" || user.zone_sel.selecting == "l_arm") c_hand = "l_hand" target.u_equip(c_hand) From 02b5f82d0c194b13292bf3ba7f76f5a52ca1b64c Mon Sep 17 00:00:00 2001 From: skull132 Date: Wed, 24 Sep 2014 21:06:00 +0300 Subject: [PATCH 2/2] New Chemicals Adds two very lethal chemicals. Need balance testing. --- code/modules/reagents/Chemistry-Reagents.dm | 72 ++++++++++++++++++++- code/modules/reagents/Chemistry-Recipes.dm | 15 +++++ 2 files changed, 86 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index 5db22131..39030278 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -2133,6 +2133,77 @@ datum toxpwr = 2 meltprob = 30 + toxin/philodexphid + name = "Philodexphid" + id = "philodex" + description = "Aggressively destroys the central nervous system." + reagent_state = LIQUID + color = "#000067" + overdose = REAGENTS_OVERDOSE + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(!data) data = 1 + switch(data) + if(1 to 5) + if(prob(50)) + M << "\red Your muscles are aching." + if(prob(5)) + M.visible_message("\blue [M]'s muscles lock up violently and they crumple to the floor!", "\red Your muscles lock up with great pain! You fall to the ground!") + M.weakened = max(M.weakened, 3) + if(prob(2)) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 +// M << "DEBUG: YOU HAVE 1 to 5 UNITS IN YOU!" + if(5 to 10) + if(prob(15)) + M.confused = max(M.confused+3,0) + if(prob(30)) + if (!M.stuttering) M.stuttering = 1 + M.stuttering += 3 + if(prob(5)) + M.visible_message("\blue [M]'s muscles lock up violently and they crumple to the floor!", "\red Your muscles lock up with great pain! You fall to the ground!") + M.weakened = max(M.weakened, 3) +// M << "DEBUG: YOU HAVE 5 to 10 UNITS IN YOU!" + if(10 to 15) + if(prob(5)) + M.Paralyse(10) + if(15 to INFINITY) + var/mob/living/carbon/human/H = M + var/datum/organ/internal/eyes/E = H.internal_organs["eyes"] + if(istype(E)) + if(E.damage < 100) + E.damage += 1 + data++ + ..() + return + + toxin/ecyeipate + name = "Ecyeipate" + id = "ecye" + description = "Causes aggressive convulsions of large muscle groups." + reagent_state = LIQUID + color = "#000067" + overdose = REAGENTS_OVERDOSE + + on_mob_life(var/mob/living/M as mob) + if(!M) M = holder.my_atom + if(!data) data = 1 + switch(data) + if(1 to 10) + if(prob(10)) + M.visible_message("\blue [M]'s muscles lock up violently and they crumple to the floor!", "\red Your muscles lock up with great pain! You fall to the ground!") + M.weakened = max(M.weakened, 3) + if(prob(25)) + M.emote("scream") +// M << "DEBUG: YOU HAVE 1 to 10 UNITS IN YOU!" + if(10 to INFINITY) + M.AdjustParalysis(-1) + M.AdjustStunned(-1) + M.AdjustWeakened(-1) +// M << "DEBUG: YOU HAVE 10 to 25 UNITS IN YOU!" + + /////////////////////////Food Reagents//////////////////////////// // Part of the food code. Nutriment is used instead of the old "heal_amt" code. Also is where all the food // condiments, additives, and such go. @@ -4079,6 +4150,5 @@ datum color = "#2E6671" boozepwr = 5 - // Undefine the alias for REAGENTS_EFFECT_MULTIPLER #undef REM diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 109684ca..fba9c3c5 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -2238,3 +2238,18 @@ datum result = "suidream" required_reagents = list("space_up" = 2, "bluecuracao" = 1, "melonliquor" = 1) result_amount = 4 + +//////////////////////////SKULL'S DRUGS/////////////////////// + philodex + name = "Philodexphid" + id = "philodex" + result = "philodex" + required_reagents = list("cryptobiolin" = 1, "impedrezene" = 1, "mercury" = 1) + result_amount = 2 + + ecye + name = "Ecyeipate" + id = "ecye" + result = "ecye" + required_reagents = list("synaptizine" = 1, "plasma" = 1) + result_amount = 2 \ No newline at end of file