cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-26 13:39:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

new->init refactor

Browse Source
This commit is contained in:
Killian
2022-02-20 19:32:23 +00:00
parent 3f9af78f3a
commit 91d39da943
71 changed files with 182 additions and 4839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/tables/presets.dm
-12
View File
@@ -113,28 +113,16 @@
icon_state = "holo_preview"
color = "#EEEEEE"
<<<<<<< HEAD
/obj/structure/table/holotable/New()
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
..()
=======
/obj/structure/table/holotable/Initialize()
material = get_material_by_name("holo" + DEFAULT_TABLE_MATERIAL)
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/structure/table/woodentable/holotable
icon_state = "holo_preview"
<<<<<<< HEAD
/obj/structure/table/woodentable/holotable/New()
material = get_material_by_name("holowood")
..()
=======
/obj/structure/table/woodentable/holotable/Initialize()
material = get_material_by_name("holo" + MAT_WOOD)
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
/obj/structure/table/alien
name = "alien table"
code/modules/tables/rack.dm
+1 -4
View File
@@ -26,8 +26,6 @@
/obj/structure/table/rack/holorack/dismantle(obj/item/weapon/tool/wrench/W, mob/user)
to_chat(user, "<span class='warning'>You cannot dismantle \the [src].</span>")
return
<<<<<<< HEAD
=======
/obj/structure/table/rack/steel
color = "#666666"
@@ -62,5 +60,4 @@
/obj/structure/table/rack/gun_rack/steel/Initialize()
material = get_material_by_name(MAT_STEEL)
. = ..()
>>>>>>> 2f0a618d451... /atom New() => Initialize() [MDB IGNORE] (#8298)
. = ..()