New Check (#11304)

code/game/objects/items/weapons/cosmetics.dm

@@ -6,40 +6,40 @@
 	icon_state = "lipstick"
 	w_class = ITEMSIZE_TINY
 	slot_flags = SLOT_EARS
-	var/colour = "red"
+	var/lipstick_color = "red"
 	var/open = 0
 	drop_sound = 'sound/items/drop/screwdriver.ogg'
 	pickup_sound = 'sound/items/pickup/screwdriver.ogg'
 
 /obj/item/lipstick/purple
 	name = "purple lipstick"
-	colour = "purple"
+	lipstick_color = "purple"
 
 /obj/item/lipstick/jade
 	name = "jade lipstick"
-	colour = "jade"
+	lipstick_color = "jade"
 
 /obj/item/lipstick/black
 	name = "black lipstick"
-	colour = "black"
+	lipstick_color = "black"
 
 /obj/item/lipstick/pink
 	name = "pink lipstick"
-	colour = "pink"
+	lipstick_color = "pink"
 
 /obj/item/lipstick/random
 	name = "lipstick"
 
-/obj/item/lipstick/random/New()
-	colour = pick("red","purple","jade","pink","black")
-	name = "[colour] lipstick"
-
+/obj/item/lipstick/random/Initialize()
+	. = ..()
+	name = "[lipstick_color] lipstick"
+	lipstick_color = pick("red","purple","jade","pink","black")
 
 /obj/item/lipstick/attack_self(mob/user as mob)
 	to_chat(user, "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>")
 	open = !open
 	if(open)
-		icon_state = "[initial(icon_state)]_[colour]"
+		icon_state = "[initial(icon_state)]_[lipstick_color]"
 	else
 		icon_state = initial(icon_state)
 
@@ -56,7 +56,7 @@
 		if(H == user)
 			user.visible_message("<span class='notice'>[user] does their lips with \the [src].</span>", \
 								 "<span class='notice'>You take a moment to apply \the [src]. Perfect!</span>")
-			H.lip_style = colour
+			H.lip_style = lipstick_color
 			H.update_body()
 		else
 			user.visible_message("<span class='warning'>[user] begins to do [H]'s lips with \the [src].</span>", \
@@ -64,7 +64,7 @@
 			if(do_after(user, 20) && do_after(H, 20, 0))	//user needs to keep their active hand, H does not.
 				user.visible_message("<span class='notice'>[user] does [H]'s lips with \the [src].</span>", \
 									 "<span class='notice'>You apply \the [src].</span>")
-				H.lip_style = colour
+				H.lip_style = lipstick_color
 				H.update_body()
 	else
 		to_chat(user, "<span class='notice'>Where are the lips on that?</span>")

code/game/objects/items/weapons/dna_injector.dm

@@ -24,7 +24,8 @@
 	var/datatype=0
 	var/value=0
 
-/obj/item/dnainjector/New()
+/obj/item/dnainjector/Initialize()
+	. = ..()
 	if(datatype && block)
 		buf=new
 		buf.dna=new

code/game/objects/items/weapons/melee/energy.dm

@@ -236,23 +236,26 @@
 	origin_tech = list(TECH_MAGNET = 3, TECH_ILLEGAL = 4)
 	sharp = 1
 	edge = 1
+	var/possible_blade_colors = "{'red':1,'blue':1,'green':1,'purple':1}"
 	var/blade_color
 	shield_power = 75
 
-/obj/item/melee/energy/sword/New()
-	blade_color = pick("red","blue","green","purple")
+/obj/item/melee/energy/sword/Initialize()
+	. = ..()
+	blade_color = pick(json_decode(possible_blade_colors))
 
-/obj/item/melee/energy/sword/green/New()
+/obj/item/melee/energy/sword/green
+	possible_blade_colors = "{'green':1}"
 	blade_color = "green"
 
-/obj/item/melee/energy/sword/red/New()
-	blade_color = "red"
+/obj/item/melee/energy/sword/red
+	possible_blade_colors = "{'red':1}"
 
-/obj/item/melee/energy/sword/blue/New()
-	blade_color = "blue"
+/obj/item/melee/energy/sword/blue
+	possible_blade_colors = "{'blue':1}"
 
-/obj/item/melee/energy/sword/purple/New()
-	blade_color = "purple"
+/obj/item/melee/energy/sword/purple
+	possible_blade_colors = "{'blue':1}"
 
 /obj/item/melee/energy/sword/activate(mob/living/user)
 	if(!active)

code/game/objects/items/weapons/syndie.dm

@@ -23,7 +23,8 @@
 	power = 2
 	size = "large"
 
-/obj/item/syndie/c4explosive/New()
+/obj/item/syndie/c4explosive/Initialize()
+	. = ..()
 	var/K = rand(1,2000)
 	K = md5(num2text(K)+name)
 	K = copytext(K,1,7)