cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-26 22:46:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac

Browse Source
This commit is contained in:
izac112
2022-10-16 22:52:41 +02:00
parent 2d2e1a9d46 d92e5d3e28
commit dc36fe9b8f
501 changed files with 22581 additions and 19177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/fifty_spawner_mats.dm
+8
View File
@@ -12,6 +12,10 @@
name = "stack of marble"
type_to_spawn = /obj/item/stack/material/marble
/obj/fiftyspawner/concrete
name = "stack of concrete"
type_to_spawn = /obj/item/stack/material/concrete
/obj/fiftyspawner/diamond
name = "stack of diamond"
type_to_spawn = /obj/item/stack/material/diamond
@@ -72,6 +76,10 @@
name = "stack of plasteel"
type_to_spawn = /obj/item/stack/material/plasteel
/obj/fiftyspawner/plasteel/rebar
name = "stack of plasteel rebars"
type_to_spawn = /obj/item/stack/material/plasteel/rebar
/obj/fiftyspawner/plasteel/hull
name = "stack of plasteel hull"
type_to_spawn = /obj/item/stack/material/plasteel/hull
code/modules/materials/materials/_materials.dm
+4 -1
View File
@@ -373,4 +373,7 @@ var/list/name_to_material
new /datum/stack_recipe("[display_name] knife", /obj/item/weapon/material/knife/plastic, 1, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE),
new /datum/stack_recipe("[display_name] blade", /obj/item/weapon/material/butterflyblade, 6, time = 20, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE),
new /datum/stack_recipe("[display_name] defense wire", /obj/item/weapon/material/barbedwire, 10, time = 1 MINUTE, one_per_turf = 0, on_floor = 1, supplied_material = "[name]", pass_stack_color = TRUE)
)
)
/datum/material/proc/get_wall_texture()
return
code/modules/materials/materials/metals/plasteel.dm
+10 -1
View File
@@ -24,8 +24,17 @@
new /datum/stack_recipe("dark floor tile", /obj/item/stack/tile/floor/dark, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("roller bed", /obj/item/roller, 5, time = 30, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("whetstone", /obj/item/weapon/whetstone, 2, time = 10, recycle_material = "[name]"),
new /datum/stack_recipe("plasteel rebar", /obj/item/stack/material/plasteel/rebar, 1, time = 5, recycle_material = "[name]"),
new /datum/stack_recipe_list("reinforced low walls",list(
new /datum/stack_recipe("reinforced low wall (bay style)", /obj/structure/low_wall/bay/reinforced, 3, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", recycle_material = "[name]"),
new /datum/stack_recipe("reinforced low wall (eris style)", /obj/structure/low_wall/eris/reinforced, 3, one_per_turf = 1, on_floor = 1, supplied_material = "[name]", recycle_material = "[name]")
)),
)
)
/datum/material/plasteel/rebar //to give a different reinforced overlay
name = MAT_PLASTEELREBAR
icon_reinf = "reinf_metal"
icon_colour = "#6A6A6A"
stack_type = /obj/item/stack/material/plasteel/rebar
sheet_singular_name = "rod"
sheet_plural_name = "rods"
code/modules/materials/materials/metals/steel.dm
+14 -14
View File
@@ -15,19 +15,19 @@
new /datum/stack_recipe("dark office chair", /obj/structure/bed/chair/office/dark, 5, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("light office chair", /obj/structure/bed/chair/office/light, 5, one_per_turf = 1, on_floor = 1, recycle_material = "[name]")
)),
new /datum/stack_recipe_list("comfy chairs", list(
new /datum/stack_recipe("beige comfy chair", /obj/structure/bed/chair/comfy/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("black comfy chair", /obj/structure/bed/chair/comfy/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("brown comfy chair", /obj/structure/bed/chair/comfy/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("lime comfy chair", /obj/structure/bed/chair/comfy/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("teal comfy chair", /obj/structure/bed/chair/comfy/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("red comfy chair", /obj/structure/bed/chair/comfy/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("blue comfy chair", /obj/structure/bed/chair/comfy/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("purple comfy chair", /obj/structure/bed/chair/comfy/purp, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("green comfy chair", /obj/structure/bed/chair/comfy/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("yellow comfy chair", /obj/structure/bed/chair/comfy/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("orange comfy chair", /obj/structure/bed/chair/comfy/orange, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
)),
new /datum/stack_recipe_list("rounded chairs", list(
new /datum/stack_recipe("beige rounded chair", /obj/structure/bed/chair/comfy/rounded/beige, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("black rounded chair", /obj/structure/bed/chair/comfy/rounded/black, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("brown rounded chair", /obj/structure/bed/chair/comfy/rounded/brown, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("lime rounded chair", /obj/structure/bed/chair/comfy/rounded/lime, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("teal rounded chair", /obj/structure/bed/chair/comfy/rounded/teal, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("red rounded chair", /obj/structure/bed/chair/comfy/rounded/red, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("blue rounded chair", /obj/structure/bed/chair/comfy/rounded/blue, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("purple rounded chair", /obj/structure/bed/chair/comfy/rounded/purple, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("green rounded chair", /obj/structure/bed/chair/comfy/rounded/green, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("yellow rounded chair", /obj/structure/bed/chair/comfy/rounded/yellow, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("orange rounded chair", /obj/structure/bed/chair/comfy/rounded/orange, 2, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
)),
new /datum/stack_recipe_list("airlock assemblies", list(
new /datum/stack_recipe("standard airlock assembly", /obj/structure/door_assembly, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
new /datum/stack_recipe("command airlock assembly", /obj/structure/door_assembly/door_assembly_com, 4, time = 50, one_per_turf = 1, on_floor = 1, recycle_material = "[name]"),
@@ -86,4 +86,4 @@
new /datum/stack_recipe("apc frame", /obj/item/frame/apc, 2, recycle_material = "[name]"),
new /datum/stack_recipe("desk bell", /obj/item/weapon/deskbell, 1, on_floor = 1, supplied_material = "[name]"),
new /datum/stack_recipe("tanning rack", /obj/structure/tanning_rack, 3, one_per_turf = TRUE, time = 20, on_floor = TRUE, supplied_material = "[name]")
)
)
code/modules/materials/materials/stone.dm
+33 -2
View File
@@ -39,7 +39,7 @@
icon_colour = "#9e9c99"
weight = 20
hardness = 30
integrity = 100
integrity = 100
stack_type = /obj/item/stack/material/flint
supply_conversion_value = 2
sheet_singular_name = "piece"
@@ -47,4 +47,35 @@
/datum/material/stone/flint/generate_recipes()
return
//VOREStation Addition End
//VOREStation Addition End
/datum/material/stone/concrete
name = MAT_CONCRETE
stack_type = /obj/item/stack/material/concrete
icon_base = "brick"
icon_colour = COLOR_GRAY
integrity = 150
melting_point = 1550
protectiveness = 10
weight = 27
hardness = 60
var/image/texture
/datum/material/stone/concrete/generate_recipes()
..()
recipes += list(
new /datum/stack_recipe_list("Concrete Pathing",list(
new /datum/stack_recipe("Concrete Flooring", /obj/item/stack/tile/floor/concrete, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk", /obj/item/stack/tile/floor/sidewalk, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk (Side)", /obj/item/stack/tile/floor/sidewalk/side, 1, 4, 20, recycle_material = "[name]"),
new /datum/stack_recipe("Concrete Sidewalk (Slab)", /obj/item/stack/tile/floor/sidewalk/slab, 1, 4, 20, recycle_material = "[name]")
)),
)
/datum/material/stone/concrete/New()
. = ..()
texture = image('icons/turf/wall_texture.dmi', "concrete")
texture.blend_mode = BLEND_MULTIPLY
/datum/material/stone/concrete/get_wall_texture()
return texture
code/modules/materials/sheets/metals/metal.dm
+13
View File
@@ -12,6 +12,19 @@
no_variants = FALSE
apply_colour = TRUE
/obj/item/stack/material/plasteel/rebar
name = MAT_PLASTEELREBAR
icon_state = "rods"
default_type = MAT_PLASTEELREBAR
apply_colour = 1
/obj/item/stack/material/plasteel/rebar/update_icon()
var/amount = get_amount()
if((amount <= 5) && (amount > 0))
icon_state = "rods-[amount]"
else
icon_state = "rods"
/obj/item/stack/material/durasteel
name = "durasteel"
icon_state = "sheet-reinforced"
code/modules/materials/sheets/stone.dm
+8 -1
View File
@@ -22,4 +22,11 @@
drop_sound = 'sound/items/drop/boots.ogg'
pickup_sound = 'sound/items/pickup/boots.ogg'
pass_color = TRUE
apply_colour = TRUE
apply_colour = TRUE
/obj/item/stack/material/concrete
name = "concrete brick"
icon_state = "brick"
default_type = "concrete"
no_variants = FALSE
apply_colour = 1