From e19bcef8322ecdb3710541ed3b28f3c554ec73e7 Mon Sep 17 00:00:00 2001 From: Spades Date: Fri, 7 Jul 2017 23:39:59 -0400 Subject: [PATCH] forgot this --- code/game/objects/random/random_vr.dm | 14 +++-- .../mob/living/simple_animal/vore/gaslamp.dm | 59 ++++++++++--------- vorestation.dme | 1 + 3 files changed, 40 insertions(+), 34 deletions(-) diff --git a/code/game/objects/random/random_vr.dm b/code/game/objects/random/random_vr.dm index fe602654c8..2b2cd396ff 100644 --- a/code/game/objects/random/random_vr.dm +++ b/code/game/objects/random/random_vr.dm @@ -178,16 +178,20 @@ icon = 'icons/mob/screen1.dmi' icon_state = "x" spawn_nothing_percentage = 10 + var/faction = "wild animal" /obj/random/outside_mob/item_to_spawn() // Special version for mobs to have the same faction. - var/mob = pick(prob(20);/mob/living/simple_animal/hostile/scarybat, - prob(10);/mob/living/simple_animal/hostile/dino, - prob(5);/mob/living/simple_animal/otie/feral, - prob(5);/mob/living/simple_animal/hostile/bear, + var/mob = pick(prob(10);/mob/living/simple_animal/hostile/scarybat, + prob(10);/mob/living/simple_animal/retaliate/gaslamp, + prob(10);/mob/living/simple_animal/otie/feral, + prob(5);/mob/living/simple_animal/hostile/dino, + prob(1);/mob/living/simple_animal/hostile/bear, prob(1);/mob/living/simple_animal/hostile/dragon) if (istype(mob, /mob/living)) // This is just to prevent runtime errors in case some dev is a dumbass and puts invalid items into this. var/mob/living/simple_animal/this_mob = mob - this_mob.faction = "wild animal" + this_mob.faction = faction + if (this_mob.minbodytemp > 200) // Temporary hotfix. Eventually I'll add code to change all mob vars to fit the environment they are spawned in. + this_mob.minbodytemp = 200 return this_mob else return mob \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/vore/gaslamp.dm b/code/modules/mob/living/simple_animal/vore/gaslamp.dm index 4ba3152b41..cdef1e7fd5 100644 --- a/code/modules/mob/living/simple_animal/vore/gaslamp.dm +++ b/code/modules/mob/living/simple_animal/vore/gaslamp.dm @@ -1,6 +1,18 @@ -/mob/living/simple_animal/gaslamp +/* +LORE: +Gaslamps are a phoron-based life form endemic to the world of Virgo-3B. They are +a sort of fungal organism with physical ties to Diona and Vox, deriving energy +for movement from a gentle combustion-like reaction in their bodies using +atmospheric phoron, carefully filtered trace oxygen, and captured meat products. +Over-exposure to oxygen causes their insides to burn too hot and eventually +kills them. + +TODO: Make them light up and heat the air when exposed to oxygen. +*/ + +/mob/living/simple_animal/retaliate/gaslamp name = "gaslamp" - desc = "Some sort of floaty alien with a warm glow." + desc = "Some sort of floaty alien with a warm glow. This creature is endemic to Virgo-3B." icon = 'icons/mob/vore32x64.dmi' icon_state = "gaslamp" icon_living = "gaslamp" @@ -16,45 +28,34 @@ speed = 2 - retaliate = 1 + layer = 5 // Tall mob needs this layer. - melee_damage_lower = 10 + melee_damage_lower = 30 // Because fuck anyone who hurts this sweet, innocent creature. melee_damage_upper = 30 - attacktext = "whips" + attacktext = "thrashes" friendly = "caresses" - old_x = 0 - old_y = 0 - pixel_x = 0 - pixel_y = 0 - layer = 9 - - response_help = "tries to help" // If clicked on help intent + response_help = "brushes" // If clicked on help intent response_disarm = "pushes" // If clicked on disarm intent response_harm = "swats" // If clicked on harm intent - //Mob environment settings - minbodytemp = 0 // Minimum "okay" temperature in kelvin - maxbodytemp = 350 // Maximum of above - heat_damage_per_tick = 3 // Amount of damage applied if animal's body temperature is higher than maxbodytemp - cold_damage_per_tick = 2 // Same as heat_damage_per_tick, only if the bodytemperature it's lower than minbodytemp - fire_alert = 0 // 0 = fine, 1 = hot, 2 = cold + minbodytemp = 0 + maxbodytemp = 350 - min_oxy = 0 // Oxygen in moles, minimum, 0 is 'no minimum - max_oxy = 1 // Oxygen in moles, maximum, 0 is 'no maximum' - min_tox = 0 // Phoron min - max_tox = 0 // Phoron max - min_co2 = 0 // CO2 min - max_co2 = 0 // CO2 max - min_n2 = 0 // N2 min - max_n2 = 0 // N2 max - unsuitable_atoms_damage = 2 // This damage is taken when atmos doesn't fit all the requirements above + min_oxy = 0 + max_oxy = 5 // Does not like oxygen very much. + min_tox = 1 // Needs phoron to survive. + max_tox = 0 + min_co2 = 0 + max_co2 = 0 + min_n2 = 0 + max_n2 = 0 // Activate Noms! -/mob/living/simple_animal/gaslamp +/mob/living/simple_animal/retaliate/gaslamp vore_active = 1 vore_capacity = 2 vore_default_mode = DM_ABSORB vore_escape_chance = 10 - vore_pounce_chance = 50 + vore_pounce_chance = 0 // Beat them into crit before eating. vore_icons = SA_ICON_LIVING diff --git a/vorestation.dme b/vorestation.dme index f204cebb43..a3b68fae0d 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1936,6 +1936,7 @@ #include "code\modules\mob\living\simple_animal\vore\dino.dm" #include "code\modules\mob\living\simple_animal\vore\dragon.dm" #include "code\modules\mob\living\simple_animal\vore\frog.dm" +#include "code\modules\mob\living\simple_animal\vore\gaslamp.dm" #include "code\modules\mob\living\simple_animal\vore\horse.dm" #include "code\modules\mob\living\simple_animal\vore\otie.dm" #include "code\modules\mob\living\simple_animal\vore\panther.dm"