Rebalanced xenoflora sprites, fixed numerous issues.

This commit is contained in:
Zuhayr
2015-03-22 15:52:09 +10:30
parent 5fae54e4a8
commit bf8ad6d585
8 changed files with 15 additions and 40 deletions

View File

@@ -123,23 +123,6 @@
else else
user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>" user << "<span class='notice'>The [affecting.display_name] is cut open, you'll need more than a bandage!</span>"
/obj/item/stack/medical/bruise_pack/tajaran
name = "\improper S'rendarr's Hand leaf"
singular_name = "S'rendarr's Hand leaf"
desc = "A poultice made of soft leaves that is rubbed on bruises."
//icon = 'icons/obj/harvest.dmi'
icon_state = "shandp"
heal_brute = 7
/obj/item/stack/medical/ointment/tajaran
name = "\improper Messa's Tear petals"
singular_name = "Messa's Tear petals"
desc = "A poultice made of cold, blue petals that is rubbed on burns."
//icon = 'icons/obj/harvest.dmi'
icon_state = "mtearp"
heal_burn = 7
/obj/item/stack/medical/advanced/bruise_pack /obj/item/stack/medical/advanced/bruise_pack
name = "advanced trauma kit" name = "advanced trauma kit"
singular_name = "advanced trauma kit" singular_name = "advanced trauma kit"

View File

@@ -319,6 +319,7 @@
del(src) del(src)
return return
/*
if(seed.kitchen_tag) if(seed.kitchen_tag)
switch(seed.kitchen_tag) switch(seed.kitchen_tag)
if("shand") if("shand")
@@ -333,6 +334,7 @@
user << "<span class='notice'>You mash the petals into a poultice.</span>" user << "<span class='notice'>You mash the petals into a poultice.</span>"
del(src) del(src)
return return
*/
/obj/item/weapon/reagent_containers/food/snacks/grown/pickup(mob/user) /obj/item/weapon/reagent_containers/food/snacks/grown/pickup(mob/user)
..() ..()

View File

@@ -59,7 +59,7 @@
set_trait(TRAIT_HIGHKPA_TOLERANCE, 200) // High pressure capacity. set_trait(TRAIT_HIGHKPA_TOLERANCE, 200) // High pressure capacity.
set_trait(TRAIT_IDEAL_HEAT, 293) // Preferred temperature in Kelvin. set_trait(TRAIT_IDEAL_HEAT, 293) // Preferred temperature in Kelvin.
set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) // Plant eats this much per tick. set_trait(TRAIT_NUTRIENT_CONSUMPTION, 0.25) // Plant eats this much per tick.
set_trait(TRAIT_PLANT_COLOUR, "#6EF86A") // Colour of the plant icon. set_trait(TRAIT_PLANT_COLOUR, "#46B543") // Colour of the plant icon.
spawn(5) spawn(5)
sleep(-1) sleep(-1)

View File

