Fixing some derps:

-Cocoa pods no longer turn invisible at a certain point.
-Changed some dumb descriptions.
-Fixed larvae UI positioning
-Further adjusted capsaicin/frost oil. Cold is already lethal to metroids, so the extra damage stuff was redundant.
-Fix for somatoray runtimes when shot at metroids and xenos and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3970 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-07-02 20:20:13 +00:00
parent ac9762228e
commit 507aeac51e
5 changed files with 17 additions and 20 deletions

View File

@@ -942,7 +942,7 @@
yield = 2 yield = 2
potency = 10 potency = 10
plant_type = 0 plant_type = 0
growthstages = 6 growthstages = 5
/* // Maybe one day when I get it to work like a grenade which exlodes gibs. /* // Maybe one day when I get it to work like a grenade which exlodes gibs.
/obj/item/seeds/gibtomatoseed /obj/item/seeds/gibtomatoseed

View File

@@ -96,7 +96,7 @@
/obj/item/weapon/bodybag /obj/item/weapon/bodybag
name = "body bag" name = "body bag"
desc = "Bag mixed with a bit of body." desc = "A plastic bag designed for the storage and transportation of cadavers."
icon = 'closet.dmi' icon = 'closet.dmi'
icon_state = "bodybag" icon_state = "bodybag"
force = 5.0 force = 5.0
@@ -499,7 +499,7 @@
/obj/item/weapon/card/id /obj/item/weapon/card/id
name = "identification card" name = "identification card"
desc = "An identification card. No shit." desc = "A card used to provide ID and determine access across the station."
icon_state = "id" icon_state = "id"
item_state = "card-id" item_state = "card-id"
var/access = list() var/access = list()

View File

@@ -1740,18 +1740,16 @@ datum
M.bodytemperature += 5 M.bodytemperature += 5
if(holder.has_reagent("frostoil")) if(holder.has_reagent("frostoil"))
holder.remove_reagent("frostoil", 5) holder.remove_reagent("frostoil", 5)
if(prob(40) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid)) if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature += rand(5,20) M.bodytemperature += rand(5,20)
if(15 to 25) if(15 to 25)
M.bodytemperature += 10 M.bodytemperature += 10
if(prob(60) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid)) if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature += rand(5,20) M.bodytemperature += rand(10,20)
if(25 to INFINITY) if(25 to INFINITY)
M.bodytemperature += 15 M.bodytemperature += 15
if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature += rand(15,20)
data++ data++
..() ..()
return return
@@ -1828,18 +1826,17 @@ datum
M.bodytemperature -= 5 M.bodytemperature -= 5
if(holder.has_reagent("capsaicin")) if(holder.has_reagent("capsaicin"))
holder.remove_reagent("capsaicin", 5) holder.remove_reagent("capsaicin", 5)
if(prob(80) && istype(M, /mob/living/carbon/metroid))
M.adjustFireLoss(rand(5,20))
M << "\red You feel a terrible chill inside your body!"
if(15 to 25)
M.bodytemperature -= 10
if(prob(60) && !istype(M, /mob/living/carbon/metroid))
M.take_organ_damage(0, 1)
if(istype(M, /mob/living/carbon/metroid)) if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature -= rand(5,20) M.bodytemperature -= rand(5,20)
if(15 to 25)
M.bodytemperature -= 10
if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature -= rand(10,20)
if(25 to INFINITY) if(25 to INFINITY)
M.bodytemperature -= 15 M.bodytemperature -= 15
if(prob(1)) M.emote("shiver") if(prob(1)) M.emote("shiver")
if(istype(M, /mob/living/carbon/metroid))
M.bodytemperature -= rand(15,20)
data++ data++
..() ..()
return return
@@ -1858,7 +1855,7 @@ datum
blackpepper blackpepper
name = "Black Pepper" name = "Black Pepper"
id = "blackpepper" id = "blackpepper"
description = "A power ground from peppercorns. *AAAACHOOO*" description = "A powder ground from peppercorns. *AAAACHOOO*"
reagent_state = SOLID reagent_state = SOLID
// no color (ie, black) // no color (ie, black)

View File

@@ -149,20 +149,20 @@
mymob.oxygen.icon = 'screen1_alien.dmi' mymob.oxygen.icon = 'screen1_alien.dmi'
mymob.oxygen.icon_state = "oxy0" mymob.oxygen.icon_state = "oxy0"
mymob.oxygen.name = "oxygen" mymob.oxygen.name = "oxygen"
mymob.oxygen.screen_loc = ui_oxygen mymob.oxygen.screen_loc = ui_alien_oxygen
mymob.toxin = new /obj/screen( null ) mymob.toxin = new /obj/screen( null )
mymob.toxin.icon = 'screen1_alien.dmi' mymob.toxin.icon = 'screen1_alien.dmi'
mymob.toxin.icon_state = "tox0" mymob.toxin.icon_state = "tox0"
mymob.toxin.name = "toxin" mymob.toxin.name = "toxin"
mymob.toxin.screen_loc = ui_toxin mymob.toxin.screen_loc = ui_alien_toxin
mymob.fire = new /obj/screen( null ) mymob.fire = new /obj/screen( null )
mymob.fire.icon = 'screen1_alien.dmi' mymob.fire.icon = 'screen1_alien.dmi'
mymob.fire.icon_state = "fire0" mymob.fire.icon_state = "fire0"
mymob.fire.name = "fire" mymob.fire.name = "fire"
mymob.fire.screen_loc = ui_fire mymob.fire.screen_loc = ui_alien_fire
mymob.healths = new /obj/screen( null ) mymob.healths = new /obj/screen( null )

View File

@@ -49,7 +49,7 @@
on_hit(var/atom/target, var/blocked = 0) on_hit(var/atom/target, var/blocked = 0)
var/mob/living/M = target var/mob/living/M = target
if(istype(target, /mob/living) && M:mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays. if(istype(target, /mob/living/carbon/human) && M:mutantrace == "plant") //Plantmen possibly get mutated and damaged by the rays.
var/mob/living/L as mob var/mob/living/L as mob
if(prob(15)) if(prob(15))
L.apply_effect((rand(30,80)),IRRADIATE) L.apply_effect((rand(30,80)),IRRADIATE)