cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-16 01:23:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

More New() -> Initialize() for /obj/structure (#15158)

Browse Source 
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
This commit is contained in:
AffectedArc07
2020-12-29 15:42:39 +00:00
committed by GitHub
parent 3f80ce3076
commit 43ee2488c7
41 changed files with 221 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barsign.dm
+4 -8
View File
@@ -14,22 +14,18 @@
var/prev_sign = ""
var/panel_open = 0
/obj/structure/sign/barsign/New()
..()
/obj/structure/sign/barsign/Initialize(mapload)
. = ..()
//filling the barsigns list
//filling the barsigns list
for(var/bartype in subtypesof(/datum/barsign))
var/datum/barsign/signinfo = new bartype
if(!signinfo.hidden)
barsigns += signinfo
//randomly assigning a sign
//randomly assigning a sign
set_sign(pick(barsigns))
/obj/structure/sign/barsign/proc/set_sign(var/datum/barsign/sign)
if(!istype(sign))
return
code/game/objects/structures/crates_lockers/largecrate.dm
+2 -2
View File
@@ -6,8 +6,8 @@
density = 1
var/obj/item/paper/manifest/manifest
/obj/structure/largecrate/New()
..()
/obj/structure/largecrate/Initialize(mapload)
. = ..()
update_icon()
/obj/structure/largecrate/update_icon()
code/game/objects/structures/door_assembly.dm
+2 -2
View File
@@ -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(mapload)
. = ..()
update_icon()
update_name()
..()
/obj/structure/door_assembly/Destroy()
QDEL_NULL(electronics)
code/game/objects/structures/door_assembly_types.dm
+4 -4
View File
@@ -143,14 +143,14 @@
glass_type = /obj/machinery/door/airlock/multi_tile/glass
material_amt = 8
/obj/structure/door_assembly/multi_tile/New()
/obj/structure/door_assembly/multi_tile/Initialize(mapload)
. = ..()
if(dir in list(EAST, WEST))
bound_width = width * world.icon_size
bound_height = world.icon_size
else
bound_width = world.icon_size
bound_height = width * world.icon_size
..()
/obj/structure/door_assembly/multi_tile/Move()
. = ..()
@@ -169,7 +169,7 @@
airlock_type = /obj/machinery/door/airlock/cult
glass_type = /obj/machinery/door/airlock/cult/glass
/obj/structure/door_assembly/door_assembly_cult/New()
/obj/structure/door_assembly/door_assembly_cult/Initialize(mapload)
. = ..()
icon = SSticker.cultdat?.airlock_runed_icon_file
overlays_file = SSticker.cultdat?.airlock_runed_overlays_file
@@ -181,7 +181,7 @@
airlock_type = /obj/machinery/door/airlock/cult/unruned
glass_type = /obj/machinery/door/airlock/cult/unruned/glass
/obj/structure/door_assembly/door_assembly_cult/unruned/New()
/obj/structure/door_assembly/door_assembly_cult/unruned/Initialize(mapload)
. = ..()
icon = SSticker.cultdat?.airlock_unruned_icon_file
overlays_file = SSticker.cultdat?.airlock_unruned_overlays_file
code/game/objects/structures/electricchair.dm
+15 -12
View File
@@ -7,19 +7,22 @@
var/last_time = 1.0
var/delay_time = 50
/obj/structure/chair/e_chair/New()
..()
/obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk)
. = ..()
overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir)
spawn(2)
if(isnull(part)) //This e-chair was not custom built
part = new(src)
var/obj/item/clothing/head/helmet/part1 = new(part)
var/obj/item/radio/electropack/part2 = new(part)
part2.frequency = 1445
part2.code = 6
part2.master = part
part.part1 = part1
part.part2 = part2
if(sk)
part = sk
if(isnull(part)) //This e-chair was not custom built
part = new(src)
var/obj/item/clothing/head/helmet/part1 = new(part)
var/obj/item/radio/electropack/part2 = new(part)
part2.set_frequency(1445)
part2.code = 6
part2.master = part
part.part1 = part1
part.part2 = part2
/obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/wrench))
code/game/objects/structures/extinguisher.dm
+2 -2
View File
@@ -17,8 +17,8 @@
var/opened = 0
var/material_drop = /obj/item/stack/sheet/metal
/obj/structure/extinguisher_cabinet/New(turf/loc, direction = null)
..()
/obj/structure/extinguisher_cabinet/Initialize(mapload, direction = null)
. = ..()
if(direction)
setDir(direction)
set_pixel_offsets_from_dir(28, -28, 30, -30)
code/game/objects/structures/false_walls.dm
+4 -4
View File
@@ -33,8 +33,8 @@
/turf/simulated/wall/r_wall/rust)
smooth = SMOOTH_TRUE
/obj/structure/falsewall/New(loc)
..()
/obj/structure/falsewall/Initialize(mapload)
. = ..()
air_update_turf(1)
/obj/structure/falsewall/ratvar_act()
@@ -349,8 +349,8 @@
walltype = /turf/simulated/wall/clockwork
mineral = /obj/item/stack/tile/brass
/obj/structure/falsewall/brass/New(loc)
..()
/obj/structure/falsewall/brass/Initialize(mapload)
. = ..()
var/turf/T = get_turf(src)
new /obj/effect/temp_visual/ratvar/wall/false(T)
new /obj/effect/temp_visual/ratvar/beam/falsewall(T)
code/game/objects/structures/flora.dm
+51 -55
View File
@@ -15,8 +15,8 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_1"
/obj/structure/flora/tree/pine/New()
..()
/obj/structure/flora/tree/pine/Initialize(mapload)
. = ..()
icon_state = "pine_[rand(1, 3)]"
/obj/structure/flora/tree/pine/xmas
@@ -24,24 +24,20 @@
icon = 'icons/obj/flora/pinetrees.dmi'
icon_state = "pine_c"
/obj/structure/flora/tree/pine/xmas/New()
..()
icon_state = "pine_c"
/obj/structure/flora/tree/dead
icon = 'icons/obj/flora/deadtrees.dmi'
icon_state = "tree_1"
/obj/structure/flora/tree/dead/New()
..()
/obj/structure/flora/tree/dead/Initialize(mapload)
. = ..()
icon_state = "tree_[rand(1, 6)]"
/obj/structure/flora/tree/palm
icon = 'icons/misc/beach2.dmi'
icon_state = "palm1"
/obj/structure/flora/tree/palm/New()
..()
/obj/structure/flora/tree/palm/Initialize(mapload)
. = ..()
icon_state = pick("palm1","palm2")
pixel_x = 0
@@ -55,23 +51,23 @@
/obj/structure/flora/grass/brown
icon_state = "snowgrass1bb"
/obj/structure/flora/grass/brown/New()
..()
/obj/structure/flora/grass/brown/Initialize(mapload)
. = ..()
icon_state = "snowgrass[rand(1, 3)]bb"
/obj/structure/flora/grass/green
icon_state = "snowgrass1gb"
/obj/structure/flora/grass/green/New()
..()
/obj/structure/flora/grass/green/Initialize(mapload)
. = ..()
icon_state = "snowgrass[rand(1, 3)]gb"
/obj/structure/flora/grass/both
icon_state = "snowgrassall1"
/obj/structure/flora/grass/both/New()
..()
/obj/structure/flora/grass/both/Initialize(mapload)
. = ..()
icon_state = "snowgrassall[rand(1, 3)]"
@@ -83,8 +79,8 @@
anchored = 1
max_integrity = 15
/obj/structure/flora/bush/New()
..()
/obj/structure/flora/bush/Initialize(mapload)
. = ..()
icon_state = "snowbush[rand(1, 6)]"
//newbushes
@@ -96,113 +92,113 @@
anchored = 1
max_integrity = 15
/obj/structure/flora/ausbushes/New()
..()
/obj/structure/flora/ausbushes/Initialize(mapload)
. = ..()
icon_state = "firstbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/reedbush
icon_state = "reedbush_1"
/obj/structure/flora/ausbushes/reedbush/New()
..()
/obj/structure/flora/ausbushes/reedbush/Initialize(mapload)
. = ..()
icon_state = "reedbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/leafybush
icon_state = "leafybush_1"
/obj/structure/flora/ausbushes/leafybush/New()
..()
/obj/structure/flora/ausbushes/leafybush/Initialize(mapload)
. = ..()
icon_state = "leafybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/palebush
icon_state = "palebush_1"
/obj/structure/flora/ausbushes/palebush/New()
..()
/obj/structure/flora/ausbushes/palebush/Initialize(mapload)
. = ..()
icon_state = "palebush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/stalkybush
icon_state = "stalkybush_1"
/obj/structure/flora/ausbushes/stalkybush/New()
..()
/obj/structure/flora/ausbushes/stalkybush/Initialize(mapload)
. = ..()
icon_state = "stalkybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/grassybush
icon_state = "grassybush_1"
/obj/structure/flora/ausbushes/grassybush/New()
..()
/obj/structure/flora/ausbushes/grassybush/Initialize(mapload)
. = ..()
icon_state = "grassybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/fernybush
icon_state = "fernybush_1"
/obj/structure/flora/ausbushes/fernybush/New()
..()
/obj/structure/flora/ausbushes/fernybush/Initialize(mapload)
. = ..()
icon_state = "fernybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/sunnybush
icon_state = "sunnybush_1"
/obj/structure/flora/ausbushes/sunnybush/New()
..()
/obj/structure/flora/ausbushes/sunnybush/Initialize(mapload)
. = ..()
icon_state = "sunnybush_[rand(1, 3)]"
/obj/structure/flora/ausbushes/genericbush
icon_state = "genericbush_1"
/obj/structure/flora/ausbushes/genericbush/New()
..()
/obj/structure/flora/ausbushes/genericbush/Initialize(mapload)
. = ..()
icon_state = "genericbush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/pointybush
icon_state = "pointybush_1"
/obj/structure/flora/ausbushes/pointybush/New()
..()
/obj/structure/flora/ausbushes/pointybush/Initialize(mapload)
. = ..()
icon_state = "pointybush_[rand(1, 4)]"
/obj/structure/flora/ausbushes/lavendergrass
icon_state = "lavendergrass_1"
/obj/structure/flora/ausbushes/lavendergrass/New()
..()
/obj/structure/flora/ausbushes/lavendergrass/Initialize(mapload)
. = ..()
icon_state = "lavendergrass_[rand(1, 4)]"
/obj/structure/flora/ausbushes/ywflowers
icon_state = "ywflowers_1"
/obj/structure/flora/ausbushes/ywflowers/New()
..()
/obj/structure/flora/ausbushes/ywflowers/Initialize(mapload)
. = ..()
icon_state = "ywflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/brflowers
icon_state = "brflowers_1"
/obj/structure/flora/ausbushes/brflowers/New()
..()
/obj/structure/flora/ausbushes/brflowers/Initialize(mapload)
. = ..()
icon_state = "brflowers_[rand(1, 3)]"
/obj/structure/flora/ausbushes/ppflowers
icon_state = "ppflowers_1"
/obj/structure/flora/ausbushes/ppflowers/New()
..()
/obj/structure/flora/ausbushes/ppflowers/Initialize(mapload)
. = ..()
icon_state = "ppflowers_[rand(1, 4)]"
/obj/structure/flora/ausbushes/sparsegrass
icon_state = "sparsegrass_1"
/obj/structure/flora/ausbushes/sparsegrass/New()
..()
/obj/structure/flora/ausbushes/sparsegrass/Initialize(mapload)
. = ..()
icon_state = "sparsegrass_[rand(1, 3)]"
/obj/structure/flora/ausbushes/fullgrass
icon_state = "fullgrass_1"
/obj/structure/flora/ausbushes/fullgrass/New()
..()
/obj/structure/flora/ausbushes/fullgrass/Initialize(mapload)
. = ..()
icon_state = "fullgrass_[rand(1, 3)]"
@@ -250,8 +246,8 @@
resistance_flags = FIRE_PROOF
anchored = 1
/obj/structure/flora/rock/New()
..()
/obj/structure/flora/rock/Initialize(mapload)
. = ..()
icon_state = "rock[rand(1,5)]"
/obj/structure/flora/rock/pile
@@ -259,8 +255,8 @@
desc = "some rocks"
icon_state = "rockpile1"
/obj/structure/flora/rock/pile/New()
..()
/obj/structure/flora/rock/pile/Initialize(mapload)
. = ..()
icon_state = "rockpile[rand(1,5)]"
/obj/structure/flora/rock/icy
@@ -308,7 +304,7 @@
var/indestructable = 0
var/stump = 0
/obj/structure/bush/New()
/obj/structure/bush/Initialize(mapload)
. = ..()
if(prob(20))
opacity = 1
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -412,7 +412,7 @@
metalUsed = 1
metal_type = /obj/item/stack/sheet/runed_metal
/obj/structure/girder/cult/New()
/obj/structure/girder/cult/Initialize(mapload)
. = ..()
icon_state = SSticker.cultdat?.cult_girder_icon_state
code/game/objects/structures/grille.dm
+4 -4
View File
@@ -20,10 +20,10 @@
var/shockcooldown = 0
var/my_shockcooldown = 1 SECONDS
/obj/structure/grille/fence/
/obj/structure/grille/fence
var/width = 3
/obj/structure/grille/fence/New()
/obj/structure/grille/fence/Initialize(mapload)
. = ..()
if(width > 1)
if(dir in list(EAST, WEST))
@@ -290,8 +290,8 @@
desc = "A strangely-shaped grille."
broken_type = /obj/structure/grille/ratvar/broken
/obj/structure/grille/ratvar/New()
..()
/obj/structure/grille/ratvar/Initialize(mapload)
. = ..()
if(broken)
new /obj/effect/temp_visual/ratvar/grille/broken(get_turf(src))
else
code/game/objects/structures/holosign.dm
+4 -4
View File
@@ -9,11 +9,11 @@
armor = list("melee" = 0, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 20, "acid" = 20)
var/obj/item/holosign_creator/projector
/obj/structure/holosign/New(loc, source_projector)
/obj/structure/holosign/Initialize(mapload, source_projector)
. = ..()
if(source_projector)
projector = source_projector
projector.signs += src
..()
/obj/structure/holosign/Destroy()
if(projector)
@@ -73,8 +73,8 @@
layer = ABOVE_MOB_LAYER
alpha = 150
/obj/structure/holosign/barrier/atmos/New()
..()
/obj/structure/holosign/barrier/atmos/Initialize(mapload)
. = ..()
air_update_turf(TRUE)
/obj/structure/holosign/barrier/atmos/CanAtmosPass(turf/T)
code/game/objects/structures/janicart.dm
+2 -2
View File
@@ -18,8 +18,8 @@
var/const/max_signs = 4
/obj/structure/janitorialcart/New()
..()
/obj/structure/janitorialcart/Initialize(mapload)
. = ..()
create_reagents(100)
GLOB.janitorial_equipment += src
code/game/objects/structures/mineral_doors.dm
+2 -5
View File
@@ -21,12 +21,9 @@
var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
var/damageSound = null
/obj/structure/mineral_door/New(location)
..()
initial_state = icon_state
/obj/structure/mineral_door/Initialize()
..()
. = ..()
initial_state = icon_state
air_update_turf(1)
/obj/structure/mineral_door/Destroy()
code/game/objects/structures/mirror.dm
+2 -2
View File
@@ -10,8 +10,8 @@
integrity_failure = 100
var/list/ui_users = list()
/obj/structure/mirror/New(turf/T, newdir = SOUTH, building = FALSE)
..()
/obj/structure/mirror/Initialize(mapload, newdir = SOUTH, building = FALSE)
. = ..()
if(building)
switch(newdir)
if(NORTH)
code/game/objects/structures/mop_bucket.dm
+4 -4
View File
@@ -7,13 +7,13 @@
container_type = OPENCONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
/obj/structure/mopbucket/New()
..()
/obj/structure/mopbucket/Initialize(mapload)
. = ..()
create_reagents(100)
GLOB.janitorial_equipment += src
/obj/structure/mopbucket/full/New()
..()
/obj/structure/mopbucket/full/Initialize(mapload)
. = ..()
reagents.add_reagent("water", 100)
/obj/structure/mopbucket/Destroy()
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+2 -2
View File
@@ -10,9 +10,9 @@
comfort = 0
flags = NODECONSTRUCT
/obj/structure/bed/nest/New()
/obj/structure/bed/nest/Initialize(mapload)
. = ..()
nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2)
return ..()
/obj/structure/bed/nest/user_unbuckle_mob(mob/living/user)
if(has_buckled_mobs())
code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+1 -8
View File
@@ -18,12 +18,6 @@
var/propelled = FALSE // Check for fire-extinguisher-driven chairs
var/comfort = 0
/obj/structure/chair/New()
..()
spawn(3) //sorry. i don't think there's a better way to do this.
handle_rotation()
return
/obj/structure/chair/narsie_act()
if(prob(20))
var/obj/structure/chair/wood/W = new/obj/structure/chair/wood(get_turf(src))
@@ -46,10 +40,9 @@
to_chat(user, "<span class='notice'>[SK] is not ready to be attached!</span>")
return
user.drop_item()
var/obj/structure/chair/e_chair/E = new /obj/structure/chair/e_chair(src.loc)
var/obj/structure/chair/e_chair/E = new /obj/structure/chair/e_chair(get_turf(src), SK)
playsound(src.loc, W.usesound, 50, 1)
E.dir = dir
E.part = SK
SK.loc = E
SK.master = E
qdel(src)
code/game/objects/structures/tables_racks.dm
+10 -10
View File
@@ -35,8 +35,8 @@
var/deconstruction_ready = TRUE
var/flipped = 0
/obj/structure/table/New()
..()
/obj/structure/table/Initialize(mapload)
. = ..()
if(flipped)
update_icon()
@@ -70,11 +70,11 @@
if(istype(src, /obj/structure/table/reinforced))
base = "rtable"
if(istype(src, /obj/structure/table/wood/poker))
base = "poker"
base = "poker"
if(istype(src, /obj/structure/table/wood/fancy))
base = "fancy"
base = "fancy"
if(istype(src, /obj/structure/table/wood/fancy/black))
base = "fancyblack"
base = "fancyblack"
icon_state = "[base]flip[type][type == 1 ? subtype : ""]"
@@ -394,7 +394,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(mapload)
. = ..()
debris += new frame
debris += new /obj/item/shard
@@ -503,16 +503,16 @@
buildstack = /obj/item/stack/tile/carpet
canSmoothWith = list(/obj/structure/table/wood/fancy, /obj/structure/table/wood/fancy/black)
/obj/structure/table/wood/fancy/New()
/obj/structure/table/wood/fancy/Initialize(mapload)
. = ..()
icon = 'icons/obj/smooth_structures/fancy_table.dmi' //so that the tables place correctly in the map editor
..()
/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()
..()
/obj/structure/table/wood/fancy/black/Initialize(mapload)
. = ..()
icon = 'icons/obj/smooth_structures/fancy_table_black.dmi' //so that the tables place correctly in the map editor
/*
code/game/objects/structures/tank_dispenser.dm
+2 -2
View File
@@ -18,8 +18,8 @@
/obj/structure/dispenser/plasma
starting_oxygen_tanks = 0
/obj/structure/dispenser/New()
..()
/obj/structure/dispenser/Initialize(mapload)
. = ..()
initialize_tanks()
update_icon()
code/game/objects/structures/transit_tubes/station.dm
+2 -2
View File
@@ -19,8 +19,8 @@
var/list/disallowed_mobs = list(/mob/living/silicon/ai)
/obj/structure/transit_tube/station/New()
..()
/obj/structure/transit_tube/station/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
/obj/structure/transit_tube/station/Destroy()
code/game/objects/structures/watercloset.dm
+3 -3
View File
@@ -13,8 +13,8 @@
var/mob/living/swirlie = null //the mob being given a swirlie
/obj/structure/toilet/New()
..()
/obj/structure/toilet/Initialize(mapload)
. = ..()
open = round(rand(0, 1))
update_icon()
@@ -181,7 +181,7 @@
/obj/structure/toilet/secret
var/secret_type = null
/obj/structure/toilet/secret/New()
/obj/structure/toilet/secret/Initialize(mapload)
. = ..()
if(secret_type)
var/obj/item/secret = new secret_type(src)
code/game/objects/structures/windoor_assembly.dm
+2 -2
View File
@@ -31,8 +31,8 @@
. = ..()
. += "<span class='notice'>Alt-click to rotate it clockwise.</span>"
/obj/structure/windoor_assembly/New(loc, set_dir)
..()
/obj/structure/windoor_assembly/Initialize(mapload, set_dir)
. = ..()
if(set_dir)
dir = set_dir
ini_dir = dir
code/game/objects/structures/window.dm
+6 -7
View File
@@ -69,8 +69,9 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
if(!anchored && !fulltile)
. += "<span class='notice'>Alt-click to rotate it.</span>"
/obj/structure/window/New(Loc, direct)
..()
/obj/structure/window/Initialize(mapload, direct)
. = ..()
if(direct)
setDir(direct)
if(reinf && anchored)
@@ -106,9 +107,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
/obj/structure/window/Initialize()
air_update_turf(1)
return ..()
air_update_turf(TRUE)
/obj/structure/window/narsie_act()
color = NARSIE_WINDOW_COLOUR
@@ -729,10 +728,10 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
cancolor = FALSE
var/made_glow = FALSE
/obj/structure/window/reinforced/clockwork/New(loc, direct)
/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct)
. = ..()
if(fulltile)
made_glow = TRUE
..()
QDEL_LIST(debris)
if(fulltile)
new /obj/effect/temp_visual/ratvar/window(get_turf(src))