Massive code fix to get the codebase ready to compile in BYOND 500

This commit is contained in:
ZomgPonies
2013-09-15 23:58:16 -04:00
parent 9bde25863f
commit 640e38ce23
50 changed files with 461 additions and 459 deletions
@@ -493,7 +493,7 @@ proc/get_damage_icon_part(damage_state, body_part)
/mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1)
if(w_uniform && istype(w_uniform, /obj/item/clothing/under) )
w_uniform.screen_loc = ui_iclothing
var/t_color = w_uniform.color
var/t_color = w_uniform._color
if(!t_color) t_color = icon_state
var/image/lying = image("icon_state" = "[t_color]_l")
var/image/standing = image("icon_state" = "[t_color]_s")
@@ -507,7 +507,7 @@ proc/get_damage_icon_part(damage_state, body_part)
standing.overlays += image("icon" = 'icons/effects/blood.dmi', "icon_state" = "uniformblood")
if(w_uniform:hastie) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE.
var/tie_color = w_uniform:hastie.color
var/tie_color = w_uniform:hastie._color
if(!tie_color) tie_color = w_uniform:hastie.icon_state
lying.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]2")
standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")
@@ -900,7 +900,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
desc = "a golem's skin"
icon_state = "golem"
item_state = "golem"
color = "golem"
_color = "golem"
has_sensor = 0
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
canremove = 0
@@ -965,7 +965,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75
/obj/item/clothing/head/space/golem
icon_state = "golem"
item_state = "dermal"
color = "dermal"
_color = "dermal"
name = "golem's head"
desc = "a golem's head"
canremove = 0
@@ -207,17 +207,17 @@ var/global/chicken_count = 0
attacktext = "kicks"
health = 10
var/eggsleft = 0
var/color
var/_color
pass_flags = PASSTABLE
small = 1
/mob/living/simple_animal/chicken/New()
..()
if(!color)
color = pick( list("brown","black","white") )
icon_state = "chicken_[color]"
icon_living = "chicken_[color]"
icon_dead = "chicken_[color]_dead"
if(!_color)
_color = pick( list("brown","black","white") )
icon_state = "chicken_[_color]"
icon_living = "chicken_[_color]"
icon_dead = "chicken_[_color]_dead"
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
chicken_count += 1
@@ -21,7 +21,7 @@
response_disarm = "gently pushes aside the"
response_harm = "stamps on the"
density = 0
var/color //brown, gray and white, leave blank for random
var/_color //brown, gray and white, leave blank for random
layer = MOB_LAYER
min_oxy = 16 //Require atleast 16kPA oxygen
minbodytemp = 223 //Below -50 Degrees Celcius
@@ -36,33 +36,33 @@
if(!ckey && stat == CONSCIOUS && prob(0.5))
stat = UNCONSCIOUS
icon_state = "mouse_[color]_sleep"
icon_state = "mouse_[_color]_sleep"
wander = 0
speak_chance = 0
//snuffles
else if(stat == UNCONSCIOUS)
if(ckey || prob(1))
stat = CONSCIOUS
icon_state = "mouse_[color]"
icon_state = "mouse_[_color]"
wander = 1
else if(prob(5))
emote("snuffles")
/mob/living/simple_animal/mouse/New()
..()
if(!color)
color = pick( list("brown","gray","white") )
icon_state = "mouse_[color]"
icon_living = "mouse_[color]"
icon_dead = "mouse_[color]_dead"
desc = "It's a small [color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
if(!_color)
_color = pick( list("brown","gray","white") )
icon_state = "mouse_[_color]"
icon_living = "mouse_[_color]"
icon_dead = "mouse_[_color]_dead"
desc = "It's a small [_color] rodent, often seen hiding in maintenance areas and making a nuisance of itself."
/mob/living/simple_animal/mouse/proc/splat()
src.health = 0
src.stat = DEAD
src.icon_dead = "mouse_[color]_splat"
src.icon_state = "mouse_[color]_splat"
src.icon_dead = "mouse_[_color]_splat"
src.icon_state = "mouse_[_color]_splat"
if(client)
client.time_died_as_mouse = world.time
@@ -188,15 +188,15 @@
*/
/mob/living/simple_animal/mouse/white
color = "white"
_color = "white"
icon_state = "mouse_white"
/mob/living/simple_animal/mouse/gray
color = "gray"
_color = "gray"
icon_state = "mouse_gray"
/mob/living/simple_animal/mouse/brown
color = "brown"
_color = "brown"
icon_state = "mouse_brown"
//TOM IS ALIVE! SQUEEEEEEEE~K :)