mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 10:12:45 +00:00
[MIRROR] bunch of inits without return and a few easy new to init (#9773)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
052034eb7b
commit
a3ac1d26d7
@@ -37,14 +37,14 @@
|
||||
icon_state = "[bike_icon]_off"
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/bike/built/New()
|
||||
..()
|
||||
/obj/vehicle/bike/built/Initialize()
|
||||
. = ..()
|
||||
qdel(cell)
|
||||
cell = null
|
||||
|
||||
/obj/vehicle/bike/random/New()
|
||||
/obj/vehicle/bike/random/Initialize()
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/vehicle/bike/attackby(obj/item/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/multitool) && open)
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
var/datum/material/material = null
|
||||
var/riding_datum_type = /datum/riding/boat/small
|
||||
|
||||
/obj/vehicle/boat/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
/obj/vehicle/boat/sifwood/Initialize(newloc, material_name)
|
||||
. = ..(newloc, MAT_SIFWOOD)
|
||||
|
||||
/obj/vehicle/boat/dragon
|
||||
name = "dragon boat"
|
||||
@@ -27,13 +27,13 @@
|
||||
max_buckled_mobs = 5
|
||||
riding_datum_type = /datum/riding/boat/big
|
||||
|
||||
/obj/vehicle/boat/dragon/New(newloc, material_name)
|
||||
..(newloc, material_name)
|
||||
/obj/vehicle/boat/dragon/Initialize(newloc, material_name)
|
||||
. = ..(newloc, material_name)
|
||||
var/image/I = image(icon, src, "dragon_boat_underlay", BELOW_MOB_LAYER)
|
||||
underlays += I
|
||||
|
||||
/obj/vehicle/boat/dragon/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
/obj/vehicle/boat/dragon/sifwood/Initialize(newloc, material_name)
|
||||
. = ..(newloc, MAT_SIFWOOD)
|
||||
|
||||
// Oars, which must be held inhand while in a boat to move it.
|
||||
/obj/item/oar
|
||||
@@ -45,29 +45,29 @@
|
||||
force = 12
|
||||
var/datum/material/material = null
|
||||
|
||||
/obj/item/oar/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
/obj/item/oar/sifwood/Initialize(newloc, material_name)
|
||||
. = ..(newloc, MAT_SIFWOOD)
|
||||
|
||||
/obj/item/oar/New(newloc, material_name)
|
||||
/obj/item/oar/Initialize(newloc, material_name)
|
||||
..(newloc)
|
||||
if(!material_name)
|
||||
material_name = MAT_WOOD
|
||||
material = get_material_by_name("[material_name]")
|
||||
if(!material)
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
color = material.icon_colour
|
||||
return INITIALIZE_HINT_NORMAL
|
||||
|
||||
/obj/vehicle/boat/New(newloc, material_name)
|
||||
/obj/vehicle/boat/Initialize(newloc, material_name)
|
||||
..(newloc)
|
||||
if(!material_name)
|
||||
material_name = MAT_WOOD
|
||||
material = get_material_by_name("[material_name]")
|
||||
if(!material)
|
||||
qdel(src)
|
||||
return
|
||||
return INITIALIZE_HINT_QDEL
|
||||
color = material.icon_colour
|
||||
riding_datum = new riding_datum_type(src)
|
||||
return INITIALIZE_HINT_NORMAL
|
||||
|
||||
// Boarding.
|
||||
/obj/vehicle/boat/MouseDrop_T(var/atom/movable/C, mob/user)
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/train/engine/New()
|
||||
..()
|
||||
/obj/vehicle/train/engine/Initialize()
|
||||
. = ..()
|
||||
cell = new /obj/item/cell/high(src)
|
||||
key = new key_type(src)
|
||||
var/image/I = new(icon = 'icons/obj/vehicles_vr.dmi', icon_state = "cargo_engine_overlay", layer = src.layer + 0.2) //over mobs //VOREStation edit
|
||||
|
||||
@@ -16,8 +16,8 @@
|
||||
var/build_stage = 0
|
||||
var/obj/item/cell/cell = null
|
||||
|
||||
/obj/item/vehicle_assembly/New()
|
||||
..()
|
||||
/obj/item/vehicle_assembly/Initialize()
|
||||
. = ..()
|
||||
icon_state = "[initial(icon_state)][build_stage]"
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -49,9 +49,8 @@
|
||||
//-------------------------------------------
|
||||
//ChompADD START
|
||||
/obj/vehicle/Initialize()
|
||||
.=..()
|
||||
. = ..()
|
||||
soundloop = new(list(src), FALSE)
|
||||
return
|
||||
//ChompADD END
|
||||
|
||||
///obj/vehicle/New()
|
||||
|
||||
Reference in New Issue
Block a user