From 86334cbee23b462379aa3186c2a3121635bb6cc3 Mon Sep 17 00:00:00 2001 From: RKF45 Date: Wed, 1 Jan 2014 17:03:02 +0100 Subject: [PATCH 1/2] I have no idea what I'm doing D: --- code/modules/mob/living/simple_animal/friendly/cat.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index d858a200e1..92a27c27b7 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -63,6 +63,6 @@ //RUNTIME IS ALIVE! SQUEEEEEEEE~ /mob/living/simple_animal/cat/Runtime name = "Runtime" - desc = "Its fur has the look and feel of velvet, and it's tail quivers occasionally." + desc = "Its fur has the look and feel of velvet, and its tail quivers occasionally." From 9b62f7b23dc6cb39759a4e3d0b8581a2ae41dc9a Mon Sep 17 00:00:00 2001 From: RKF45 Date: Sat, 4 Jan 2014 21:26:28 +0100 Subject: [PATCH 2/2] Small fixes, again --- code/modules/economy/economy_misc.dm | 2 +- code/modules/reagents/Chemistry-Reagents.dm | 56 +++++++++---------- code/modules/reagents/Chemistry-Recipes.dm | 8 +-- .../reagents/reagent_containers/food/cans.dm | 10 ++-- .../reagent_containers/food/drinks.dm | 4 +- .../research/xenoarchaeology/chemistry.dm | 18 ++---- 6 files changed, 46 insertions(+), 52 deletions(-) diff --git a/code/modules/economy/economy_misc.dm b/code/modules/economy/economy_misc.dm index ffe8a11471..b236c2905d 100644 --- a/code/modules/economy/economy_misc.dm +++ b/code/modules/economy/economy_misc.dm @@ -103,7 +103,7 @@ var/global/economy_init = 0 create_department_account("Vendor") vendor_account = department_accounts["Vendor"] - current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], 2557" + current_date_string = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [game_year]" economy_init = 1 return 1 diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm index d6ba7a13ad..04ff35c984 100644 --- a/code/modules/reagents/Chemistry-Reagents.dm +++ b/code/modules/reagents/Chemistry-Reagents.dm @@ -539,7 +539,7 @@ datum sulfur name = "Sulfur" id = "sulfur" - description = "A chemical element." + description = "A chemical element with a pungent smell." reagent_state = SOLID color = "#BF8C00" // rgb: 191, 140, 0 @@ -548,7 +548,7 @@ datum carbon name = "Carbon" id = "carbon" - description = "A chemical element." + description = "A chemical element, the builing block of life." reagent_state = SOLID color = "#1C1300" // rgb: 30, 20, 0 @@ -562,7 +562,7 @@ datum chlorine name = "Chlorine" id = "chlorine" - description = "A chemical element." + description = "A chemical element with a characteristic odour." reagent_state = GAS color = "#808080" // rgb: 128, 128, 128 overdose = REAGENTS_OVERDOSE @@ -590,7 +590,7 @@ datum sodium name = "Sodium" id = "sodium" - description = "A chemical element." + description = "A chemical element, readily reacts with water." reagent_state = SOLID color = "#808080" // rgb: 128, 128, 128 @@ -599,7 +599,7 @@ datum phosphorus name = "Phosphorus" id = "phosphorus" - description = "A chemical element." + description = "A chemical element, the backbone of biological energy carriers." reagent_state = SOLID color = "#832828" // rgb: 131, 40, 40 @@ -608,7 +608,7 @@ datum lithium name = "Lithium" id = "lithium" - description = "A chemical element." + description = "A chemical element, used as antidepressant." reagent_state = SOLID color = "#808080" // rgb: 128, 128, 128 overdose = REAGENTS_OVERDOSE @@ -687,7 +687,7 @@ datum ryetalyn name = "Ryetalyn" id = "ryetalyn" - description = "Ryetalyn can cure all genetic abnomalities." + description = "Ryetalyn can cure all genetic abnomalities via a catalytic process." reagent_state = SOLID color = "#C8A5DC" // rgb: 200, 165, 220 overdose = REAGENTS_OVERDOSE @@ -1024,7 +1024,7 @@ datum dexalinp name = "Dexalin Plus" id = "dexalinp" - description = "Dexalin Plus is used in the treatment of oxygen deprivation. Its highly effective." + description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 overdose = REAGENTS_OVERDOSE/2 @@ -1292,7 +1292,7 @@ datum clonexadone name = "Clonexadone" id = "clonexadone" - description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' clones that get ejected early when used in conjunction with a cryo tube." + description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube." reagent_state = LIQUID color = "#C8A5DC" // rgb: 200, 165, 220 @@ -1353,7 +1353,7 @@ datum holywater name = "Holy Water" id = "holywater" - description = "A ubiquitous chemical substance that is composed of hydrogen and oxygen." + description = "This was once water, but has been altered by higher powers." reagent_state = LIQUID color = "#535E66" // rgb: 83, 94, 102 @@ -1599,7 +1599,7 @@ datum toxin/carpotoxin name = "Carpotoxin" id = "carpotoxin" - description = "A deadly neurotoxin produced by the dreaded spess carp." + description = "A deadly neurotoxin produced by the dreaded space carp." reagent_state = LIQUID color = "#003333" // rgb: 0, 51, 51 toxpwr = 2 @@ -1631,7 +1631,7 @@ datum toxin/mindbreaker name = "Mindbreaker Toxin" id = "mindbreaker" - description = "A powerful hallucinogen. Not a thing to be messed with." + description = "A powerful hallucinogen, it can cause fatal effects in users." reagent_state = LIQUID color = "#B31008" // rgb: 139, 166, 233 toxpwr = 0 @@ -1784,7 +1784,7 @@ datum toxin/beer2 //disguised as normal beer for use by emagged brobots name = "Beer" id = "beer2" - description = "An alcoholic beverage made from malted grains, hops, yeast, and water." + description = "An alcoholic beverage made from malted grains, hops, yeast, and water. The fermentation appears to be imcomplete." //If the players manage to analyze this, they deserve to know something is wrong. reagent_state = LIQUID color = "#664300" // rgb: 102, 67, 0 custom_metabolism = 0.15 // Sleep toxins should always be consumed pretty fast @@ -1809,7 +1809,7 @@ datum toxin/acid name = "Sulphuric acid" id = "sacid" - description = "A strong mineral acid with the molecular formula H2SO4." + description = "A very corrosive mineral acid with the molecular formula H2SO4." reagent_state = LIQUID color = "#DB5008" // rgb: 219, 80, 8 toxpwr = 1 @@ -2063,7 +2063,7 @@ datum frostoil name = "Frost Oil" id = "frostoil" - description = "A special oil that noticably chills the body. Extraced from Icepeppers." + description = "A special oil that noticably chills the body. Extracted from Ice Peppers." reagent_state = LIQUID color = "#B31008" // rgb: 139, 166, 233 @@ -2126,7 +2126,7 @@ datum hot_coco name = "Hot Chocolate" id = "hot_coco" - description = "Made with love! And coco beans." + description = "Made with love! And cocoa beans." reagent_state = LIQUID nutriment_factor = 2 * REAGENTS_METABOLISM color = "#403010" // rgb: 64, 48, 16 @@ -2519,7 +2519,7 @@ datum drink/hot_coco name = "Hot Chocolate" id = "hot_coco" - description = "Made with love! And coco beans." + description = "Made with love! And cocoa beans." nutriment_factor = 2 * FOOD_METABOLISM color = "#403010" // rgb: 64, 48, 16 adj_temp = 5 @@ -2694,7 +2694,7 @@ datum drink/cold/brownstar name = "Brown Star" - description = "Its not what it sounds like..." + description = "It's not what it sounds like..." id = "brownstar" color = "#9F3400" // rgb: 159, 052, 000 adj_temp = - 2 @@ -2732,7 +2732,7 @@ datum drink/cold/rewriter name = "Rewriter" - description = "The secert of the sanctuary of the Libarian..." + description = "The secret of the sanctuary of the Libarian..." id = "rewriter" color = "#485000" // rgb:72, 080, 0 @@ -2838,7 +2838,7 @@ datum return hippies_delight - name = "Hippie's Delight" + name = "Hippies' Delight" id = "hippiesdelight" description = "You just don't get it maaaan." reagent_state = LIQUID @@ -2945,12 +2945,12 @@ datum if(istype(O,/obj/item/weapon/paper)) var/obj/item/weapon/paper/paperaffected = O paperaffected.clearpaper() - usr << "The solution melts away the ink on the paper." + usr << "The solution dissolves the ink on the paper." if(istype(O,/obj/item/weapon/book)) if(volume >= 5) var/obj/item/weapon/book/affectedbook = O affectedbook.dat = null - usr << "The solution melts away the ink on the book." + usr << "The solution dissolves the ink on the book." else usr << "It wasn't enough..." return @@ -3229,7 +3229,7 @@ datum ethanol/cuba_libre name = "Cuba Libre" id = "cubalibre" - description = "Rum, mixed with cola. Viva la revolution." + description = "Rum, mixed with cola. Viva la revolucion." color = "#3E1B00" // rgb: 62, 27, 0 boozepwr = 1.5 @@ -3299,7 +3299,7 @@ datum ethanol/toxins_special name = "Toxins Special" id = "toxinsspecial" - description = "This thing is ON FIRE!. CALL THE DAMN SHUTTLE!" + description = "This thing is ON FIRE! CALL THE DAMN SHUTTLE!" reagent_state = LIQUID color = "#664300" // rgb: 102, 67, 0 boozepwr = 5 @@ -3516,14 +3516,14 @@ datum ethanol/red_mead name = "Red Mead" id = "red_mead" - description = "The true Viking drink! Even though it has a strange red color." + description = "The true Viking's drink! Even though it has a strange red color." color = "#C73C00" // rgb: 199, 60, 0 boozepwr = 1.5 ethanol/mead name = "Mead" id = "mead" - description = "A Vikings drink, though a cheap one." + description = "A Viking's drink, though a cheap one." reagent_state = LIQUID color = "#664300" // rgb: 102, 67, 0 boozepwr = 1.5 @@ -3560,7 +3560,7 @@ datum ethanol/andalusia name = "Andalusia" id = "andalusia" - description = "A nice, strange named drink." + description = "A nice, strangely named drink." color = "#664300" // rgb: 102, 67, 0 boozepwr = 3 @@ -3612,7 +3612,7 @@ datum ethanol/erikasurprise name = "Erika Surprise" id = "erikasurprise" - description = "The surprise is, it's green!" + description = "The surprise is it's green!" color = "#2E6671" // rgb: 46, 102, 113 boozepwr = 3 diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index d9b6b7e230..c06117a08b 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -252,7 +252,7 @@ datum name = "Dexalin" id = "dexalin" result = "dexalin" - required_reagents = list("oxygen" = 2) + required_reagents = list("oxygen" = 2, "plasma" = 0.1) required_catalysts = list("plasma" = 5) result_amount = 1 @@ -302,7 +302,7 @@ datum name = "Clonexadone" id = "clonexadone" result = "clonexadone" - required_reagents = list("cryoxadone" = 1, "sodium" = 1) + required_reagents = list("cryoxadone" = 1, "sodium" = 1, "plasma" = 0.1) required_catalysts = list("plasma" = 5) result_amount = 2 @@ -514,7 +514,7 @@ datum id = "mindbreaker" result = "mindbreaker" required_reagents = list("silicon" = 1, "hydrogen" = 1, "anti_toxin" = 1) - result_amount = 5 + result_amount = 3 lipozine name = "Lipozine" @@ -1835,7 +1835,7 @@ datum required_reagents = list("berryjuice" = 1, "cream" = 1, "vermouth" = 1) result_amount = 3 - grapesoda //Allows Grape Soda to be made + grapesoda name = "Grape Soda" id = "grapesoda" result = "grapesoda" diff --git a/code/modules/reagents/reagent_containers/food/cans.dm b/code/modules/reagents/reagent_containers/food/cans.dm index 2f997295b1..6f3b3f3901 100644 --- a/code/modules/reagents/reagent_containers/food/cans.dm +++ b/code/modules/reagents/reagent_containers/food/cans.dm @@ -138,7 +138,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle name = "Bottled Water" - desc = "Introduced to the vending machines on health nut protest, taste fresh, pure glacial* water! *Note: Might be tapwater." + desc = "Introduced to the vending machines by Skrellian request, this water comes straight from the Martian poles." icon_state = "waterbottle" New() ..() @@ -148,7 +148,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/beer name = "Space Beer" - desc = "Beer. In space." + desc = "Contains only water, malt and hops." icon_state = "beer" New() ..() @@ -180,7 +180,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/thirteenloko name = "Thirteen Loko" - desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsably." + desc = "The CMO has advised crew members that consumption of Thirteen Loko may result in seizures, blindness, drunkeness, or even death. Please Drink Responsibly." icon_state = "thirteen_loko" New() ..() @@ -231,7 +231,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea name = "Vrisk Serket Iced Tea" - desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth? Whatever!!!!!!!!" + desc = "That sweet, refreshing southern earthy flavor. That's where it's from, right? South Earth?" icon_state = "ice_tea_can" New() ..() @@ -259,7 +259,7 @@ /obj/item/weapon/reagent_containers/food/drinks/cans/sodawater name = "Soda Water" - desc = "A can of soda water. Why not make a scotch and soda?" + desc = "A can of soda water. Still water's more refreshing cousin." icon_state = "sodawater" New() ..() diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index d6eb52bd04..fe49ad0262 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -292,12 +292,12 @@ /obj/item/weapon/reagent_containers/food/drinks/flask/vacuumflask name = "vacuum flask" - desc = "Keeping your drinks at the perfect temperature since 2321." + desc = "Keeping your drinks at the perfect temperature since 1892." icon_state = "vacuumflask" volume = 60 /obj/item/weapon/reagent_containers/food/drinks/britcup name = "cup" - desc = "A cup with the british flag emblazoned on it." + desc = "A cup with the British flag emblazoned on it." icon_state = "britcup" volume = 30 \ No newline at end of file diff --git a/code/modules/research/xenoarchaeology/chemistry.dm b/code/modules/research/xenoarchaeology/chemistry.dm index e470124754..9e0e646234 100644 --- a/code/modules/research/xenoarchaeology/chemistry.dm +++ b/code/modules/research/xenoarchaeology/chemistry.dm @@ -7,48 +7,42 @@ datum id = "tungsten" description = "A chemical element, and a strong oxidising agent." reagent_state = SOLID - color = "#808080" // rgb: 128, 128, 128 - //todo: make this silvery grey + color = "#DCDCDC" // rgb: 220, 220, 220, silver lithiumsodiumtungstate name = "Lithium Sodium Tungstate" id = "lithiumsodiumtungstate" description = "A reducing agent for geological compounds." reagent_state = LIQUID - color = "#808080" // rgb: 128, 128, 128 - //todo: make this silvery grey + color = "#C0C0C0" // rgb: 192, 192, 192, darker silver ground_rock name = "Ground Rock" id = "ground_rock" description = "A fine dust made of ground up rock." reagent_state = SOLID - color = "#C81040" //rgb: 200, 16, 64 - //todo: make this brown + color = "#A0522D" //rgb: 160, 82, 45, brown density_separated_sample name = "Density separated sample" id = "density_separated_sample" description = "A watery paste used in chemical analysis, there are some chunks floating in it." reagent_state = LIQUID - color = "#C81040" //rgb: 200, 16, 64 - //todo: make this browny-white + color = "#DEB887" //rgb: 222, 184, 135, light brown analysis_sample name = "Analysis liquid" id = "analysis_sample" description = "A watery paste used in chemical analysis." reagent_state = LIQUID - color = "#C81040" //rgb: 200, 16, 64 - //todo: make this white + color = "#F5FFFA" //rgb: 245, 255, 250, almost white chemical_waste name = "Chemical Waste" id = "chemical_waste" description = "A viscous, toxic liquid left over from many chemical processes." reagent_state = LIQUID - color = "#C81040" //rgb: 200, 16, 64 - //todo: make this fluoro/bright green + color = "#ADFF2F" //rgb: 173, 255, 47, toxic green datum chemical_reaction