mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-27 14:08:44 +01:00
Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]"
This commit is contained in:
@@ -37,14 +37,14 @@
|
||||
icon_state = "[bike_icon]_off"
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/bike/built/Initialize()
|
||||
. = ..()
|
||||
/obj/vehicle/bike/built/New()
|
||||
..()
|
||||
qdel(cell)
|
||||
cell = null
|
||||
|
||||
/obj/vehicle/bike/random/Initialize()
|
||||
/obj/vehicle/bike/random/New()
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
. = ..()
|
||||
..()
|
||||
|
||||
/obj/vehicle/bike/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
if(istype(W, /obj/item/device/multitool) && open)
|
||||
|
||||
@@ -13,8 +13,8 @@
|
||||
var/datum/material/material = null
|
||||
var/riding_datum_type = /datum/riding/boat/small
|
||||
|
||||
/obj/vehicle/boat/sifwood/Initialize(var/ml, material_name)
|
||||
. = ..(ml, MAT_SIFWOOD)
|
||||
/obj/vehicle/boat/sifwood/New(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/Initialize(var/ml, material_name)
|
||||
. = ..(ml, material_name)
|
||||
/obj/vehicle/boat/dragon/New(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/Initialize(var/ml, material_name)
|
||||
. = ..(ml, MAT_SIFWOOD)
|
||||
/obj/vehicle/boat/dragon/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
|
||||
// Oars, which must be held inhand while in a boat to move it.
|
||||
/obj/item/weapon/oar
|
||||
@@ -45,20 +45,21 @@
|
||||
force = 12
|
||||
var/datum/material/material = null
|
||||
|
||||
/obj/item/weapon/oar/sifwood/Initialize(var/ml, material_name)
|
||||
. = ..(ml, MAT_SIFWOOD)
|
||||
/obj/item/weapon/oar/sifwood/New(newloc, material_name)
|
||||
..(newloc, MAT_SIFWOOD)
|
||||
|
||||
/obj/item/weapon/oar/Initialize(var/ml, material_name)
|
||||
. = ..()
|
||||
/obj/item/weapon/oar/New(newloc, material_name)
|
||||
..(newloc)
|
||||
if(!material_name)
|
||||
material_name = "wood"
|
||||
material = get_material_by_name("[material_name]")
|
||||
if(!material)
|
||||
return INITIALIZE_HINT_QDEL
|
||||
qdel(src)
|
||||
return
|
||||
color = material.icon_colour
|
||||
|
||||
/obj/vehicle/boat/Initialize(var/ml, material_name)
|
||||
. = ..()
|
||||
/obj/vehicle/boat/New(newloc, material_name)
|
||||
..(newloc)
|
||||
if(!material_name)
|
||||
material_name = "wood"
|
||||
material = get_material_by_name("[material_name]")
|
||||
|
||||
@@ -42,8 +42,8 @@
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/train/engine/Initialize()
|
||||
. = ..()
|
||||
/obj/vehicle/train/engine/New()
|
||||
..()
|
||||
cell = new /obj/item/weapon/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
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
var/build_stage = 0
|
||||
var/obj/item/weapon/cell/cell = null
|
||||
|
||||
/obj/item/weapon/vehicle_assembly/Initialize()
|
||||
. = ..()
|
||||
/obj/item/weapon/vehicle_assembly/New()
|
||||
..()
|
||||
icon_state = "[initial(icon_state)][build_stage]"
|
||||
update_icon()
|
||||
|
||||
|
||||
@@ -25,20 +25,18 @@
|
||||
|
||||
var/outdoors_speed_mod = 0.7 //The general 'outdoors' speed. I.E., the general difference you'll be at when driving outside.
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/Initialize()
|
||||
/obj/vehicle/train/engine/quadbike/New()
|
||||
cell = new /obj/item/weapon/cell/high(src)
|
||||
key = new key_type(src)
|
||||
. = ..()
|
||||
turn_off()
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/built/Initialize()
|
||||
/obj/vehicle/train/engine/quadbike/built/New()
|
||||
key = new key_type(src)
|
||||
. = ..()
|
||||
turn_off()
|
||||
|
||||
/obj/vehicle/train/engine/quadbike/random/Initialize()
|
||||
/obj/vehicle/train/engine/quadbike/random/New()
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
. = ..()
|
||||
..()
|
||||
|
||||
/obj/item/weapon/key/quadbike
|
||||
name = "key"
|
||||
@@ -176,9 +174,9 @@
|
||||
|
||||
paint_color = "#ffffff"
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/random/Initialize()
|
||||
/obj/vehicle/train/trolley/trailer/random/New()
|
||||
paint_color = rgb(rand(1,255),rand(1,255),rand(1,255))
|
||||
. = ..()
|
||||
..()
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/proc/update_load()
|
||||
if(load)
|
||||
@@ -190,8 +188,8 @@
|
||||
return 1
|
||||
return 0
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/Initialize()
|
||||
. = ..()
|
||||
/obj/vehicle/train/trolley/trailer/New()
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
/obj/vehicle/train/trolley/trailer/Moved(atom/old_loc, direction, forced = FALSE)
|
||||
|
||||
@@ -45,8 +45,8 @@
|
||||
//-------------------------------------------
|
||||
// Standard procs
|
||||
//-------------------------------------------
|
||||
/obj/vehicle/Initialize()
|
||||
. = ..()
|
||||
/obj/vehicle/New()
|
||||
..()
|
||||
//spawn the cell you want in each vehicle
|
||||
|
||||
/obj/vehicle/Destroy()
|
||||
|
||||
Reference in New Issue
Block a user