diff --git a/code/defines/obj/hydro.dm b/code/defines/obj/hydro.dm index 00dd2ffcc55..036d4688965 100644 --- a/code/defines/obj/hydro.dm +++ b/code/defines/obj/hydro.dm @@ -942,7 +942,7 @@ yield = 2 potency = 10 plant_type = 0 - growthstages = 6 + growthstages = 5 /* // Maybe one day when I get it to work like a grenade which exlodes gibs. /obj/item/seeds/gibtomatoseed diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 54a3dd715b8..72f6c4d6772 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -96,7 +96,7 @@ /obj/item/weapon/bodybag 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_state = "bodybag" force = 5.0 @@ -499,7 +499,7 @@ /obj/item/weapon/card/id 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" item_state = "card-id" var/access = list() diff --git a/code/modules/chemical/Chemistry-Reagents.dm b/code/modules/chemical/Chemistry-Reagents.dm index f2553b45638..fddb1c9f9c5 100644 --- a/code/modules/chemical/Chemistry-Reagents.dm +++ b/code/modules/chemical/Chemistry-Reagents.dm @@ -1740,18 +1740,16 @@ datum M.bodytemperature += 5 if(holder.has_reagent("frostoil")) 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)) M.bodytemperature += rand(5,20) 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)) - M.bodytemperature += rand(5,20) + M.bodytemperature += rand(10,20) if(25 to INFINITY) M.bodytemperature += 15 + if(istype(M, /mob/living/carbon/metroid)) + M.bodytemperature += rand(15,20) data++ ..() return @@ -1828,18 +1826,17 @@ datum M.bodytemperature -= 5 if(holder.has_reagent("capsaicin")) 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)) 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) M.bodytemperature -= 15 if(prob(1)) M.emote("shiver") + if(istype(M, /mob/living/carbon/metroid)) + M.bodytemperature -= rand(15,20) data++ ..() return @@ -1858,7 +1855,7 @@ datum blackpepper name = "Black Pepper" id = "blackpepper" - description = "A power ground from peppercorns. *AAAACHOOO*" + description = "A powder ground from peppercorns. *AAAACHOOO*" reagent_state = SOLID // no color (ie, black) diff --git a/code/modules/mob/living/carbon/alien/larva/hud.dm b/code/modules/mob/living/carbon/alien/larva/hud.dm index e71820e1b15..69de47469ab 100644 --- a/code/modules/mob/living/carbon/alien/larva/hud.dm +++ b/code/modules/mob/living/carbon/alien/larva/hud.dm @@ -149,20 +149,20 @@ mymob.oxygen.icon = 'screen1_alien.dmi' mymob.oxygen.icon_state = "oxy0" 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.icon = 'screen1_alien.dmi' mymob.toxin.icon_state = "tox0" 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.icon = 'screen1_alien.dmi' mymob.fire.icon_state = "fire0" mymob.fire.name = "fire" - mymob.fire.screen_loc = ui_fire + mymob.fire.screen_loc = ui_alien_fire mymob.healths = new /obj/screen( null ) diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 3ea6d135a93..e6d2ee27e0b 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -49,7 +49,7 @@ on_hit(var/atom/target, var/blocked = 0) 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 if(prob(15)) L.apply_effect((rand(30,80)),IRRADIATE)