mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Adds rutile (titanium ore) and other materials
This commit is contained in:
@@ -59,3 +59,7 @@
|
|||||||
#define PTO_CIVILIAN "Civilian"
|
#define PTO_CIVILIAN "Civilian"
|
||||||
|
|
||||||
#define DEPARTMENT_TALON "ITV Talon"
|
#define DEPARTMENT_TALON "ITV Talon"
|
||||||
|
|
||||||
|
#define MAT_TITANIUMGLASS "ti-glass"
|
||||||
|
#define MAT_PLASTITANIUM "plastitanium"
|
||||||
|
#define MAT_PLASTANIUMGLASS "plastitanium glass"
|
||||||
5
code/game/objects/items/weapons/material/shards_vr.dm
Normal file
5
code/game/objects/items/weapons/material/shards_vr.dm
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
/obj/item/weapon/material/shard/titaniumglass/New(loc)
|
||||||
|
..(loc, MAT_TITANIUMGLASS)
|
||||||
|
|
||||||
|
/obj/item/weapon/material/shard/plastitaniumglass/New(loc)
|
||||||
|
..(loc, MAT_PLASTANIUMGLASS)
|
||||||
37
code/game/objects/structures/window_vr.dm
Normal file
37
code/game/objects/structures/window_vr.dm
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
/obj/structure/window/titanium
|
||||||
|
name = "ti-glass window"
|
||||||
|
desc = "A titanium alloy window, combining the strength of titanium with the transparency of glass. It seems to be very strong."
|
||||||
|
basestate = "window"
|
||||||
|
icon_state = "window"
|
||||||
|
color = "#A7A3A6"
|
||||||
|
shardtype = /obj/item/weapon/material/shard/titaniumglass
|
||||||
|
glasstype = /obj/item/stack/material/glass/titanium
|
||||||
|
reinf = 0
|
||||||
|
maximal_heat = T0C + 5000
|
||||||
|
damage_per_fire_tick = 1.0
|
||||||
|
maxhealth = 100.0
|
||||||
|
force_threshold = 10
|
||||||
|
|
||||||
|
/obj/structure/window/titanium/full
|
||||||
|
icon_state = "window-full"
|
||||||
|
maxhealth = 200
|
||||||
|
fulltile = TRUE
|
||||||
|
|
||||||
|
/obj/structure/window/plastitanium
|
||||||
|
name = "plastanium glass window"
|
||||||
|
desc = "A plastitanium alloy window, combining the strength of plastitanium with the transparency of glass. It seems to be very strong."
|
||||||
|
basestate = "window"
|
||||||
|
icon_state = "window"
|
||||||
|
color = "#676366"
|
||||||
|
shardtype = /obj/item/weapon/material/shard/plastitaniumglass
|
||||||
|
glasstype = /obj/item/stack/material/glass/plastitanium
|
||||||
|
reinf = 0
|
||||||
|
maximal_heat = T0C + 7000
|
||||||
|
damage_per_fire_tick = 1.0
|
||||||
|
maxhealth = 120.0
|
||||||
|
force_threshold = 10
|
||||||
|
|
||||||
|
/obj/structure/window/plastitanium/full
|
||||||
|
icon_state = "window-full"
|
||||||
|
maxhealth = 250
|
||||||
|
fulltile = TRUE
|
||||||
46
code/modules/materials/material_sheets_vr.dm
Normal file
46
code/modules/materials/material_sheets_vr.dm
Normal file
@@ -0,0 +1,46 @@
|
|||||||
|
/obj/item/stack/material/titanium
|
||||||
|
icon = 'icons/obj/stacks_vr.dmi'
|
||||||
|
icon_state = "sheet-titanium"
|
||||||
|
no_variants = FALSE
|
||||||
|
|
||||||
|
/obj/fiftyspawner/titanium
|
||||||
|
name = "stack of titanium"
|
||||||
|
type_to_spawn = /obj/item/stack/material/titanium
|
||||||
|
|
||||||
|
/obj/item/stack/material/glass/titanium
|
||||||
|
name = "ti-glass sheets"
|
||||||
|
icon = 'icons/obj/stacks_vr.dmi'
|
||||||
|
icon_state = "sheet-titaniumglass"
|
||||||
|
item_state = "sheet-silver"
|
||||||
|
no_variants = FALSE
|
||||||
|
drop_sound = 'sound/items/drop/glass.ogg'
|
||||||
|
default_type = MAT_TITANIUMGLASS
|
||||||
|
|
||||||
|
/obj/fiftyspawner/titanium_glass
|
||||||
|
name = "stack of ti-glass"
|
||||||
|
type_to_spawn = /obj/item/stack/material/glass/titanium
|
||||||
|
|
||||||
|
/obj/item/stack/material/plastitanium
|
||||||
|
name = "plas-tanium sheets"
|
||||||
|
icon = 'icons/obj/stacks_vr.dmi'
|
||||||
|
icon_state = "sheet-plastitanium"
|
||||||
|
item_state = "sheet-silver"
|
||||||
|
no_variants = FALSE
|
||||||
|
default_type = MAT_PLASTITANIUM
|
||||||
|
|
||||||
|
/obj/fiftyspawner/plastitanium
|
||||||
|
name = "stack of plastitanium"
|
||||||
|
type_to_spawn = /obj/item/stack/material/plastitanium
|
||||||
|
|
||||||
|
/obj/item/stack/material/glass/plastitanium
|
||||||
|
name = "plas-tanium glass sheets"
|
||||||
|
icon = 'icons/obj/stacks_vr.dmi'
|
||||||
|
icon_state = "sheet-plastitaniumglass"
|
||||||
|
item_state = "sheet-silver"
|
||||||
|
no_variants = FALSE
|
||||||
|
drop_sound = 'sound/items/drop/glass.ogg'
|
||||||
|
default_type = MAT_PLASTANIUMGLASS
|
||||||
|
|
||||||
|
/obj/fiftyspawner/plastitanium_glass
|
||||||
|
name = "stack of plastitanium glass"
|
||||||
|
type_to_spawn = /obj/item/stack/material/glass/plastitanium
|
||||||
@@ -30,3 +30,53 @@
|
|||||||
display_name = "fancyblack"
|
display_name = "fancyblack"
|
||||||
icon_base = "fancyblack"
|
icon_base = "fancyblack"
|
||||||
icon_colour = "#FFFFFF"
|
icon_colour = "#FFFFFF"
|
||||||
|
|
||||||
|
/material/glass/titaniumglass
|
||||||
|
name = MAT_TITANIUMGLASS
|
||||||
|
display_name = "titanium glass"
|
||||||
|
stack_type = /obj/item/stack/material/glass/titanium
|
||||||
|
integrity = 150
|
||||||
|
hardness = 50
|
||||||
|
weight = 50
|
||||||
|
flags = MATERIAL_BRITTLE
|
||||||
|
icon_colour = "#A7A3A6"
|
||||||
|
stack_origin_tech = list(TECH_MATERIAL = 5)
|
||||||
|
window_options = list("One Direction" = 1, "Full Window" = 4)
|
||||||
|
created_window = /obj/structure/window/titanium
|
||||||
|
created_fulltile_window = /obj/structure/window/titanium/full
|
||||||
|
wire_product = null
|
||||||
|
rod_product = /obj/item/stack/material/glass/titanium
|
||||||
|
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, "glass" = SHEET_MATERIAL_AMOUNT)
|
||||||
|
|
||||||
|
/material/plastitanium
|
||||||
|
name = MAT_PLASTITANIUM
|
||||||
|
stack_type = /obj/item/stack/material/plastitanium
|
||||||
|
integrity = 600
|
||||||
|
melting_point = 9000
|
||||||
|
icon_base = "solid"
|
||||||
|
icon_reinf = "reinf_over"
|
||||||
|
icon_colour = "#585658"
|
||||||
|
explosion_resistance = 35
|
||||||
|
hardness = 90
|
||||||
|
weight = 40
|
||||||
|
protectiveness = 30
|
||||||
|
conductivity = 7
|
||||||
|
stack_origin_tech = list(TECH_MATERIAL = 5)
|
||||||
|
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
|
||||||
|
|
||||||
|
/material/glass/plastaniumglass
|
||||||
|
name = MAT_PLASTANIUMGLASS
|
||||||
|
display_name = "plas-titanium glass"
|
||||||
|
stack_type = /obj/item/stack/material/glass/plastitanium
|
||||||
|
integrity = 200
|
||||||
|
hardness = 60
|
||||||
|
weight = 80
|
||||||
|
flags = MATERIAL_BRITTLE
|
||||||
|
icon_colour = "#676366"
|
||||||
|
stack_origin_tech = list(TECH_MATERIAL = 6)
|
||||||
|
window_options = list("One Direction" = 1, "Full Window" = 4)
|
||||||
|
created_window = /obj/structure/window/plastitanium
|
||||||
|
created_fulltile_window = /obj/structure/window/plastitanium/full
|
||||||
|
wire_product = null
|
||||||
|
rod_product = /obj/item/stack/material/glass/plastitanium
|
||||||
|
composite_material = list(MAT_PLASTITANIUM = SHEET_MATERIAL_AMOUNT, "glass" = SHEET_MATERIAL_AMOUNT)
|
||||||
19
code/modules/mining/alloys_vr.dm
Normal file
19
code/modules/mining/alloys_vr.dm
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
/datum/alloy/tiglass
|
||||||
|
metaltag = MAT_TITANIUMGLASS
|
||||||
|
requires = list(
|
||||||
|
"rutile" = 1,
|
||||||
|
"sand" = 2
|
||||||
|
)
|
||||||
|
product_mod = 1
|
||||||
|
product = /obj/item/stack/material/glass/titanium
|
||||||
|
|
||||||
|
/datum/alloy/plastiglass
|
||||||
|
metaltag = MAT_PLASTANIUMGLASS
|
||||||
|
requires = list(
|
||||||
|
"rutile" = 1,
|
||||||
|
"sand" = 2,
|
||||||
|
"platinum" = 1,
|
||||||
|
"carbon" = 2,
|
||||||
|
)
|
||||||
|
product_mod = 1
|
||||||
|
product = /obj/item/stack/material/glass/plastitanium
|
||||||
@@ -53,7 +53,8 @@ var/list/mining_overlay_cache = list()
|
|||||||
"carbon" = /obj/item/weapon/ore/coal,
|
"carbon" = /obj/item/weapon/ore/coal,
|
||||||
"verdantium" = /obj/item/weapon/ore/verdantium,
|
"verdantium" = /obj/item/weapon/ore/verdantium,
|
||||||
"marble" = /obj/item/weapon/ore/marble,
|
"marble" = /obj/item/weapon/ore/marble,
|
||||||
"lead" = /obj/item/weapon/ore/lead
|
"lead" = /obj/item/weapon/ore/lead,
|
||||||
|
"rutile" = /obj/item/weapon/ore/rutile //VOREStation Add
|
||||||
)
|
)
|
||||||
|
|
||||||
has_resources = 1
|
has_resources = 1
|
||||||
@@ -638,10 +639,10 @@ turf/simulated/mineral/floor/light_corner
|
|||||||
|
|
||||||
var/mineral_name
|
var/mineral_name
|
||||||
if(rare_ore)
|
if(rare_ore)
|
||||||
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1))
|
mineral_name = pickweight(list("marble" = 5, "uranium" = 10, "platinum" = 10, "hematite" = 20, "carbon" = 20, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 5, "verdantium" = 1, "rutile" = 4)) //VOREStation Edit
|
||||||
|
|
||||||
else
|
else
|
||||||
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1))
|
mineral_name = pickweight(list("marble" = 3, "uranium" = 10, "platinum" = 10, "hematite" = 70, "carbon" = 70, "diamond" = 2, "gold" = 10, "silver" = 10, "phoron" = 20, "lead" = 2, "verdantium" = 1, "rutile" = 4)) //VOREStation Edit
|
||||||
|
|
||||||
if(mineral_name && (mineral_name in ore_data))
|
if(mineral_name && (mineral_name in ore_data))
|
||||||
mineral = ore_data[mineral_name]
|
mineral = ore_data[mineral_name]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/obj/effect/mineral
|
/obj/effect/mineral
|
||||||
name = "mineral vein"
|
name = "mineral vein"
|
||||||
icon = 'icons/obj/mining.dmi'
|
icon = 'icons/obj/mining_vr.dmi' //VOREStation Edit
|
||||||
desc = "Shiny."
|
desc = "Shiny."
|
||||||
mouse_opacity = 0
|
mouse_opacity = 0
|
||||||
density = 0
|
density = 0
|
||||||
|
|||||||
9
code/modules/mining/ore_datum_vr.dm
Normal file
9
code/modules/mining/ore_datum_vr.dm
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
/ore/rutile
|
||||||
|
name = "rutile"
|
||||||
|
display_name = "rutile"
|
||||||
|
smelts_to = "titanium"
|
||||||
|
alloy = 1
|
||||||
|
result_amount = 5
|
||||||
|
spread_chance = 10
|
||||||
|
ore = /obj/item/weapon/ore/rutile
|
||||||
|
scan_icon = "mineral_rare"
|
||||||
6
code/modules/mining/ore_vr.dm
Normal file
6
code/modules/mining/ore_vr.dm
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
/obj/item/weapon/ore/rutile
|
||||||
|
name = "rutile"
|
||||||
|
icon = 'icons/obj/mining_vr.dmi'
|
||||||
|
icon_state = "ore_rutile"
|
||||||
|
origin_tech = list(TECH_MATERIAL = 2)
|
||||||
|
material = "rutile"
|
||||||
@@ -741,6 +741,7 @@
|
|||||||
"diamond" = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly."),
|
"diamond" = list("nutrition" = 50, "remark" = "The heavenly taste of [O] almost brings a tear to your eye. Its glimmering gloriousness is even better on the tongue than you imagined, so you savour it fondly."),
|
||||||
"platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible."),
|
"platinum" = list("nutrition" = 40, "remark" = "A bit tangy but elegantly balanced with a long faintly sour finish. Delectible."),
|
||||||
"mhydrogen" = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly."),
|
"mhydrogen" = list("nutrition" = 30, "remark" = "Quite sweet on the tongue, you savour the light and easy to chew [O], finishing it quickly."),
|
||||||
|
"rutile" = list("nutrition" = 50, "remark" = "A little... angular, you savour the light but chewy [O], finishing it quickly."),
|
||||||
MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment."),
|
MAT_VERDANTIUM = list("nutrition" = 50, "remark" = "You taste scientific mystery and a rare delicacy. Your tastebuds tingle pleasantly as you eat [O] and the feeling warmly blossoms in your chest for a moment."),
|
||||||
MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum."),
|
MAT_LEAD = list("nutrition" = 40, "remark" = "It takes some work to break down [O] but you manage it, unlocking lasting tangy goodness in the process. Yum."),
|
||||||
)
|
)
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 583 B After Width: | Height: | Size: 8.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 813 B After Width: | Height: | Size: 4.0 KiB |
@@ -131,7 +131,7 @@ VIRGO2_TURF_CREATE(/turf/simulated/mineral)
|
|||||||
if(mineral)
|
if(mineral)
|
||||||
return
|
return
|
||||||
|
|
||||||
var/mineral_name = pickweight(list("marble" = 5, "uranium" = 5, "platinum" = 10, "hematite" = 5, "carbon" = 5, "diamond" = 10, "gold" = 20, "silver" = 20, "lead" = 10, "verdantium" = 5))
|
var/mineral_name = pickweight(list("marble" = 5, "uranium" = 5, "platinum" = 5, "hematite" = 5, "carbon" = 5, "diamond" = 5, "gold" = 5, "silver" = 5, "lead" = 5, "verdantium" = 5, "rutile" = 20))
|
||||||
|
|
||||||
if(mineral_name && (mineral_name in ore_data))
|
if(mineral_name && (mineral_name in ore_data))
|
||||||
mineral = ore_data[mineral_name]
|
mineral = ore_data[mineral_name]
|
||||||
|
|||||||
@@ -80,18 +80,18 @@
|
|||||||
/turf/simulated/floor/carpet,
|
/turf/simulated/floor/carpet,
|
||||||
/area/aro2/couchroom)
|
/area/aro2/couchroom)
|
||||||
"ap" = (
|
"ap" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/holodeckroom)
|
/area/aro2/holodeckroom)
|
||||||
"aq" = (
|
"aq" = (
|
||||||
/obj/machinery/media/jukebox,
|
/obj/machinery/media/jukebox,
|
||||||
@@ -1376,9 +1376,6 @@
|
|||||||
/obj/structure/table/rack/shelf/steel,
|
/obj/structure/table/rack/shelf/steel,
|
||||||
/obj/item/weapon/technomancer_catalog/universal,
|
/obj/item/weapon/technomancer_catalog/universal,
|
||||||
/obj/item/weapon/technomancer_core/universal,
|
/obj/item/weapon/technomancer_core/universal,
|
||||||
/obj/item/mecha_parts/mecha_equipment/cloak,
|
|
||||||
/obj/item/mecha_parts/mecha_equipment/crisis_drone,
|
|
||||||
/obj/item/mecha_parts/mecha_equipment/omni_shield,
|
|
||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/storage)
|
/area/aro2/storage)
|
||||||
"cO" = (
|
"cO" = (
|
||||||
@@ -1401,18 +1398,18 @@
|
|||||||
/turf/simulated/wall/rpshull,
|
/turf/simulated/wall/rpshull,
|
||||||
/area/aro2/powerroom)
|
/area/aro2/powerroom)
|
||||||
"cS" = (
|
"cS" = (
|
||||||
/obj/structure/grille,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 8;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/obj/structure/window/phoronreinforced{
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
dir = 1
|
dir = 1
|
||||||
},
|
},
|
||||||
/obj/machinery/door/firedoor/glass,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/turf/simulated/floor/reinforced,
|
|
||||||
/area/aro2/bighallway)
|
/area/aro2/bighallway)
|
||||||
"cT" = (
|
"cT" = (
|
||||||
/obj/structure/cable/cyan{
|
/obj/structure/cable/cyan{
|
||||||
@@ -1609,18 +1606,18 @@
|
|||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/storage)
|
/area/aro2/storage)
|
||||||
"dp" = (
|
"dp" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 8
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 4;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
dir = 8;
|
||||||
|
icon_state = "window"
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/bighallway)
|
/area/aro2/bighallway)
|
||||||
"dq" = (
|
"dq" = (
|
||||||
/obj/effect/floor_decal/techfloor/orange{
|
/obj/effect/floor_decal/techfloor/orange{
|
||||||
@@ -1900,6 +1897,10 @@
|
|||||||
icon_state = "warningcorner";
|
icon_state = "warningcorner";
|
||||||
dir = 8
|
dir = 8
|
||||||
},
|
},
|
||||||
|
/obj/structure/table/rack/shelf/steel,
|
||||||
|
/obj/item/mecha_parts/mecha_equipment/omni_shield,
|
||||||
|
/obj/item/mecha_parts/mecha_equipment/crisis_drone,
|
||||||
|
/obj/item/mecha_parts/mecha_equipment/cloak,
|
||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/boatbay)
|
/area/aro2/boatbay)
|
||||||
"dR" = (
|
"dR" = (
|
||||||
@@ -2367,20 +2368,23 @@
|
|||||||
dir = 1
|
dir = 1
|
||||||
},
|
},
|
||||||
/obj/structure/table/steel,
|
/obj/structure/table/steel,
|
||||||
/obj/item/weapon/storage/box/lights/tubes,
|
/obj/fiftyspawner/plastitanium,
|
||||||
|
/obj/fiftyspawner/plastitanium_glass,
|
||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/storage)
|
/area/aro2/storage)
|
||||||
"eJ" = (
|
"eJ" = (
|
||||||
/obj/structure/grille,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced,
|
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 8;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/structure/window/plastitanium/full,
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium{
|
||||||
|
dir = 2;
|
||||||
|
icon_state = "window"
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/bighallway)
|
/area/aro2/bighallway)
|
||||||
"eK" = (
|
"eK" = (
|
||||||
/turf/simulated/wall/r_wall,
|
/turf/simulated/wall/r_wall,
|
||||||
@@ -4239,6 +4243,7 @@
|
|||||||
icon_state = "1-2"
|
icon_state = "1-2"
|
||||||
},
|
},
|
||||||
/obj/machinery/light,
|
/obj/machinery/light,
|
||||||
|
/obj/item/weapon/storage/box/lights/tubes,
|
||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/storage)
|
/area/aro2/storage)
|
||||||
"ia" = (
|
"ia" = (
|
||||||
@@ -4426,18 +4431,18 @@
|
|||||||
/turf/simulated/floor/tiled/techfloor,
|
/turf/simulated/floor/tiled/techfloor,
|
||||||
/area/aro2/bighallway)
|
/area/aro2/bighallway)
|
||||||
"ix" = (
|
"ix" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/couchroom)
|
/area/aro2/couchroom)
|
||||||
"iy" = (
|
"iy" = (
|
||||||
/obj/structure/table/woodentable,
|
/obj/structure/table/woodentable,
|
||||||
@@ -4485,18 +4490,18 @@
|
|||||||
/turf/simulated/floor/carpet/bcarpet,
|
/turf/simulated/floor/carpet/bcarpet,
|
||||||
/area/shuttle/aroboat2)
|
/area/shuttle/aroboat2)
|
||||||
"qK" = (
|
"qK" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/room2)
|
/area/aro2/room2)
|
||||||
"qW" = (
|
"qW" = (
|
||||||
/obj/structure/table/bench/wooden,
|
/obj/structure/table/bench/wooden,
|
||||||
@@ -4528,18 +4533,6 @@
|
|||||||
/obj/machinery/atmospherics/binary/pump/aux,
|
/obj/machinery/atmospherics/binary/pump/aux,
|
||||||
/turf/simulated/floor/reinforced,
|
/turf/simulated/floor/reinforced,
|
||||||
/area/aro2/boatbay)
|
/area/aro2/boatbay)
|
||||||
"um" = (
|
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced,
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
|
||||||
/obj/machinery/door/blast/regular{
|
|
||||||
dir = 1;
|
|
||||||
icon_state = "pdoor1";
|
|
||||||
id = "arobackleft"
|
|
||||||
},
|
|
||||||
/turf/simulated/floor/reinforced,
|
|
||||||
/area/aro2/bighallway)
|
|
||||||
"vA" = (
|
"vA" = (
|
||||||
/obj/structure/flora/pottedplant/unusual,
|
/obj/structure/flora/pottedplant/unusual,
|
||||||
/turf/simulated/floor/tiled/techfloor,
|
/turf/simulated/floor/tiled/techfloor,
|
||||||
@@ -4555,18 +4548,18 @@
|
|||||||
/turf/simulated/floor/tiled/techfloor,
|
/turf/simulated/floor/tiled/techfloor,
|
||||||
/area/shuttle/aroboat2)
|
/area/shuttle/aroboat2)
|
||||||
"yk" = (
|
"yk" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/room3)
|
/area/aro2/room3)
|
||||||
"yG" = (
|
"yG" = (
|
||||||
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
/obj/machinery/atmospherics/unary/vent_scrubber/on{
|
||||||
@@ -4642,18 +4635,18 @@
|
|||||||
/turf/simulated/floor/tiled/techmaint,
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/shuttle/aroboat2)
|
/area/shuttle/aroboat2)
|
||||||
"Fu" = (
|
"Fu" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/room0)
|
/area/aro2/room0)
|
||||||
"FR" = (
|
"FR" = (
|
||||||
/obj/machinery/atmospherics/portables_connector/aux{
|
/obj/machinery/atmospherics/portables_connector/aux{
|
||||||
@@ -4744,18 +4737,18 @@
|
|||||||
/turf/simulated/floor/tiled/techfloor,
|
/turf/simulated/floor/tiled/techfloor,
|
||||||
/area/aro2/room0)
|
/area/aro2/room0)
|
||||||
"PT" = (
|
"PT" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced{
|
|
||||||
dir = 1
|
|
||||||
},
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
icon_state = "window";
|
||||||
|
dir = 1
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/room1)
|
/area/aro2/room1)
|
||||||
"QV" = (
|
"QV" = (
|
||||||
/obj/effect/shuttle_landmark{
|
/obj/effect/shuttle_landmark{
|
||||||
@@ -4799,16 +4792,18 @@
|
|||||||
/turf/simulated/floor/tiled/techfloor/grid,
|
/turf/simulated/floor/tiled/techfloor/grid,
|
||||||
/area/aro2/bighallway)
|
/area/aro2/bighallway)
|
||||||
"VH" = (
|
"VH" = (
|
||||||
/obj/structure/grille,
|
|
||||||
/obj/structure/window/phoronreinforced/full,
|
|
||||||
/obj/structure/window/phoronreinforced,
|
|
||||||
/obj/machinery/door/firedoor/glass,
|
/obj/machinery/door/firedoor/glass,
|
||||||
/obj/machinery/door/blast/regular{
|
/obj/machinery/door/blast/regular{
|
||||||
dir = 1;
|
dir = 1;
|
||||||
icon_state = "pdoor1";
|
icon_state = "pdoor1";
|
||||||
id = "arobackleft"
|
id = "arobackleft"
|
||||||
},
|
},
|
||||||
/turf/simulated/floor/reinforced,
|
/obj/structure/window/plastitanium/full,
|
||||||
|
/obj/structure/window/plastitanium{
|
||||||
|
dir = 2;
|
||||||
|
icon_state = "window"
|
||||||
|
},
|
||||||
|
/turf/simulated/floor/tiled/techmaint,
|
||||||
/area/aro2/cafe)
|
/area/aro2/cafe)
|
||||||
"VO" = (
|
"VO" = (
|
||||||
/obj/effect/floor_decal/spline/plain{
|
/obj/effect/floor_decal/spline/plain{
|
||||||
@@ -15726,7 +15721,7 @@ hf
|
|||||||
iq
|
iq
|
||||||
fx
|
fx
|
||||||
iw
|
iw
|
||||||
um
|
eJ
|
||||||
aa
|
aa
|
||||||
aa
|
aa
|
||||||
aa
|
aa
|
||||||
|
|||||||
@@ -1259,6 +1259,7 @@
|
|||||||
#include "code\game\objects\items\weapons\material\material_weapons.dm"
|
#include "code\game\objects\items\weapons\material\material_weapons.dm"
|
||||||
#include "code\game\objects\items\weapons\material\misc.dm"
|
#include "code\game\objects\items\weapons\material\misc.dm"
|
||||||
#include "code\game\objects\items\weapons\material\shards.dm"
|
#include "code\game\objects\items\weapons\material\shards.dm"
|
||||||
|
#include "code\game\objects\items\weapons\material\shards_vr.dm"
|
||||||
#include "code\game\objects\items\weapons\material\swords.dm"
|
#include "code\game\objects\items\weapons\material\swords.dm"
|
||||||
#include "code\game\objects\items\weapons\material\thrown.dm"
|
#include "code\game\objects\items\weapons\material\thrown.dm"
|
||||||
#include "code\game\objects\items\weapons\material\twohanded.dm"
|
#include "code\game\objects\items\weapons\material\twohanded.dm"
|
||||||
@@ -1368,6 +1369,7 @@
|
|||||||
#include "code\game\objects\structures\windoor_assembly.dm"
|
#include "code\game\objects\structures\windoor_assembly.dm"
|
||||||
#include "code\game\objects\structures\window.dm"
|
#include "code\game\objects\structures\window.dm"
|
||||||
#include "code\game\objects\structures\window_spawner.dm"
|
#include "code\game\objects\structures\window_spawner.dm"
|
||||||
|
#include "code\game\objects\structures\window_vr.dm"
|
||||||
#include "code\game\objects\structures\crates_lockers\closets.dm"
|
#include "code\game\objects\structures\crates_lockers\closets.dm"
|
||||||
#include "code\game\objects\structures\crates_lockers\crates.dm"
|
#include "code\game\objects\structures\crates_lockers\crates.dm"
|
||||||
#include "code\game\objects\structures\crates_lockers\crates_vr.dm"
|
#include "code\game\objects\structures\crates_lockers\crates_vr.dm"
|
||||||
@@ -2220,6 +2222,7 @@
|
|||||||
#include "code\modules\materials\material_recipes.dm"
|
#include "code\modules\materials\material_recipes.dm"
|
||||||
#include "code\modules\materials\material_recipes_vr.dm"
|
#include "code\modules\materials\material_recipes_vr.dm"
|
||||||
#include "code\modules\materials\material_sheets.dm"
|
#include "code\modules\materials\material_sheets.dm"
|
||||||
|
#include "code\modules\materials\material_sheets_vr.dm"
|
||||||
#include "code\modules\materials\material_synth.dm"
|
#include "code\modules\materials\material_synth.dm"
|
||||||
#include "code\modules\materials\materials.dm"
|
#include "code\modules\materials\materials.dm"
|
||||||
#include "code\modules\materials\materials_vr.dm"
|
#include "code\modules\materials\materials_vr.dm"
|
||||||
@@ -2236,6 +2239,7 @@
|
|||||||
#include "code\modules\mining\abandonedcrates.dm"
|
#include "code\modules\mining\abandonedcrates.dm"
|
||||||
#include "code\modules\mining\abandonedcrates_vr.dm"
|
#include "code\modules\mining\abandonedcrates_vr.dm"
|
||||||
#include "code\modules\mining\alloys.dm"
|
#include "code\modules\mining\alloys.dm"
|
||||||
|
#include "code\modules\mining\alloys_vr.dm"
|
||||||
#include "code\modules\mining\coins.dm"
|
#include "code\modules\mining\coins.dm"
|
||||||
#include "code\modules\mining\fulton.dm"
|
#include "code\modules\mining\fulton.dm"
|
||||||
#include "code\modules\mining\machine_input_output_plates.dm"
|
#include "code\modules\mining\machine_input_output_plates.dm"
|
||||||
@@ -2253,6 +2257,8 @@
|
|||||||
#include "code\modules\mining\ore.dm"
|
#include "code\modules\mining\ore.dm"
|
||||||
#include "code\modules\mining\ore_box.dm"
|
#include "code\modules\mining\ore_box.dm"
|
||||||
#include "code\modules\mining\ore_datum.dm"
|
#include "code\modules\mining\ore_datum.dm"
|
||||||
|
#include "code\modules\mining\ore_datum_vr.dm"
|
||||||
|
#include "code\modules\mining\ore_vr.dm"
|
||||||
#include "code\modules\mining\resonator_vr.dm"
|
#include "code\modules\mining\resonator_vr.dm"
|
||||||
#include "code\modules\mining\shelter_atoms_vr.dm"
|
#include "code\modules\mining\shelter_atoms_vr.dm"
|
||||||
#include "code\modules\mining\shelters_vr.dm"
|
#include "code\modules\mining\shelters_vr.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user