@@ -241,7 +241,7 @@
set_trait(TRAIT_PRODUCTION,6) set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,5) set_trait(TRAIT_YIELD,5)
set_trait(TRAIT_POTENCY,10) set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"treefruit") set_trait(TRAIT_PRODUCT_ICON,"apple")
set_trait(TRAIT_PRODUCT_COLOUR,"#FF540A") set_trait(TRAIT_PRODUCT_COLOUR,"#FF540A")
set_trait(TRAIT_PLANT_ICON,"tree2") set_trait(TRAIT_PLANT_ICON,"tree2")
@@ -419,7 +419,7 @@
set_trait(TRAIT_POTENCY,10) set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"mushroom") set_trait(TRAIT_PRODUCT_ICON,"mushroom")
set_trait(TRAIT_PRODUCT_COLOUR,"#FF4545") set_trait(TRAIT_PRODUCT_COLOUR,"#FF4545")
set_trait(TRAIT_PLANT_COLOUR,"#F5F2D0") set_trait(TRAIT_PLANT_COLOUR,"#E0DDBA")
set_trait(TRAIT_PLANT_ICON,"mushroom4") set_trait(TRAIT_PLANT_ICON,"mushroom4")
/datum/seed/mushroom/poison/death /datum/seed/mushroom/poison/death
@@ -466,7 +466,6 @@
set_trait(TRAIT_SPREAD,1) set_trait(TRAIT_SPREAD,1)
set_trait(TRAIT_MATURATION,15) set_trait(TRAIT_MATURATION,15)
set_trait(TRAIT_YIELD,3) set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_EXPLOSIVE,1)
set_trait(TRAIT_POTENCY,30) set_trait(TRAIT_POTENCY,30)
set_trait(TRAIT_BIOLUM,1) set_trait(TRAIT_BIOLUM,1)
set_trait(TRAIT_BIOLUM_COLOUR,"#006622") set_trait(TRAIT_BIOLUM_COLOUR,"#006622")
@@ -585,7 +584,7 @@
set_trait(TRAIT_YIELD,6) set_trait(TRAIT_YIELD,6)
set_trait(TRAIT_POTENCY,10) set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"potato") set_trait(TRAIT_PRODUCT_ICON,"potato")
set_trait(TRAIT_PRODUCT_COLOUR,"#96855D") set_trait(TRAIT_PRODUCT_COLOUR,"#C4AE7A")
set_trait(TRAIT_PLANT_ICON,"bush2") set_trait(TRAIT_PLANT_ICON,"bush2")
/datum/seed/cabbage /datum/seed/cabbage
@@ -919,8 +918,9 @@
set_trait(TRAIT_YIELD,3) set_trait(TRAIT_YIELD,3)
set_trait(TRAIT_POTENCY,10) set_trait(TRAIT_POTENCY,10)
set_trait(TRAIT_PRODUCT_ICON,"cherry") set_trait(TRAIT_PRODUCT_ICON,"cherry")
set_trait(TRAIT_PRODUCT_COLOUR,"#8C0101") set_trait(TRAIT_PRODUCT_COLOUR,"#A80000")
set_trait(TRAIT_PLANT_ICON,"tree2") set_trait(TRAIT_PLANT_ICON,"tree2")
set_trait(TRAIT_PLANT_COLOUR,"#2F7D2D")
/datum/seed/kudzu /datum/seed/kudzu
name = "kudzu" name = "kudzu"

View File

@@ -58,8 +58,7 @@
/datum/surgery_step/internal/fix_organ /datum/surgery_step/internal/fix_organ
allowed_tools = list( allowed_tools = list(
/obj/item/stack/medical/advanced/bruise_pack= 100, \ /obj/item/stack/medical/advanced/bruise_pack= 100, \
/obj/item/stack/medical/bruise_pack = 20, \ /obj/item/stack/medical/bruise_pack = 20
/obj/item/stack/medical/bruise_pack/tajaran = 70, \
) )
min_duration = 70 min_duration = 70
@@ -82,11 +81,8 @@
var/tool_name = "\the [tool]" var/tool_name = "\the [tool]"
if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack)) if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
tool_name = "regenerative membrane" tool_name = "regenerative membrane"
if (istype(tool, /obj/item/stack/medical/bruise_pack)) else if (istype(tool, /obj/item/stack/medical/bruise_pack))
if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran)) tool_name = "the bandaid"
tool_name = "the poultice"
else
tool_name = "the bandaid"
if (!hasorgans(target)) if (!hasorgans(target))
return return
@@ -106,10 +102,7 @@
if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack)) if (istype(tool, /obj/item/stack/medical/advanced/bruise_pack))
tool_name = "regenerative membrane" tool_name = "regenerative membrane"
if (istype(tool, /obj/item/stack/medical/bruise_pack)) if (istype(tool, /obj/item/stack/medical/bruise_pack))
if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran)) tool_name = "the bandaid"
tool_name = "the poultice"
else
tool_name = "the bandaid"
if (!hasorgans(target)) if (!hasorgans(target))
return return
@@ -136,12 +129,9 @@
target.adjustToxLoss(5) target.adjustToxLoss(5)
else if (istype(tool, /obj/item/stack/medical/bruise_pack)) else if (istype(tool, /obj/item/stack/medical/bruise_pack))
if (istype(tool, /obj/item/stack/medical/bruise_pack/tajaran)) dam_amt = 5
target.adjustToxLoss(7) target.adjustToxLoss(10)
else affected.createwound(CUT, 5)
dam_amt = 5
target.adjustToxLoss(10)
affected.createwound(CUT, 5)
for(var/datum/organ/internal/I in affected.internal_organs) for(var/datum/organ/internal/I in affected.internal_organs)
if(I && I.damage > 0) if(I && I.damage > 0)

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.5 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB