diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 95c9ad8c189..36abb6fba1f 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -59,7 +59,7 @@
to_chat(user, "A no server error appears on the screen.")
/obj/machinery/computer/message_monitor/New()
- . = ..()
+ ..()
GLOB.telecomms_list += src
/obj/machinery/computer/message_monitor/Initialize()
@@ -75,7 +75,7 @@
/obj/machinery/computer/message_monitor/Destroy()
GLOB.telecomms_list -= src
- . = ..()
+ return ..()
/obj/machinery/computer/message_monitor/ui_interact(mob/living/user)
. = ..()
diff --git a/code/game/objects/items/AI_modules.dm b/code/game/objects/items/AI_modules.dm
index f7b3726b26a..9ae32b7af37 100644
--- a/code/game/objects/items/AI_modules.dm
+++ b/code/game/objects/items/AI_modules.dm
@@ -336,8 +336,8 @@ AI MODULES
/obj/item/aiModule/core/full
var/law_id // if non-null, loads the laws from the ai_laws datums
-/obj/item/aiModule/core/full/New()
- ..()
+/obj/item/aiModule/core/full/Initialize()
+ . = ..()
if(!law_id)
return
var/datum/ai_laws/D = new
diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm
index 1c6cc9cfcb3..e130fd4dbe2 100644
--- a/code/game/objects/items/RPD.dm
+++ b/code/game/objects/items/RPD.dm
@@ -204,9 +204,9 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
var/static/datum/pipe_info/first_transit
var/mode = BUILD_MODE | PAINT_MODE | DESTROY_MODE | WRENCH_MODE
-/obj/item/pipe_dispenser/New()
+/obj/item/pipe_dispenser/Initialize()
. = ..()
- spark_system = new /datum/effect_system/spark_spread
+ spark_system = new
spark_system.set_up(5, 0, src)
spark_system.attach(src)
if(!first_atmos)
diff --git a/code/game/objects/items/cigs_lighters.dm b/code/game/objects/items/cigs_lighters.dm
index 47ec6097cf1..ce7026e13e0 100644
--- a/code/game/objects/items/cigs_lighters.dm
+++ b/code/game/objects/items/cigs_lighters.dm
@@ -309,10 +309,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
chem_volume = 50
list_reagents = null
-/obj/item/clothing/mask/cigarette/rollie/New()
- ..()
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
+/obj/item/clothing/mask/cigarette/rollie/Initialize()
+ . = ..()
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
/obj/item/clothing/mask/cigarette/rollie/nicotine
list_reagents = list("nicotine" = 15)
@@ -332,10 +332,10 @@ CIGARETTE PACKETS ARE IN FANCY.DM
desc = "A manky old roach, or for non-stoners, a used rollup."
icon_state = "roach"
-/obj/item/cigbutt/roach/New()
- ..()
- src.pixel_x = rand(-5, 5)
- src.pixel_y = rand(-5, 5)
+/obj/item/cigbutt/roach/Initialize()
+ . = ..()
+ pixel_x = rand(-5, 5)
+ pixel_y = rand(-5, 5)
////////////
diff --git a/code/game/objects/items/cosmetics.dm b/code/game/objects/items/cosmetics.dm
index 6bcf2d620f9..03a751c2b90 100644
--- a/code/game/objects/items/cosmetics.dm
+++ b/code/game/objects/items/cosmetics.dm
@@ -25,8 +25,8 @@
name = "lipstick"
icon_state = "random_lipstick"
-/obj/item/lipstick/random/New()
- ..()
+/obj/item/lipstick/random/Initialize()
+ . = ..()
icon_state = "lipstick"
colour = pick("red","purple","lime","black","green","blue","white")
name = "[colour] lipstick"
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index 421cc0989c8..ff33409d9ee 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -186,8 +186,8 @@
bot_access_flags = SEC_BOT | MULE_BOT | FLOOR_BOT | CLEAN_BOT | MED_BOT
spam_enabled = 1
-/obj/item/cartridge/captain/New()
- ..()
+/obj/item/cartridge/captain/Initialize()
+ . = ..()
radio = new(src)
/obj/item/cartridge/proc/post_status(command, data1, data2)
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index f39d2ba0d6f..25d3d63b942 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -16,8 +16,8 @@
var/obj/effect/dummy/chameleon/active_dummy = null
var/saved_appearance = null
-/obj/item/chameleon/New()
- ..()
+/obj/item/chameleon/Initialize()
+ . = ..()
var/obj/item/cigbutt/butt = /obj/item/cigbutt
saved_appearance = initial(butt.appearance)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index c253714d132..585ff1e446f 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -262,9 +262,9 @@
light_color = LIGHT_COLOR_FLARE
grind_results = list("sulfur" = 15)
-/obj/item/flashlight/flare/New()
+/obj/item/flashlight/flare/Initialize()
+ . = ..()
fuel = rand(800, 1000) // Sorry for changing this so much but I keep under-estimating how long X number of ticks last in seconds.
- ..()
/obj/item/flashlight/flare/process()
open_flame(heat)
diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm
index 7c6616af480..c7028210ef2 100644
--- a/code/game/objects/items/devices/laserpointer.dm
+++ b/code/game/objects/items/devices/laserpointer.dm
@@ -28,14 +28,14 @@
/obj/item/laser_pointer/purple
pointer_icon_state = "purple_laser"
-/obj/item/laser_pointer/New()
- ..()
+/obj/item/laser_pointer/Initialize()
+ . = ..()
diode = new(src)
if(!pointer_icon_state)
pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
-/obj/item/laser_pointer/upgraded/New()
- ..()
+/obj/item/laser_pointer/upgraded/Initialize()
+ . = ..()
diode = new /obj/item/stock_parts/micro_laser/ultra
/obj/item/laser_pointer/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 12ff7e27f53..2c2155abbcd 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -54,8 +54,7 @@
force = 8
var/max_uses = 20
- var/uses = 0
- var/failmsg = ""
+ var/uses = 10
// How much to increase per each glass?
var/increment = 5
// How much to take from the glass?
@@ -67,11 +66,6 @@
// when we get this many shards, we get a free bulb.
var/shards_required = 4
-/obj/item/lightreplacer/New()
- uses = max_uses / 2
- failmsg = "The [name]'s refill light blinks red."
- ..()
-
/obj/item/lightreplacer/examine(mob/user)
..()
to_chat(user, status_string())
@@ -85,19 +79,19 @@
return
else if(G.use(decrement))
AddUses(increment)
- to_chat(user, "You insert a piece of glass into the [src.name]. You have [uses] light\s remaining.")
+ to_chat(user, "You insert a piece of glass into \the [src.name]. You have [uses] light\s remaining.")
return
else
to_chat(user, "You need one sheet of glass to replace lights!")
if(istype(W, /obj/item/shard))
if(uses >= max_uses)
- to_chat(user, "[src.name] is full.")
+ to_chat(user, "\The [src] is full.")
return
if(!user.temporarilyRemoveItemFromInventory(W))
return
AddUses(round(increment*0.75))
- to_chat(user, "You insert a shard of glass into [src]. You have [uses] light\s remaining.")
+ to_chat(user, "You insert a shard of glass into \the [src]. You have [uses] light\s remaining.")
qdel(W)
return
@@ -112,7 +106,7 @@
else
if(!user.temporarilyRemoveItemFromInventory(W))
return
- to_chat(user, "You insert [L] into [src].")
+ to_chat(user, "You insert [L] into \the [src].")
AddShards(1, user)
qdel(L)
return
@@ -196,7 +190,7 @@
if(CanUse(U))
if(!Use(U))
return
- to_chat(U, "You replace the [target.fitting] with \the [src].")
+ to_chat(U, "You replace \the [target.fitting] with \the [src].")
if(target.status != LIGHT_EMPTY)
AddShards(1, U)
@@ -218,7 +212,7 @@
return
else
- to_chat(U, failmsg)
+ to_chat(U, "\The [src]'s refill light blinks red.")
return
else
to_chat(U, "There is a working [target.fitting] already inserted!")
@@ -256,7 +250,7 @@
ReplaceLight(A, U)
if(!used)
- to_chat(U, failmsg)
+ to_chat(U, "\The [src]'s refill light blinks red.")
/obj/item/lightreplacer/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
J.put_in_cart(src, user)
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index e995f9fe744..51644def540 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -286,6 +286,6 @@
/obj/item/tape/random
icon_state = "random_tape"
-/obj/item/tape/random/New()
+/obj/item/tape/random/Initialize()
+ . = ..()
icon_state = "tape_[pick("white", "blue", "red", "yellow", "purple")]"
- ..()
diff --git a/code/game/objects/items/grenades/clusterbuster.dm b/code/game/objects/items/grenades/clusterbuster.dm
index 923361de3c1..9947e38af95 100644
--- a/code/game/objects/items/grenades/clusterbuster.dm
+++ b/code/game/objects/items/grenades/clusterbuster.dm
@@ -173,10 +173,11 @@
/obj/item/grenade/clusterbuster/random
icon_state = "random_clusterbang"
-/obj/item/grenade/clusterbuster/random/New()
+/obj/item/grenade/clusterbuster/random/Initialize()
+ ..()
var/real_type = pick(subtypesof(/obj/item/grenade/clusterbuster))
new real_type(loc)
- qdel(src)
+ return INITIALIZE_HINT_QDEL
//rainbow slime effect
/obj/item/grenade/clusterbuster/slime
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index 6ec13a9b73b..2b60b77c538 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -177,9 +177,9 @@
var/open_panel = 0
can_attach_mob = TRUE
-/obj/item/grenade/plastic/c4/New()
+/obj/item/grenade/plastic/c4/Initialize()
+ . = ..()
wires = new /datum/wires/explosive/c4(src)
- ..()
/obj/item/grenade/plastic/c4/Destroy()
qdel(wires)
diff --git a/code/game/objects/items/grenades/smokebomb.dm b/code/game/objects/items/grenades/smokebomb.dm
index d822ede78c5..d96c4c46b63 100644
--- a/code/game/objects/items/grenades/smokebomb.dm
+++ b/code/game/objects/items/grenades/smokebomb.dm
@@ -8,10 +8,10 @@
slot_flags = ITEM_SLOT_BELT
var/datum/effect_system/smoke_spread/bad/smoke
-/obj/item/grenade/smokebomb/New()
- ..()
- src.smoke = new /datum/effect_system/smoke_spread/bad
- src.smoke.attach(src)
+/obj/item/grenade/smokebomb/Initialize()
+ . = ..()
+ smoke = new
+ smoke.attach(src)
/obj/item/grenade/smokebomb/Destroy()
qdel(smoke)
@@ -19,7 +19,7 @@
/obj/item/grenade/smokebomb/prime()
update_mob()
- playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
+ playsound(src, 'sound/effects/smoke.ogg', 50, 1, -3)
smoke.set_up(4, src)
smoke.start()
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 253d055e0fd..c3f3d360371 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -301,8 +301,8 @@
item_flags = DROPDEL
flags_1 = NONE
-/obj/item/restraints/legcuffs/beartrap/energy/New()
- ..()
+/obj/item/restraints/legcuffs/beartrap/energy/Initialize()
+ . = ..()
addtimer(CALLBACK(src, .proc/dissipate), 100)
/obj/item/restraints/legcuffs/beartrap/energy/proc/dissipate()
@@ -312,7 +312,7 @@
/obj/item/restraints/legcuffs/beartrap/energy/attack_hand(mob/user)
Crossed(user) //honk
- . = ..()
+ return ..()
/obj/item/restraints/legcuffs/beartrap/energy/cyborg
breakouttime = 20 // Cyborgs shouldn't have a strong restraint
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index 9be7aa45d14..2b6b3e2f084 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -19,8 +19,8 @@
force_string = "robust... against germs"
var/insertable = TRUE
-/obj/item/mop/New()
- ..()
+/obj/item/mop/Initialize()
+ . = ..()
create_reagents(mopcap)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 93620cc4759..2f6f3d579b8 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -347,20 +347,14 @@
desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change."
-/obj/item/storage/box/itemset/crusader/blue/New()
- ..()
- contents = list()
- sleep(1)
+/obj/item/storage/box/itemset/crusader/blue/PopulateContents()
new /obj/item/clothing/suit/armor/plate/crusader/blue(src)
new /obj/item/clothing/head/helmet/plate/crusader/blue(src)
new /obj/item/clothing/gloves/plate/blue(src)
new /obj/item/clothing/shoes/plate/blue(src)
-/obj/item/storage/box/itemset/crusader/red/New()
- ..()
- contents = list()
- sleep(1)
+/obj/item/storage/box/itemset/crusader/red/PopulateContents()
new /obj/item/clothing/suit/armor/plate/crusader/red(src)
new /obj/item/clothing/head/helmet/plate/crusader/red(src)
new /obj/item/clothing/gloves/plate/red(src)
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index c2651e78650..f8de45585fd 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -523,7 +523,8 @@
var/color2 = rgb(0, 0, 0)
nodamage = TRUE
-/obj/item/projectile/bullet/reusable/lollipop/New()
+/obj/item/projectile/bullet/reusable/lollipop/Initialize()
+ . = ..()
var/obj/item/reagent_containers/food/snacks/lollipop/S = new ammo_type(src)
color2 = S.headcolor
var/mutable_appearance/head = mutable_appearance('icons/obj/projectiles.dmi', "lollipop_2")
@@ -728,17 +729,15 @@
name = "medical hud"
icon_state = "healthhud"
-/obj/item/borg/sight/hud/med/New()
- ..()
+/obj/item/borg/sight/hud/med/Initialize()
+ . = ..()
hud = new /obj/item/clothing/glasses/hud/health(src)
- return
/obj/item/borg/sight/hud/sec
name = "security hud"
icon_state = "securityhud"
-/obj/item/borg/sight/hud/sec/New()
- ..()
+/obj/item/borg/sight/hud/sec/Initialize()
+ . = ..()
hud = new /obj/item/clothing/glasses/hud/security(src)
- return
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index b3b5f3d428e..ac2b76d0a18 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -22,11 +22,12 @@
var/aisync = 1
var/panel_locked = TRUE
-/obj/item/robot_suit/New()
- ..()
- updateicon()
+/obj/item/robot_suit/Initialize()
+ . = ..()
+ update_icon()
-/obj/item/robot_suit/prebuilt/New()
+/obj/item/robot_suit/prebuilt/Initialize()
+ . = ..()
l_arm = new(src)
r_arm = new(src)
l_leg = new(src)
@@ -37,9 +38,8 @@
chest = new(src)
chest.wired = TRUE
chest.cell = new /obj/item/stock_parts/cell/high/plus(chest)
- ..()
-/obj/item/robot_suit/proc/updateicon()
+/obj/item/robot_suit/update_icon()
cut_overlays()
if(l_arm)
add_overlay("[l_arm.icon_state]+o")
@@ -96,7 +96,7 @@
to_chat(user, "You disassemble the cyborg shell.")
else
to_chat(user, "There is nothing to remove from the endoskeleton.")
- updateicon()
+ update_icon()
/obj/item/robot_suit/proc/put_in_hand_or_drop(mob/living/user, obj/item/I) //normal put_in_hands() drops the item ontop of the player, this drops it at the suit's loc
if(!user.put_in_hands(I))
@@ -153,14 +153,14 @@
to_chat(user, "You need one sheet of metal to start building ED-209!")
return
else if(istype(W, /obj/item/bodypart/l_leg/robot))
- if(src.l_leg)
+ if(l_leg)
return
if(!user.transferItemToLoc(W, src))
return
W.icon_state = initial(W.icon_state)
W.cut_overlays()
- src.l_leg = W
- src.updateicon()
+ l_leg = W
+ update_icon()
else if(istype(W, /obj/item/bodypart/r_leg/robot))
if(src.r_leg)
@@ -169,40 +169,40 @@
return
W.icon_state = initial(W.icon_state)
W.cut_overlays()
- src.r_leg = W
- src.updateicon()
+ r_leg = W
+ update_icon()
else if(istype(W, /obj/item/bodypart/l_arm/robot))
- if(src.l_arm)
+ if(l_arm)
return
if(!user.transferItemToLoc(W, src))
return
W.icon_state = initial(W.icon_state)
W.cut_overlays()
- src.l_arm = W
- src.updateicon()
+ l_arm = W
+ update_icon()
else if(istype(W, /obj/item/bodypart/r_arm/robot))
- if(src.r_arm)
+ if(r_arm)
return
if(!user.transferItemToLoc(W, src))
return
W.icon_state = initial(W.icon_state)//in case it is a dismembered robotic limb
W.cut_overlays()
- src.r_arm = W
- src.updateicon()
+ r_arm = W
+ update_icon()
else if(istype(W, /obj/item/bodypart/chest/robot))
var/obj/item/bodypart/chest/robot/CH = W
- if(src.chest)
+ if(chest)
return
if(CH.wired && CH.cell)
if(!user.transferItemToLoc(CH, src))
return
CH.icon_state = initial(CH.icon_state) //in case it is a dismembered robotic limb
CH.cut_overlays()
- src.chest = CH
- src.updateicon()
+ chest = CH
+ update_icon()
else if(!CH.wired)
to_chat(user, "You need to attach wires to it first!")
else
@@ -214,15 +214,15 @@
if(istype(X, /obj/item/organ))
to_chat(user, "There are organs inside [HD]!")
return
- if(src.head)
+ if(head)
return
if(HD.flash2 && HD.flash1)
if(!user.transferItemToLoc(HD, src))
return
HD.icon_state = initial(HD.icon_state)//in case it is a dismembered robotic limb
HD.cut_overlays()
- src.head = HD
- src.updateicon()
+ head = HD
+ update_icon()
else
to_chat(user, "You need to attach a flash to it first!")
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index e25f18d798b..2de9c20dd92 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -43,9 +43,9 @@
item_state = "balloon-empty"
-/obj/item/toy/balloon/New()
+/obj/item/toy/balloon/Initialize()
+ . = ..()
create_reagents(10)
- ..()
/obj/item/toy/balloon/attack(mob/living/carbon/human/M, mob/user)
return
@@ -412,7 +412,7 @@
/obj/effect/decal/cleanable/ash/snappop_phoenix
var/respawn_time = 300
-/obj/effect/decal/cleanable/ash/snappop_phoenix/New()
+/obj/effect/decal/cleanable/ash/snappop_phoenix/Initialize()
. = ..()
addtimer(CALLBACK(src, .proc/respawn), respawn_time)
@@ -649,10 +649,10 @@
var/obj/machinery/computer/holodeck/holo = null // Holodeck cards should not be infinite
var/list/cards = list()
-/obj/item/toy/cards/deck/New()
- ..()
+/obj/item/toy/cards/deck/Initialize()
+ . = ..()
icon_state = "deck_[deckstyle]_full"
- for(var/i = 2; i <= 10; i++)
+ for(var/i in 2 to 10)
cards += "[i] of Hearts"
cards += "[i] of Spades"
cards += "[i] of Clubs"
@@ -1175,9 +1175,9 @@
var/toysay = "What the fuck did you do?"
var/toysound = 'sound/machines/click.ogg'
-/obj/item/toy/figure/New()
- desc = "A \"Space Life\" brand [src]."
- ..()
+/obj/item/toy/figure/Initialize()
+ . = ..()
+ desc = "A \"Space Life\" brand [src]."
/obj/item/toy/figure/attack_self(mob/user as mob)
if(cooldown <= world.time)
diff --git a/code/game/objects/structures/ai_core.dm b/code/game/objects/structures/ai_core.dm
index 390e28893d8..b4dce92f23a 100644
--- a/code/game/objects/structures/ai_core.dm
+++ b/code/game/objects/structures/ai_core.dm
@@ -301,8 +301,8 @@
anchored = TRUE
state = AI_READY_CORE
-/obj/structure/AIcore/deactivated/New()
- ..()
+/obj/structure/AIcore/deactivated/Initialize()
+ . = ..()
circuit = new(src)
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 8d1a4d20b65..699b7c4c774 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -140,12 +140,12 @@
/obj/item/roller/robo //ROLLER ROBO DA!
name = "roller bed dock"
- var/loaded = null
-
-/obj/item/roller/robo/New()
- loaded = new /obj/structure/bed/roller(src)
desc = "A collapsed roller bed that can be ejected for emergency use. Must be collected or replaced after use."
- ..()
+ var/obj/structure/bed/roller/loaded = null
+
+/obj/item/roller/robo/Initialize()
+ . = ..()
+ loaded = new(src)
/obj/item/roller/robo/examine(mob/user)
..()
@@ -153,8 +153,7 @@
/obj/item/roller/robo/deploy_roller(mob/user, atom/location)
if(loaded)
- var/obj/structure/bed/roller/R = loaded
- R.forceMove(location)
+ loaded.forceMove(location)
user.visible_message("[user] deploys [loaded].", "You deploy [loaded].")
loaded = null
else
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index efee51a3de3..f8135538c30 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -15,8 +15,8 @@
delivery_icon = "deliverycrate"
var/obj/item/paper/fluff/jobs/cargo/manifest/manifest
-/obj/structure/closet/crate/New()
- ..()
+/obj/structure/closet/crate/Initialize()
+ . = ..()
if(icon_state == "[initial(icon_state)]open")
opened = TRUE
update_icon()
diff --git a/code/game/objects/structures/crates_lockers/crates/bins.dm b/code/game/objects/structures/crates_lockers/crates/bins.dm
index c0ca1277d3c..5737ffb38ec 100644
--- a/code/game/objects/structures/crates_lockers/crates/bins.dm
+++ b/code/game/objects/structures/crates_lockers/crates/bins.dm
@@ -8,8 +8,8 @@
horizontal = FALSE
delivery_icon = null
-/obj/structure/closet/crate/bin/New()
- ..()
+/obj/structure/closet/crate/bin/Initialize()
+ . = ..()
update_icon()
/obj/structure/closet/crate/bin/update_icon()
diff --git a/code/game/objects/structures/crates_lockers/crates/critter.dm b/code/game/objects/structures/crates_lockers/crates/critter.dm
index b9f0f4b4a7c..b94da08322b 100644
--- a/code/game/objects/structures/crates_lockers/crates/critter.dm
+++ b/code/game/objects/structures/crates_lockers/crates/critter.dm
@@ -10,8 +10,8 @@
delivery_icon = "deliverybox"
var/obj/item/tank/internals/emergency_oxygen/tank
-/obj/structure/closet/crate/critter/New()
- ..()
+/obj/structure/closet/crate/critter/Initialize()
+ . = ..()
tank = new
/obj/structure/closet/crate/critter/Destroy()
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 49363999e1c..e50b4d91f9f 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -20,10 +20,10 @@
var/material_type = /obj/item/stack/sheet/metal
var/material_amt = 4
-/obj/structure/door_assembly/New()
+/obj/structure/door_assembly/Initialize()
+ . = ..()
update_icon()
update_name()
- ..()
/obj/structure/door_assembly/examine(mob/user)
..()
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index f85384e0b66..1fcafb9a385 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -6,8 +6,8 @@
var/last_time = 1
item_chair = null
-/obj/structure/chair/e_chair/New()
- ..()
+/obj/structure/chair/e_chair/Initialize()
+ . = ..()
add_overlay(mutable_appearance('icons/obj/chairs.dmi', "echair_over", MOB_LAYER + 1))
/obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, params)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 5b0abec6775..64d62b6f51b 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -291,8 +291,8 @@
desc = "A strangely-shaped grille."
broken_type = /obj/structure/grille/ratvar/broken
-/obj/structure/grille/ratvar/New()
- ..()
+/obj/structure/grille/ratvar/Initialize()
+ . = ..()
if(broken)
new /obj/effect/temp_visual/ratvar/grille/broken(get_turf(src))
else
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
index de3c07b4107..741b24b6e97 100644
--- a/code/game/objects/structures/hivebot.dm
+++ b/code/game/objects/structures/hivebot.dm
@@ -8,8 +8,8 @@
var/bot_type = "norm"
var/bot_amt = 10
-/obj/structure/hivebot_beacon/New()
- ..()
+/obj/structure/hivebot_beacon/Initialize()
+ . = ..()
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(2, loc)
smoke.start()
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index 15a5d5bdf03..203a0fa2bbb 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -153,10 +153,10 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an
var/beep_cooldown = 50
var/next_beep = 0
-/obj/structure/bodycontainer/morgue/New()
+/obj/structure/bodycontainer/morgue/Initialize()
+ . = ..()
connected = new/obj/structure/tray/m_tray(src)
connected.connected = src
- ..()
/obj/structure/bodycontainer/morgue/examine(mob/user)
..()
@@ -217,12 +217,14 @@ GLOBAL_LIST_EMPTY(crematoriums)
return ..()
/obj/structure/bodycontainer/crematorium/New()
- connected = new/obj/structure/tray/c_tray(src)
- connected.connected = src
-
GLOB.crematoriums.Add(src)
..()
+/obj/structure/bodycontainer/crematorium/Initialize()
+ . = ..()
+ connected = new /obj/structure/tray/c_tray(src)
+ connected.connected = src
+
/obj/structure/bodycontainer/crematorium/update_icon()
if(!connected || connected.loc != src)
icon_state = "crema0"
diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm
index 592d11f8043..3a7f6f42f1f 100644
--- a/code/game/objects/structures/musician.dm
+++ b/code/game/objects/structures/musician.dm
@@ -336,8 +336,8 @@
/obj/structure/piano/unanchored
anchored = FALSE
-/obj/structure/piano/New()
- ..()
+/obj/structure/piano/Initialize()
+ . = ..()
song = new("piano", src)
if(prob(50) && icon_state == initial(icon_state))
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index f256b6bd4ca..9f5d6035afb 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -24,8 +24,8 @@ FLOOR SAFES
var/maxspace = 24 //the maximum combined w_class of stuff in the safe
var/explosion_count = 0 //Tough, but breakable
-/obj/structure/safe/New()
- ..()
+/obj/structure/safe/Initialize()
+ . = ..()
tumbler_1_pos = rand(0, 71)
tumbler_1_open = rand(0, 71)
diff --git a/code/game/objects/structures/table_frames.dm b/code/game/objects/structures/table_frames.dm
index e660ecbf270..5d0f1cd5273 100644
--- a/code/game/objects/structures/table_frames.dm
+++ b/code/game/objects/structures/table_frames.dm
@@ -147,9 +147,9 @@
framestack = /obj/item/stack/tile/brass
framestackamount = 1
-/obj/structure/table_frame/brass/New()
+/obj/structure/table_frame/brass/Initialize()
+ . = ..()
change_construction_value(1)
- ..()
/obj/structure/table_frame/brass/Destroy()
change_construction_value(-1)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index d92a0d53dff..4166d023ef3 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -195,7 +195,7 @@
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 100)
var/list/debris = list()
-/obj/structure/table/glass/New()
+/obj/structure/table/glass/Initialize()
. = ..()
debris += new frame
debris += new /obj/item/shard
@@ -298,25 +298,20 @@
framestack = /obj/item/stack/rods
buildstack = /obj/item/stack/tile/carpet
canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black)
+ var/smooth_icon = 'icons/obj/smooth_structures/fancy_table.dmi' // see Initialize()
-/obj/structure/table/wood/fancy/New()
- // New() is used so that the /black subtype can override `icon` easily and
- // the correct value will be used by the smoothing subsystem.
+/obj/structure/table/wood/fancy/Initialize()
. = ..()
// Needs to be set dynamically because table smooth sprites are 32x34,
// which the editor treats as a two-tile-tall object. The sprites are that
// size so that the north/south corners look nice - examine the detail on
// the sprites in the editor to see why.
- icon = 'icons/obj/smooth_structures/fancy_table.dmi'
+ icon = smooth_icon
/obj/structure/table/wood/fancy/black
icon_state = "fancy_table_black"
buildstack = /obj/item/stack/tile/carpet/black
-
-/obj/structure/table/wood/fancy/black/New()
- . = ..()
- // Ditto above.
- icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
+ smooth_icon = 'icons/obj/smooth_structures/fancy_table_black.dmi'
/*
* Reinforced tables
@@ -370,9 +365,9 @@
buildstackamount = 1
canSmoothWith = list(/obj/structure/table/reinforced/brass, /obj/structure/table/bronze)
-/obj/structure/table/reinforced/brass/New()
+/obj/structure/table/reinforced/brass/Initialize()
+ . = ..()
change_construction_value(2)
- ..()
/obj/structure/table/reinforced/brass/Destroy()
change_construction_value(-2)
@@ -423,8 +418,8 @@
var/mob/living/carbon/human/patient = null
var/obj/machinery/computer/operating/computer = null
-/obj/structure/table/optable/New()
- ..()
+/obj/structure/table/optable/Initialize()
+ . = ..()
for(var/direction in GLOB.cardinals)
computer = locate(/obj/machinery/computer/operating, get_step(src, direction))
if(computer)
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index fe531ae6673..d6f915ea28a 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -136,7 +136,6 @@
density = TRUE
time_between_triggers = 1200 //Exists for 2 minutes
-
-/obj/structure/trap/ward/New()
- ..()
+/obj/structure/trap/ward/Initialize()
+ . = ..()
QDEL_IN(src, time_between_triggers)
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index da811a1974b..636d2934259 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -92,14 +92,15 @@
icon_state = "syndballoon"
anchored = TRUE
-/obj/effect/station_crash/New()
+/obj/effect/station_crash/Initialize()
+ ..()
for(var/S in SSshuttle.stationary)
var/obj/docking_port/stationary/SM = S
if(SM.id == "emergency_home")
var/new_dir = turn(SM.dir, 180)
SM.forceMove(get_ranged_target_turf(SM, new_dir, rand(3,15)))
break
- qdel(src)
+ return INITIALIZE_HINT_QDEL
//Arena
diff --git a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
index 2e2a01d386c..1994fdf779f 100644
--- a/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
+++ b/code/modules/antagonists/clockcult/clock_effects/general_markers.dm
@@ -6,8 +6,8 @@
alpha = 200
layer = MASSIVE_OBJ_LAYER
-/obj/effect/clockwork/general_marker/New()
- ..()
+/obj/effect/clockwork/general_marker/Initialize()
+ . = ..()
animate(src, alpha = 0, time = 10)
QDEL_IN(src, 10)
diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm
index 8f8f2a309f4..c04ebddd684 100644
--- a/code/modules/antagonists/revenant/revenant.dm
+++ b/code/modules/antagonists/revenant/revenant.dm
@@ -347,8 +347,8 @@
var/old_key //key of the previous revenant, will have first pick on reform.
var/mob/living/simple_animal/revenant/revenant
-/obj/item/ectoplasm/revenant/New()
- ..()
+/obj/item/ectoplasm/revenant/Initialize()
+ . = ..()
addtimer(CALLBACK(src, .proc/try_reform), 600)
/obj/item/ectoplasm/revenant/proc/scatter()
diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm
index 631a259b40b..ac561174a4a 100644
--- a/code/modules/antagonists/revenant/revenant_abilities.dm
+++ b/code/modules/antagonists/revenant/revenant_abilities.dm
@@ -128,8 +128,8 @@
var/unlock_amount = 100 //How much essence it costs to unlock
var/cast_amount = 50 //How much essence it costs to use
-/obj/effect/proc_holder/spell/aoe_turf/revenant/New()
- ..()
+/obj/effect/proc_holder/spell/aoe_turf/revenant/Initialize()
+ . = ..()
if(locked)
name = "[initial(name)] ([unlock_amount]SE)"
else
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index 2aae7db5e20..ec4848d47ed 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -3,7 +3,7 @@
desc = "A small electronic device able to ignite combustible substances."
icon_state = "igniter"
materials = list(MAT_METAL=500, MAT_GLASS=50)
- var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
+ var/datum/effect_system/spark_spread/sparks
heat = 1000
/obj/item/assembly/igniter/suicide_act(mob/living/carbon/user)
@@ -11,13 +11,15 @@
user.IgniteMob()
return FIRELOSS
-/obj/item/assembly/igniter/New()
- ..()
+/obj/item/assembly/igniter/Initialize()
+ . = ..()
+ sparks = new
sparks.set_up(2, 0, src)
sparks.attach(src)
/obj/item/assembly/igniter/Destroy()
- qdel(sparks)
+ if(sparks)
+ qdel(sparks)
sparks = null
. = ..()
diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm
index 74a9a30d7c1..361f8169b9e 100644
--- a/code/modules/awaymissions/exile.dm
+++ b/code/modules/awaymissions/exile.dm
@@ -3,11 +3,7 @@
name = "exile implants"
req_access = list(ACCESS_HOS)
-/obj/structure/closet/secure_closet/exile/New()
- ..()
+/obj/structure/closet/secure_closet/exile/PopulateContents()
new /obj/item/implanter/exile(src)
- new /obj/item/implantcase/exile(src)
- new /obj/item/implantcase/exile(src)
- new /obj/item/implantcase/exile(src)
- new /obj/item/implantcase/exile(src)
- new /obj/item/implantcase/exile(src)
\ No newline at end of file
+ for(var/i in 1 to 5)
+ new /obj/item/implantcase/exile(src)
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 232ffe57544..0adef7f0b4b 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -22,7 +22,8 @@
/obj/effect/landmark/sc_bible_spawner
name = "Safecode hint spawner"
-/obj/effect/landmark/sc_bible_spawner/New()
+/obj/effect/landmark/sc_bible_spawner/Initialize()
+ ..()
var/obj/item/storage/book/bible/B = new /obj/item/storage/book/bible/booze(loc)
B.name = "The Holy book of the Geometer"
B.deity_name = "Narsie"
@@ -32,7 +33,7 @@
B.righthand_file = 'icons/mob/inhands/misc/books_righthand.dmi'
new /obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible(B)
new /obj/item/pen(B)
- qdel(src)
+ return INITIALIZE_HINT_QDEL
/*
* Guns - I'm making these specifically so that I dont spawn a pile of fully loaded weapons on the map.
@@ -84,12 +85,14 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison
name = "smudged paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_prison/Initialize()
+ . = ..()
info = "The ink is smudged, you can only make out a couple numbers: '[GLOB.sc_safecode1]**[GLOB.sc_safecode4]*'"
/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro
name = "shredded paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_hydro/Initialize()
+ . = ..()
info = "Although the paper is shredded, you can clearly see the number: '[GLOB.sc_safecode2]'"
/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_caf
@@ -99,7 +102,8 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible
name = "hidden paper"
-/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/New()
+/obj/item/paper/fluff/awaymissions/stationcollision/safehint_paper_bible/Initialize()
+ . = ..()
info = {"It would appear that the pen hidden with the paper had leaked ink over the paper.
However you can make out the last three digits:'[GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]'
"}
@@ -123,8 +127,8 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/obj/item/storage/secure/safe/sc_ssafe
name = "Captain's secure safe"
-/obj/item/storage/secure/safe/sc_ssafe/New()
- ..()
+/obj/item/storage/secure/safe/sc_ssafe/Initialize()
+ . = ..()
l_code = "[GLOB.sc_safecode1][GLOB.sc_safecode2][GLOB.sc_safecode3][GLOB.sc_safecode4][GLOB.sc_safecode5]"
l_set = 1
new /obj/item/gun/energy/mindflayer(src)
diff --git a/code/modules/awaymissions/super_secret_room.dm b/code/modules/awaymissions/super_secret_room.dm
index 3903df9686e..39e1be9e64d 100644
--- a/code/modules/awaymissions/super_secret_room.dm
+++ b/code/modules/awaymissions/super_secret_room.dm
@@ -124,10 +124,10 @@
w_class = WEIGHT_CLASS_SMALL
materials = list(MAT_GLASS = 500)
-/obj/item/rupee/New()
+/obj/item/rupee/Initialize()
+ . = ..()
var/newcolor = color2hex(pick(10;"green", 5;"blue", 3;"red", 1;"purple"))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
- ..()
/obj/item/rupee/Crossed(mob/M)
if(!istype(M))
diff --git a/code/modules/cargo/bounties/reagent.dm b/code/modules/cargo/bounties/reagent.dm
index 1ccfffdaf21..7a34b65d9ba 100644
--- a/code/modules/cargo/bounties/reagent.dm
+++ b/code/modules/cargo/bounties/reagent.dm
@@ -35,7 +35,7 @@
name = "Simple Drink"
reward = 1500
-datum/bounty/reagent/simple_drink/New()
+/datum/bounty/reagent/simple_drink/New()
// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
var/static/list/possible_reagents = list(\
/datum/reagent/consumable/ethanol/antifreeze,\
@@ -91,7 +91,7 @@ datum/bounty/reagent/simple_drink/New()
name = "Complex Drink"
reward = 4000
-datum/bounty/reagent/complex_drink/New()
+/datum/bounty/reagent/complex_drink/New()
// Don't worry about making this comprehensive. It doesn't matter if some drinks are skipped.
var/static/list/possible_reagents = list(\
/datum/reagent/consumable/ethanol/atomicbomb,\
@@ -125,7 +125,7 @@ datum/bounty/reagent/complex_drink/New()
reward = 4000
required_volume = 30
-datum/bounty/reagent/chemical_simple/New()
+/datum/bounty/reagent/chemical_simple/New()
// Chemicals that can be mixed by a single skilled Chemist.
var/static/list/possible_reagents = list(\
/datum/reagent/medicine/leporazine,\
@@ -163,7 +163,7 @@ datum/bounty/reagent/chemical_simple/New()
reward = 6000
required_volume = 20
-datum/bounty/reagent/chemical_complex/New()
+/datum/bounty/reagent/chemical_complex/New()
// Reagents that require interaction with multiple departments or are a pain to mix. Lower required_volume since acquiring 30u of some is unrealistic
var/static/list/possible_reagents = list(\
/datum/reagent/medicine/pyroxadone,\
diff --git a/code/modules/clothing/glasses/_glasses.dm b/code/modules/clothing/glasses/_glasses.dm
index 2d9527fa198..13e1e10215c 100644
--- a/code/modules/clothing/glasses/_glasses.dm
+++ b/code/modules/clothing/glasses/_glasses.dm
@@ -327,8 +327,8 @@
var/datum/action/item_action/chameleon/change/chameleon_action
-/obj/item/clothing/glasses/thermal/syndi/New()
- ..()
+/obj/item/clothing/glasses/thermal/syndi/Initialize()
+ . = ..()
chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/glasses
chameleon_action.chameleon_name = "Glasses"
diff --git a/code/modules/clothing/glasses/hud.dm b/code/modules/clothing/glasses/hud.dm
index d9cad42c7c8..46288796e41 100644
--- a/code/modules/clothing/glasses/hud.dm
+++ b/code/modules/clothing/glasses/hud.dm
@@ -95,8 +95,8 @@
// have multiple inheritance, okay?
var/datum/action/item_action/chameleon/change/chameleon_action
-/obj/item/clothing/glasses/hud/security/chameleon/New()
- ..()
+/obj/item/clothing/glasses/hud/security/chameleon/Initialize()
+ . = ..()
chameleon_action = new(src)
chameleon_action.chameleon_type = /obj/item/clothing/glasses
chameleon_action.chameleon_name = "Glasses"
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 7a19bcc9b01..c6fa3fff6a6 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -13,13 +13,13 @@
name = "budget insulated gloves"
icon_state = "yellow"
item_state = "ygloves"
- siemens_coefficient = 1 //Set to a default of 1, gets overridden in New()
+ siemens_coefficient = 1 //Set to a default of 1, gets overridden in Initialize()
permeability_coefficient = 0.05
- item_color="yellow"
+ item_color = "yellow"
resistance_flags = NONE
-/obj/item/clothing/gloves/color/fyellow/New()
- ..()
+/obj/item/clothing/gloves/color/fyellow/Initialize()
+ . = ..()
siemens_coefficient = pick(0,0.5,0.5,0.5,0.5,0.75,1.5)
/obj/item/clothing/gloves/color/fyellow/old
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index c7d91604cff..dbf8c30700f 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -5,9 +5,9 @@
var/obj/item/clothing/head/hooded/hood
var/hoodtype = /obj/item/clothing/head/hooded/winterhood //so the chaplain hoodie or other hoodies can override this
-/obj/item/clothing/suit/hooded/New()
+/obj/item/clothing/suit/hooded/Initialize()
+ . = ..()
MakeHood()
- ..()
/obj/item/clothing/suit/hooded/Destroy()
. = ..()
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index 272afe646ab..968b23d8c7c 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -44,12 +44,11 @@
if(has_sensor > NO_SENSORS)
has_sensor = BROKEN_SENSORS
-/obj/item/clothing/under/New()
+/obj/item/clothing/under/Initialize()
+ . = ..()
if(random_sensor)
//make the sensor mode favor higher levels, except coords.
sensor_mode = pick(SENSOR_OFF, SENSOR_LIVING, SENSOR_LIVING, SENSOR_VITALS, SENSOR_VITALS, SENSOR_VITALS, SENSOR_COORDS, SENSOR_COORDS)
- adjusted = NORMAL_STYLE
- ..()
/obj/item/clothing/under/equipped(mob/user, slot)
..()
diff --git a/code/modules/detectivework/evidence.dm b/code/modules/detectivework/evidence.dm
index a3b17a4c1f5..42feb421b87 100644
--- a/code/modules/detectivework/evidence.dm
+++ b/code/modules/detectivework/evidence.dm
@@ -84,12 +84,6 @@
name = "evidence bag box"
desc = "A box claiming to contain evidence bags."
-/obj/item/storage/box/evidence/New()
- new /obj/item/evidencebag(src)
- new /obj/item/evidencebag(src)
- new /obj/item/evidencebag(src)
- new /obj/item/evidencebag(src)
- new /obj/item/evidencebag(src)
- new /obj/item/evidencebag(src)
- ..()
- return
+/obj/item/storage/box/evidence/PopulateContents()
+ for(var/i in 1 to 6)
+ new /obj/item/evidencebag(src)
diff --git a/code/modules/events/holiday/halloween.dm b/code/modules/events/holiday/halloween.dm
index 9b72020047d..8ee8bc7b00b 100644
--- a/code/modules/events/holiday/halloween.dm
+++ b/code/modules/events/holiday/halloween.dm
@@ -43,9 +43,9 @@
icon = 'icons/obj/halloween_items.dmi'
icon_state = "treatbag"
-/obj/item/storage/spooky/New()
- ..()
- for(var/distrobuteinbag=0 to 5)
+/obj/item/storage/spooky/Initialize()
+ . = ..()
+ for(var/distrobuteinbag in 0 to 5)
var/type = pick(/obj/item/reagent_containers/food/snacks/sugarcookie/spookyskull,
/obj/item/reagent_containers/food/snacks/sugarcookie/spookycoffin,
/obj/item/reagent_containers/food/snacks/candy_corn,
diff --git a/code/modules/events/holiday/vday.dm b/code/modules/events/holiday/vday.dm
index a4e8b276b57..6dde1780cb3 100644
--- a/code/modules/events/holiday/vday.dm
+++ b/code/modules/events/holiday/vday.dm
@@ -59,8 +59,8 @@
resistance_flags = FLAMMABLE
w_class = WEIGHT_CLASS_TINY
-/obj/item/valentine/New()
- ..()
+/obj/item/valentine/Initialize()
+ . = ..()
message = pick("Roses are red / Violets are good / One day while Andy...",
"My love for you is like the singularity. It cannot be contained.",
"Will you be my lusty xenomorph maid?",
@@ -154,8 +154,8 @@
list_reagents = list("sugar" = 2)
junkiness = 5
-/obj/item/reagent_containers/food/snacks/candyheart/New()
- ..()
+/obj/item/reagent_containers/food/snacks/candyheart/Initialize()
+ . = ..()
desc = pick("A heart-shaped candy that reads: HONK ME",
"A heart-shaped candy that reads: ERP",
"A heart-shaped candy that reads: LEWD",
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index d97e83d87db..3b8eacc8341 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -759,7 +759,7 @@
robot_suit.head.flash2.burn_out()
robot_suit.head.flash2 = null
robot_suit.head = null
- robot_suit.updateicon()
+ robot_suit.update_icon()
else
new /obj/item/robot_suit(T)
new /obj/item/bodypart/l_leg/robot(T)
diff --git a/tools/Redirector/Redirector.dm b/tools/Redirector/Redirector.dm
index b19aee82f9d..920e56f2faf 100644
--- a/tools/Redirector/Redirector.dm
+++ b/tools/Redirector/Redirector.dm
@@ -15,10 +15,10 @@ var/admin_weight = 5 // admins are more likely to join a server with less admins
var/player_substr = "players=" // search for this substring to locate # of players
var/admin_substr = "admins=" // search for this to locate # of admins
-world
+/world
name = "TGstation Redirector"
-world/New()
+/world/New()
..()
gen_configs()
@@ -29,7 +29,7 @@ world/New()
var/link = ""
-mob/Login()
+/mob/Login()
..()
var/list/weights = list()
@@ -60,7 +60,7 @@ mob/Login()
src << link(serverlink)
-proc/extract(var/data, var/type = PLAYERS)
+/proc/extract(var/data, var/type = PLAYERS)
var/nextpos = 0