New Check (#11304)

code/game/objects/items/bees_items.dm

@@ -19,9 +19,11 @@
 	name = "bottle of BeezEez"
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "bottle17"
-	New()
-		src.pixel_x = rand(-5.0, 5)
-		src.pixel_y = rand(-5.0, 5)
+	randpixel = 5
+
+/obj/item/beezeez/Initialize()
+	. = ..()
+	randpixel_xy()
 
 /obj/item/reagent_containers/food/snacks/honeycomb
 	name = "honeycomb"

code/game/objects/items/devices/spy_bug.dm

@@ -19,8 +19,8 @@
 	var/obj/item/device/radio/spy/radio
 	var/obj/machinery/camera/spy/camera
 
-/obj/item/device/spy_bug/New()
-	..()
+/obj/item/device/spy_bug/Initialize()
+	. = ..()
 	radio = new(src)
 	camera = new(src)
 	listening_objects += src
@@ -67,7 +67,8 @@
 	var/obj/machinery/camera/spy/selected_camera
 	var/list/obj/machinery/camera/spy/cameras = new()
 
-/obj/item/device/spy_monitor/New()
+/obj/item/device/spy_monitor/Initialize()
+	. = ..()
 	radio = new(src)
 	listening_objects += src
 

code/game/objects/items/devices/uplink.dm

@@ -22,17 +22,20 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/uplink/ui_host()
 	return loc
 
-/obj/item/device/uplink/New(var/location, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
-	..()
-	src.uplink_owner = owner
-	purchase_log = list()
-	world_uplinks += src
-	uses = telecrystals
+/obj/item/device/uplink/Initialize(mapload, var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
+	. = ..()
+	do_uplink_action(owner, telecrystals)
 
 /obj/item/device/uplink/Destroy()
 	world_uplinks -= src
 	return ..()
 
+/obj/item/device/uplink/proc/do_uplink_action(var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
+	src.uplink_owner = owner
+	purchase_log = list()
+	world_uplinks += src
+	uses = telecrystals
+
 // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
 /* How to create an uplink in 3 easy steps!
 
@@ -53,15 +56,16 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	var/exploit_id								// Id of the current exploit record we are viewing
 	var/pda_code = ""
 
-
 // The hidden uplink MUST be inside an obj/item's contents.
-/obj/item/device/uplink/hidden/New()
-	spawn(2)
-		if(!istype(src.loc, /obj/item))
-			qdel(src)
+/obj/item/device/uplink/hidden/do_uplink_action(var/datum/mind/owner, var/telecrystals = DEFAULT_TELECRYSTAL_AMOUNT)
 	..()
 	nanoui_data = list()
 	update_nano_data()
+	addtimer(CALLBACK(src, .proc/check_loc), 2)
+
+/obj/item/device/uplink/hidden/proc/check_loc()
+	if(!isitem(loc))
+		qdel(src)
 
 // Toggles the uplink on and off. Normally this will bypass the item's normal functions and go to the uplink menu, if activated.
 /obj/item/device/uplink/hidden/proc/toggle()
@@ -314,26 +318,28 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 // Includes normal radio uplink, multitool uplink,
 // implant uplink (not the implant tool) and a preset headset uplink.
 
-/obj/item/device/radio/uplink/New(var/loc, var/mind)
+/obj/item/device/radio/uplink/Initialize(mapload, var/datum/mind/mind)
+	. = ..()
 	hidden_uplink = new(src, mind)
 	icon_state = "radio"
 
-/obj/item/device/radio/uplink/attack_self(mob/user as mob)
+/obj/item/device/radio/uplink/attack_self(mob/user)
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)
 
-/obj/item/device/multitool/uplink/New(var/loc, var/mind)
+/obj/item/device/multitool/uplink/Initialize(mapload, var/datum/mind/mind)
+	. = ..()
 	hidden_uplink = new(src, mind)
 
-/obj/item/device/multitool/uplink/attack_self(mob/user as mob)
+/obj/item/device/multitool/uplink/attack_self(mob/user)
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)
 
 /obj/item/device/radio/headset/uplink
 	traitor_frequency = 1445
 
-/obj/item/device/radio/headset/uplink/New(var/loc, var/mind)
-	..()
+/obj/item/device/radio/headset/uplink/Initialize(mapload, var/datum/mind/mind)
+	. = ..()
 	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
 
@@ -349,13 +355,13 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	flags = CONDUCT
 	w_class = ITEMSIZE_SMALL
 
-/obj/item/device/contract_uplink/New(var/loc, var/mind)
-	..()
+/obj/item/device/contract_uplink/Initialize(mapload, var/datum/mind/mind)
+	. = ..()
 	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = 0
 	hidden_uplink.nanoui_menu = 3
 
-/obj/item/device/contract_uplink/attack_self(mob/user as mob)
+/obj/item/device/contract_uplink/attack_self(mob/user)
 	if (hidden_uplink)
 		hidden_uplink.trigger(user)
 
@@ -368,7 +374,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	desc_antag = "This device allows you to create a single central command report. It has only one use."
 	w_class = ITEMSIZE_SMALL
 
-/obj/item/device/announcer/attack_self(mob/user as mob)
+/obj/item/device/announcer/attack_self(mob/user)
 	if(!player_is_antag(user.mind))
 		return
 
@@ -394,8 +400,8 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	w_class = ITEMSIZE_SMALL
 	var/starting_telecrystals // how much telecrystals the uplink should spawn with, defaults to default amount if not set
 
-/obj/item/device/special_uplink/New(var/loc, var/mind)
-	..()
+/obj/item/device/special_uplink/Initialize(mapload, var/datum/mind/mind)
+	. = ..()
 	hidden_uplink = new(src, mind)
 	if(!starting_telecrystals)
 		hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
@@ -403,7 +409,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 		hidden_uplink.uses = starting_telecrystals
 	hidden_uplink.nanoui_menu = 1
 
-/obj/item/device/special_uplink/attack_self(mob/user as mob)
+/obj/item/device/special_uplink/attack_self(mob/user)
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)
 

code/game/objects/items/toys.dm

@@ -43,10 +43,10 @@
 	drop_sound = 'sound/items/drop/rubber.ogg'
 	pickup_sound = 'sound/items/pickup/rubber.ogg'
 
-/obj/item/toy/waterballoon/New()
-	var/datum/reagents/R = new/datum/reagents(10)
+/obj/item/toy/waterballoon/Initialize()
+	. = ..()
+	var/datum/reagents/R = new /datum/reagents(10, src)
 	reagents = R
-	R.my_atom = src
 
 /obj/item/toy/waterballoon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
 	return

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)