cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-03 14:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Kitty Ears!

Browse Source 
Wizordrazine for secret wizard spell.
Various food nutriment changes.
Candy Corm and Popcorm are now properly named.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1269 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
tronaldnwn@hotmail.com
2011-03-24 17:14:34 +00:00
parent 8c7597a6c3
commit 7e0edf31bc
3 changed files with 75 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
code/WorkInProgress/Chemistry-Reagents.dm
View File

@@ -895,6 +895,42 @@ datum
..()
return
Wizordrazine //Going to use this for a spell soon, regeneration, it might seem OP, but that's the point.
name = "Wizordrazine"
id = "wizordrazine"
description = "I don't have to explain shit about Wizordrazine, its magic."
reagent_state = LIQUID
on_mob_life(var/mob/M)
if(!M) M = holder.my_atom
if(M:cloneloss) M:cloneloss = max(0, M:cloneloss-3)
if(M:oxyloss) M:oxyloss = max(0, M:oxyloss-3)
M:heal_organ_damage(3,3)
M:drowsyness = max(M:drowsyness-2, 0)
if(holder.has_reagent("toxin"))
holder.remove_reagent("toxin", 2)
if(holder.has_reagent("stoxin"))
holder.remove_reagent("stoxin", 2)
if(holder.has_reagent("plasma"))
holder.remove_reagent("plasma", 1)
if(holder.has_reagent("acid"))
holder.remove_reagent("acid", 1)
if(holder.has_reagent("cyanide"))
holder.remove_reagent("cyanide", 1)
if(holder.has_reagent("amatoxin"))
holder.remove_reagent("amatoxin", 2)
if(holder.has_reagent("chloralhydrate"))
holder.remove_reagent("chloralhydrate", 5)
if(holder.has_reagent("carpotoxin"))
holder.remove_reagent("carpotoxin", 1)
if(holder.has_reagent("zombiepowder"))
holder.remove_reagent("zombiepowder", 0.5)
M:brainloss = max(M:brainloss-3 , 0)
M.disabilities = 0
M.sdisabilities = 0
if(M:toxloss) M:toxloss = max(0, M:toxloss-3)
..()
return
synaptizine
name = "Synaptizine"
id = "synaptizine"

60
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -1349,7 +1349,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle."
desc = "A small bottle of toxins. Do not drink, it is poisonous."
icon = 'chemical.dmi'
icon_state = "bottle12"
@@ -1359,7 +1359,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle."
desc = "A small bottle of cyanide. Bitter almonds?"
icon = 'chemical.dmi'
icon_state = "bottle12"
@@ -1369,7 +1369,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/stoxin
name = "sleep-toxin bottle"
desc = "A small bottle."
desc = "A small bottle of sleep toxins. Just the fumes make you sleepy."
icon = 'chemical.dmi'
icon_state = "bottle20"
@@ -1379,7 +1379,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate
name = "Chloral Hydrate Bottle"
desc = "A small bottle."
desc = "A small bottle of Choral Hydrate. Mickey's Favorite!"
icon = 'chemical.dmi'
icon_state = "bottle20"
@@ -1389,7 +1389,7 @@
/obj/item/weapon/reagent_containers/glass/bottle/antitoxin
name = "anti-toxin bottle"
desc = "A small bottle."
desc = "A small bottle of Anti-toxins. Counters poisons, and repairs damage, a wonder drug."
icon = 'chemical.dmi'
icon_state = "bottle17"
@@ -1605,15 +1605,15 @@
/obj/item/weapon/reagent_containers/food/snacks/candy
name = "candy"
desc = "Man, that shit looks good. I bet it's got nougat. Fuck."
desc = "Nougat love it or hate it."
icon_state = "candy"
New()
..()
reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/candy_corn
name = "candy corn"
desc = "It's a handful of candy corn. Can be stored in a detective's hat."
name = "candy corm" //Not a typo
desc = "It's a handful of candy corm. Can be stored in a detective's hat."
icon_state = "candy_corn"
New()
..()
@@ -1693,7 +1693,7 @@
icon_state = "donkpocket"
New()
..()
reagents.add_reagent("nutriment", 1)
reagents.add_reagent("nutriment", 2)
var/warm = 0
proc/cooltime() //Not working, derp?
if (src.warm)
@@ -1868,7 +1868,8 @@
icon_state = "soylent"
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/soylenviridians
name = "Soylen Virdians"
@@ -1876,7 +1877,8 @@
icon_state = "soylent"
New()
..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("nutriment", 10)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotcake
name = "Carrot Cake"
@@ -1961,7 +1963,7 @@
var/hname = ""
var/job = null
icon_state = "meatpie"
desc = "A delicious meatpie."
desc = "The best meatpies on station."
New()
..()
reagents.add_reagent("nutriment", 10)
@@ -2023,7 +2025,7 @@
desc = "A delicious kabob"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -2032,7 +2034,7 @@
desc = "A delicious kabob"
New()
..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("nutriment", 8)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sosjerky
@@ -2067,8 +2069,7 @@
desc = "We all love tofu."
New()
..()
reagents.add_reagent("nutriment", 6)
bitesize = 3
reagents.add_reagent("nutriment", 3)
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers
name = "Cheesie Honkers"
@@ -2096,7 +2097,7 @@
New()
..()
reagents.add_reagent("nutriment", 6)
bitesize = 3
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries
name = "Space Fries"
@@ -2105,6 +2106,7 @@
New()
..()
reagents.add_reagent("nutriment", 4)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cheesyfries
name = "Cheesy Fries"
@@ -2142,38 +2144,38 @@
icon_state = "cubancarp"
New()
..()
reagents.add_reagent("nutriment", 3)
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("carpotoxin", 3)
reagents.add_reagent("capsaicin", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/popcorn
name = "Popcorn"
name = "Popcorm" //not a typo
desc = "Now let's find some cinema."
icon_state = "popcorn"
New()
..()
reagents.add_reagent("nutriment", 3)
bitesize = 0.1
reagents.add_reagent("nutriment", 10)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/fishburger
name = "Carpburger"
name = "Carpburger"
desc = "Nanotracen: wasting rare ingridients for fastfood since 2548"
icon_state = "fishburger"
New()
..()
reagents.add_reagent("nutriment", 4)
reagents.add_reagent("nutriment", 8)
reagents.add_reagent("carpotoxin", 3)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tofuburger
name = "Togu Burger"
name = "Togu Burger"
desc = "What.. is that meat?"
icon_state = "tofuburger"
New()
..()
reagents.add_reagent("nutriment", 4)
bitesize = 1
reagents.add_reagent("nutriment", 8)
bitesize = 2
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -2280,7 +2282,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofubread
name = "Tofubread"
icon_state = "Like meatbread but for vegans. Not guaranteed to give superpowers."
icon_state = "Like meatbread but for vegetarians. Not guaranteed to give superpowers."
icon_state = "tofubread"
New()
..()