mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
[MIRROR] more new to Init (#10183)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
This commit is contained in:
committed by
GitHub
parent
001ec6a06b
commit
e957f101c5
@@ -3,77 +3,77 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/standard/New()
|
||||
/obj/structure/table/standard/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/steel
|
||||
icon_state = "plain_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/steel/New()
|
||||
/obj/structure/table/steel/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/marble
|
||||
icon_state = "stone_preview"
|
||||
color = "#CCCCCC"
|
||||
|
||||
/obj/structure/table/marble/New()
|
||||
/obj/structure/table/marble/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_MARBLE)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/reinforced/New()
|
||||
/obj/structure/table/reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/steel_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/steel_reinforced/New()
|
||||
/obj/structure/table/steel_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/wooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/wooden_reinforced/New()
|
||||
/obj/structure/table/wooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/woodentable
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/woodentable/New()
|
||||
/obj/structure/table/woodentable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/sifwoodentable
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/sifwoodentable/New()
|
||||
/obj/structure/table/sifwoodentable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/sifwooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/sifwooden_reinforced/New()
|
||||
/obj/structure/table/sifwooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/hardwoodtable
|
||||
icon_state = "stone_preview"
|
||||
@@ -81,48 +81,48 @@
|
||||
|
||||
/obj/structure/table/hardwoodtable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_HARDWOOD)
|
||||
return ..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/gamblingtable
|
||||
icon_state = "gamble_preview"
|
||||
|
||||
/obj/structure/table/gamblingtable/New()
|
||||
/obj/structure/table/gamblingtable/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
carpeted = 1
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/glass
|
||||
icon_state = "plain_preview"
|
||||
color = "#00E1FF"
|
||||
alpha = 77 // 0.3 * 255
|
||||
|
||||
/obj/structure/table/glass/New()
|
||||
/obj/structure/table/glass/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_GLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/borosilicate
|
||||
icon_state = "plain_preview"
|
||||
color = "#4D3EAC"
|
||||
alpha = 77
|
||||
|
||||
/obj/structure/table/borosilicate/New()
|
||||
/obj/structure/table/borosilicate/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_PGLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/holotable
|
||||
icon_state = "holo_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/holotable/New()
|
||||
/obj/structure/table/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/woodentable/holotable
|
||||
icon_state = "holo_preview"
|
||||
|
||||
/obj/structure/table/woodentable/holotable/New()
|
||||
/obj/structure/table/woodentable/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holowood")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/alien
|
||||
name = "alien table"
|
||||
@@ -131,11 +131,11 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/alien/New()
|
||||
/obj/structure/table/alien/Initialize(mapload)
|
||||
material = get_material_by_name("alium")
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/alien/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -146,69 +146,69 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/standard/New()
|
||||
/obj/structure/table/bench/standard/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/steel
|
||||
icon_state = "plain_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/bench/steel/New()
|
||||
/obj/structure/table/bench/steel/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
|
||||
/obj/structure/table/bench/marble
|
||||
icon_state = "stone_preview"
|
||||
color = "#CCCCCC"
|
||||
|
||||
/obj/structure/table/bench/marble/New()
|
||||
/obj/structure/table/bench/marble/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_MARBLE)
|
||||
..()
|
||||
. = ..()
|
||||
/*
|
||||
/obj/structure/table/bench/reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/reinforced/New()
|
||||
/obj/structure/table/bench/reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(DEFAULT_TABLE_MATERIAL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/steel_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#666666"
|
||||
|
||||
/obj/structure/table/bench/steel_reinforced/New()
|
||||
/obj/structure/table/bench/steel_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/wooden_reinforced
|
||||
icon_state = "reinf_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/wooden_reinforced/New()
|
||||
/obj/structure/table/bench/wooden_reinforced/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
reinforced = get_material_by_name(MAT_STEEL)
|
||||
..()
|
||||
. = ..()
|
||||
*/
|
||||
/obj/structure/table/bench/wooden
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/wooden/New()
|
||||
/obj/structure/table/bench/wooden/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_WOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/sifwooden
|
||||
icon_state = "plain_preview"
|
||||
color = "#824B28"
|
||||
|
||||
/obj/structure/table/bench/sifwooden/New()
|
||||
/obj/structure/table/bench/sifwooden/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_SIFWOOD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/sifwooden/padded
|
||||
icon_state = "padded_preview"
|
||||
@@ -217,33 +217,33 @@
|
||||
/obj/structure/table/bench/padded
|
||||
icon_state = "padded_preview"
|
||||
|
||||
/obj/structure/table/bench/padded/New()
|
||||
/obj/structure/table/bench/padded/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_STEEL)
|
||||
carpeted = 1
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/glass
|
||||
icon_state = "plain_preview"
|
||||
color = "#00E1FF"
|
||||
alpha = 77 // 0.3 * 255
|
||||
|
||||
/obj/structure/table/bench/glass/New()
|
||||
/obj/structure/table/bench/glass/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_GLASS)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/*
|
||||
/obj/structure/table/bench/holotable
|
||||
icon_state = "holo_preview"
|
||||
color = "#EEEEEE"
|
||||
|
||||
/obj/structure/table/bench/holotable/New()
|
||||
/obj/structure/table/bench/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/bench/wooden/holotable
|
||||
icon_state = "holo_preview"
|
||||
|
||||
/obj/structure/table/bench/wooden/holotable/New()
|
||||
/obj/structure/table/bench/wooden/holotable/Initialize(mapload)
|
||||
material = get_material_by_name("holowood")
|
||||
..()
|
||||
. = ..()
|
||||
*/
|
||||
|
||||
@@ -7,12 +7,12 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/darkglass/New()
|
||||
material = get_material_by_name("darkglass")
|
||||
/obj/structure/table/darkglass/Initialize()
|
||||
material = get_material_by_name(MAT_DARKGLASS)
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/darkglass/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -30,12 +30,12 @@
|
||||
can_reinforce = FALSE
|
||||
can_plate = FALSE
|
||||
|
||||
/obj/structure/table/fancyblack/New()
|
||||
material = get_material_by_name("fancyblack")
|
||||
/obj/structure/table/fancyblack/Initialize(mapload)
|
||||
material = get_material_by_name(MAT_FANCYBLACK)
|
||||
verbs -= /obj/structure/table/verb/do_flip
|
||||
verbs -= /obj/structure/table/proc/do_put
|
||||
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
/obj/structure/table/fancyblack/dismantle(obj/item/tool/wrench/W, mob/user)
|
||||
to_chat(user, span_warning("You cannot dismantle \the [src]."))
|
||||
@@ -45,6 +45,6 @@
|
||||
icon_state = "plain_preview"
|
||||
color = "#FFFF00"
|
||||
|
||||
/obj/structure/table/gold/New()
|
||||
/obj/structure/table/gold/Initialize()
|
||||
material = get_material_by_name(MAT_GOLD)
|
||||
..()
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user