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

Merge pull request #10852 from VOREStation/Arokha/matdefs

Browse Source 
Use material defines more
This commit is contained in:
Aronai Sieyes
2021-07-07 15:00:49 -04:00
committed by GitHub
parent 49aa2830a0 8bcd31c91e
commit 8ab34365f1
205 changed files with 888 additions and 898 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/girders.dm
+1 -1
View File
@@ -10,7 +10,7 @@
var/displaced_health = 50
var/current_damage = 0
var/cover = 50 //how much cover the girder provides against projectiles.
var/default_material = DEFAULT_WALL_MATERIAL
var/default_material = MAT_STEEL
var/datum/material/girder_material
var/datum/material/reinf_material
var/reinforcing = 0
code/game/objects/structures/simple_doors.dm
+1 -1
View File
@@ -33,7 +33,7 @@
/obj/structure/simple_door/proc/set_material(var/material_name)
if(!material_name)
material_name = DEFAULT_WALL_MATERIAL
material_name = MAT_STEEL
material = get_material_by_name(material_name)
if(!material)
return
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -26,7 +26,7 @@
..(newloc)
color = null
if(!new_material)
new_material = DEFAULT_WALL_MATERIAL
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(!istype(material))
qdel(src)
code/game/objects/structures/stool_bed_chair_nest/chairs_vr.dm
+2 -2
View File
@@ -202,7 +202,7 @@
add_overlay(I)
/obj/structure/bed/chair/bay/comfy/captain/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, DEFAULT_WALL_MATERIAL, "blue")
..(newloc, MAT_STEEL, "blue")
/obj/structure/bed/chair/bay/shuttle
name = "shuttle seat"
@@ -214,7 +214,7 @@
var/padding = "blue"
/obj/structure/bed/chair/bay/shuttle/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc, DEFAULT_WALL_MATERIAL, padding)
..(newloc, MAT_STEEL, padding)
/obj/structure/bed/chair/bay/shuttle/post_buckle_mob()
playsound(src,buckling_sound,75,1)
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+1 -1
View File
@@ -21,7 +21,7 @@ var/global/list/stool_cache = list() //haha stool
/obj/item/weapon/stool/New(var/newloc, var/new_material, var/new_padding_material)
..(newloc)
if(!new_material)
new_material = DEFAULT_WALL_MATERIAL
new_material = MAT_STEEL
material = get_material_by_name(new_material)
if(new_padding_material)
padding_material = get_material_by_name(new_padding_material)