diff --git a/code/modules/events/tgevents/vent_clog.dm b/code/modules/events/tgevents/vent_clog.dm index e1b908cc844..d12631be36a 100755 --- a/code/modules/events/tgevents/vent_clog.dm +++ b/code/modules/events/tgevents/vent_clog.dm @@ -24,7 +24,7 @@ var/list/gunk = list("water","carbon","flour","radium","toxin","cleaner","nutriment","condensedcapsaicin","psilocybin","lube", "plantbgone","banana","anti_toxin","space_drugs","hyperzine","holywater","ethanol","hot_coco","pacid", "blood","stoxin","fluorine","ryetalyn","mutagen","oxycodone","fuel","cryptobiolin", - "impedrezene","mindbreaker","nanites","xenomicrobes","lipozine","frostoil","doctorsdelight","beepskysmash", + "impedrezene","mindbreaker","nanites","xenomicrobes","lipozine","frostoil","alchdranine","beepskysmash", "tricordrazine", "amatoxin", "adminordrazine", "neurotoxin", "zombiepowder", "synaptizine") var/datum/reagents/R = new/datum/reagents(50) R.my_atom = vent diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm index 9ae0421a384..44a9efd262a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm +++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm @@ -153,6 +153,6 @@ for(counter=0, counter<=powerlevel, counter++) var/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice/S = new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc) S.reagents.add_reagent("mushroomhallucinogen", powerlevel) - S.reagents.add_reagent("doctorsdelight", powerlevel) + S.reagents.add_reagent("alchdranine", powerlevel) S.reagents.add_reagent("synaptizine", powerlevel) del(src) \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index a215e95bade..c0e2d00165d 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -151,7 +151,7 @@ if (!ui) // the ui does not exist, so we'll create a new() one // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm - ui = new(user, src, ui_key, "chem_dispenser.tmpl", ui_title, 370, 605) + ui = new(user, src, ui_key, "chem_dispenser.tmpl", ui_title, 390, 660) // when the ui is first opened this is the data it will use ui.set_initial_data(data) // open the new ui window diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index cf3dc193dfe..132e45225c6 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -1413,7 +1413,7 @@ datum id = "plasma" description = "Plasma in its liquid form." reagent_state = LIQUID - color = "#E71B00" // rgb: 231, 27, 0 + color = "#B233CC" // rgb: 178, 51, 204 on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom @@ -1595,6 +1595,25 @@ datum ..() return + Alchdranine + name = "Alchdranine" + id = "alchdranine" + description = "Alchdranine is an extremely strange chemical substance that can be used to treat almost any injury with a high level of effectiveness " + reagent_state = LIQUID + color = "#07a4d1" // rgb: 7, 164, 209 + + on_mob_life(var/mob/living/M as mob, var/alien) + if(M.stat == 2.0) + return + if(!M) M = holder.my_atom + if(!alien || alien != IS_DIONA) + M.adjustOxyLoss(-1*REM) + M.heal_organ_damage(1*REM,0) + M.heal_organ_damage(0,1*REM) + M.adjustToxLoss(-1*REM) + ..() + return + anti_toxin name = "Anti-Toxin (Dylovene)" id = "anti_toxin" @@ -1681,24 +1700,6 @@ datum ..() return - peridaxon - name = "Peridaxon" - id = "peridaxon" - description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously." - reagent_state = LIQUID - color = "#C8A5DC" // rgb: 200, 165, 220 - overdose = 10 - - on_mob_life(var/mob/living/M as mob) - if(!M) M = holder.my_atom - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/datum/organ/internal/I = H.internal_organs - if(I.parent_organ == "chest") - I.damage = max(I.damage -1 , 0) - ..() - return - synaptizine name = "Synaptizine" id = "synaptizine" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 220b1d5f514..23f6162c681 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -1248,7 +1248,7 @@ New() ..() reagents.add_reagent("nutriment", 4) - reagents.add_reagent("doctorsdelight", 5) + reagents.add_reagent("alchdranine", 5) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato @@ -2235,7 +2235,7 @@ New() ..() reagents.add_reagent("nutriment", 8) - reagents.add_reagent("doctorsdelight", 5) + reagents.add_reagent("alchdranine", 5) bitesize = 3 /obj/item/weapon/reagent_containers/food/snacks/appletart diff --git a/icons/effects/tile_effects.dmi b/icons/effects/tile_effects.dmi index 5ed60b7adcd..e152a311b63 100644 Binary files a/icons/effects/tile_effects.dmi and b/icons/effects/tile_effects.dmi differ