Refactors code to work with BYOND 500.

500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-09-22 12:39:48 +01:00
parent 2493a0a671
commit e9bf414820
51 changed files with 1372 additions and 1373 deletions
@@ -10,7 +10,7 @@
if(!istype(A,/obj/machinery/atmospherics/pipe) || istype(A,/obj/machinery/atmospherics/pipe/tank) || istype(A,/obj/machinery/atmospherics/pipe/vent) || istype(A,/obj/machinery/atmospherics/pipe/simple/heat_exchanging) || istype(A,/obj/machinery/atmospherics/pipe/simple/insulated))
return
var/obj/machinery/atmospherics/pipe/P = A
P.color = mode
P.pipe_color = mode
user.visible_message("<span class='notice'>[user] paints \the [P] [mode].</span>","<span class='notice'>You paint \the [P] [mode].</span>")
P.update_icon()
@@ -7,7 +7,7 @@
var/implanted = null
var/mob/imp_in = null
var/datum/organ/external/part = null
color = "b"
item_color = "b"
var/allow_reagents = 0
var/malfunction = 0
@@ -15,7 +15,7 @@
update()
if (src.imp)
src.icon_state = text("implantcase-[]", src.imp.color)
src.icon_state = text("implantcase-[]", src.imp.item_color)
else
src.icon_state = "implantcase-0"
return
@@ -3,7 +3,7 @@
/obj/item/weapon/implant/freedom
name = "freedom"
desc = "Use this to escape from those evil Red Shirts."
color = "r"
item_color = "r"
var/activation_emote = "chuckle"
var/uses = 1.0
@@ -24,7 +24,7 @@
return 0
/obj/item/weapon/melee/energy/sword/New()
color = pick("red","blue","green","purple")
item_color = pick("red","blue","green","purple")
/obj/item/weapon/melee/energy/sword/attack_self(mob/living/user as mob)
if ((CLUMSY in user.mutations) && prob(50))
@@ -36,7 +36,7 @@
if(istype(src,/obj/item/weapon/melee/energy/sword/pirate))
icon_state = "cutlass1"
else
icon_state = "sword[color]"
icon_state = "sword[item_color]"
w_class = 4
playsound(user, 'sound/weapons/saberon.ogg', 50, 1)
user << "\blue [src] is now active."
@@ -180,11 +180,11 @@
/obj/item/weapon/melee/energy/sword/green
New()
color = "green"
item_color = "green"
/obj/item/weapon/melee/energy/sword/red
New()
color = "red"
item_color = "red"
/obj/item/weapon/melee/energy/blade/New()
spark_system = new /datum/effect/effect/system/spark_spread()