From 6198d9e9d9cf648d62b854fb50240283cbe54aca Mon Sep 17 00:00:00 2001 From: IcyV Date: Mon, 21 Jul 2014 02:31:10 -0700 Subject: [PATCH] Reverts hyperzine to its previous state, keep its addictivness Revert "Made hyperzine same color as salt, because HAHA" This reverts commit b23b5b62d98ab5b70a7cc6a198c6fce6ba43e1b7. Conflicts: code/modules/reagents/Chemistry-Reagents.dm Revert "Made hyperzine harder to make properly." This reverts commit 489cdf00962f444f1e87f72171b16a6021353c7a. Removes Benazine Revert "Nerfs for OD" This reverts commit 4b94406efb60c523099ffe8606de8917459b78b9. Revert "Hyperzine fix" This reverts commit d6702496f92e6915639bc9d7cfc760657dd9bd9f. Conflicts: code/modules/reagents/Chemistry-Reagents.dm Revert "Made Cyanide more deadly, added OD to Hyperzine" This reverts commit 1cb87e07cfdddc89c9452fe58ae41629226dea65. --- code/modules/reagents/Chemistry-Reagents.dm | 37 +++-------------- code/modules/reagents/Chemistry-Recipes.dm | 44 ++++++--------------- code/modules/virus2/effect.dm | 1 - 3 files changed, 17 insertions(+), 65 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index d3a109bc07c..1a753e7ad25 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -403,8 +403,8 @@ datum on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.adjustToxLoss(14) - M.adjustOxyLoss(14) + M.adjustToxLoss(4) + M.adjustOxyLoss(4) M.sleeping += 1 ..() return @@ -1916,44 +1916,19 @@ datum ..() return - benazine - name = "Benazine" - id = "benazine" - description = "An innocuous cold medicine, good against Coldingtons. It is also the precursor of the highly addictive stiumlant hyperzine." - reagent_state = LIQUID - color = "#CCFF00" // rgb: 204, 255, 0 - - on_mob_life(var/mob/living/M as mob) - ..() - return - hyperzine name = "Hyperzine" id = "hyperzine" - description = "Hyperzine is a highly effective, long lasting, muscle stimulant. It is highly addictive." - reagent_state = SOLID - color = "#FFFFFF" // rgb: 255,255,255 + description = "Hyperzine is a highly effective, long lasting, muscle stimulant." + reagent_state = LIQUID + color = "#CCFF00" // rgb: 204, 255, 0 + custom_metabolism = 0.05 addictiveness = 80 on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - if(!data) data = 1 if(prob(5)) M.emote(pick("twitch","blink_r","shiver")) - data++ - switch(data) - if(35 to 50) - M.adjustOxyLoss(1) //They basically run out of breath - - if(51 to 79) // Their cells burn more oxygen than the body can distribute - M.adjustToxLoss(1) - M.adjustOxyLoss(1) - - if(80 to INFINITY) // At this point you're fucked - M.adjustOxyLoss(2) //you'll pass out pretty fucking quick, and die shortly after - ..() - - return cryoxadone diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 50464faa4ac..bdc99b4094b 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -29,27 +29,17 @@ datum required_reagents = list("water" = 1, "potassium" = 1) result_amount = 2 on_reaction(var/datum/reagents/holder, var/created_volume) - - if(holder.has_reagent("benazine")) - if(istype(holder.my_atom.loc, /obj/machinery/bunsen_burner)) - if(holder.my_atom.loc:heated) - var/bvolume = holder.get_reagent_amount("benazine") - if(bvolume > created_volume / 2) - bvolume = created_volume - holder.add_reagent("hyperzine", bvolume) - holder.isolate_reagent("hyperzine") - else - var/datum/effect/effect/system/reagents_explosion/e = new() - e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0) - e.holder_damage(holder.my_atom) - if(isliving(holder.my_atom)) + var/datum/effect/effect/system/reagents_explosion/e = new() + e.set_up(round (created_volume/10, 1), holder.my_atom, 0, 0) + e.holder_damage(holder.my_atom) + if(isliving(holder.my_atom)) + e.amount *= 0.5 + var/mob/living/L = holder.my_atom + if(L.stat!=DEAD) e.amount *= 0.5 - var/mob/living/L = holder.my_atom - if(L.stat!=DEAD) - e.amount *= 0.5 - e.start() - holder.clear_reagents() - return + e.start() + holder.clear_reagents() + return emp_pulse name = "EMP Pulse" @@ -279,24 +269,12 @@ datum required_reagents = list("inaprovaline" = 1, "carbon" = 1) result_amount = 2 - benazine - name = "Benazine" - id = "benarzine" - result = "benazine" - required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,) - result_amount = 3 - -/* - Made with benazine and potassium/water combo sekrit recipe. - hyperzine name = "Hyperzine" id = "hyperzine" result = "hyperzine" - required_reagents = list("benazine" = 1, "potassium" = 1, "water" = 1,) + required_reagents = list("sugar" = 1, "phosphorus" = 1, "sulfur" = 1,) result_amount = 3 - requires_heating = 1 -*/ ryetalyn name = "Ryetalyn" diff --git a/code/modules/virus2/effect.dm b/code/modules/virus2/effect.dm index fca733e95c6..818dfc52f97 100644 --- a/code/modules/virus2/effect.dm +++ b/code/modules/virus2/effect.dm @@ -729,7 +729,6 @@ var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/mon name = "Coldingtons Effect" stage = 1 activate(var/mob/living/carbon/mob,var/multiplier) - if (mob.reagents.has_reagent("benazine")) return if (prob(30)) mob << "You feel like you are about to sneeze!" sleep(5)