Various Tweaks and Fixes

Adds a replacement for Doctor's Delight (For Syndicakes, valid salad,
etc), fixed chem dispenser NanoUI sizing, and change plasma color from
orange to the canonical purple.
This commit is contained in:
Fox-McCloud
2014-02-02 06:27:13 -05:00
parent 0f8893c466
commit 4cd875c88a
6 changed files with 25 additions and 24 deletions
+1 -1
View File
@@ -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
@@ -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)
+1 -1
View File
@@ -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
+20 -19
View File
@@ -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"
@@ -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