cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

More material renames

Browse Source 
Gives several materials shorter and easier to type names, updating the
display_name where applicable. Also fixed a slightly mismatched variable
type.
This commit is contained in:
HarpyEagle
2015-08-05 16:06:48 -04:00
parent d1bd146b1a
commit fc7e89380e
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/robot/robot_parts.dm
View File

@@ -126,7 +126,7 @@
/obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob) /obj/item/robot_parts/robot_suit/attackby(obj/item/W as obj, mob/user as mob)
..() ..()
if(istype(W, /obj/item/stack/material) && W.get_material_name() == DEFAULT_WALL_MATERIAL && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head) if(istype(W, /obj/item/stack/material) && W.get_material_name() == DEFAULT_WALL_MATERIAL && !l_arm && !r_arm && !l_leg && !r_leg && !chest && !head)
var/obj/item/stack/material/steel/M = W var/obj/item/stack/material/M = W
if (M.use(1)) if (M.use(1))
var/obj/item/weapon/secbot_assembly/ed209_assembly/B = new /obj/item/weapon/secbot_assembly/ed209_assembly var/obj/item/weapon/secbot_assembly/ed209_assembly/B = new /obj/item/weapon/secbot_assembly/ed209_assembly
B.loc = get_turf(src) B.loc = get_turf(src)

2
code/game/objects/items/weapons/material/shards.dm
View File

@@ -87,4 +87,4 @@
..(loc, "steel") ..(loc, "steel")
/obj/item/weapon/material/shard/phoron/New(loc) /obj/item/weapon/material/shard/phoron/New(loc)
..(loc, "phoron glass") ..(loc, "phglass")

4
code/modules/materials/material_sheets.dm
View File

@@ -198,9 +198,9 @@
name = "phoron glass" name = "phoron glass"
singular_name = "phoron glass sheet" singular_name = "phoron glass sheet"
icon_state = "sheet-phoronglass" icon_state = "sheet-phoronglass"
default_type = "phoron glass" default_type = "phglass"
/obj/item/stack/material/glass/phoronrglass /obj/item/stack/material/glass/phoronrglass
name = "reinforced phoron glass" name = "reinforced phoron glass"
icon_state = "sheet-phoronrglass" icon_state = "sheet-phoronrglass"
default_type = "reinforced phoron glass" default_type = "rphglass"

12
code/modules/materials/materials.dm
View File

@@ -329,7 +329,7 @@ var/list/name_to_material
icon_colour = "#666666" icon_colour = "#666666"
/material/steel/holographic /material/steel/holographic
name = "holographic " + DEFAULT_WALL_MATERIAL name = "holo" + DEFAULT_WALL_MATERIAL
display_name = DEFAULT_WALL_MATERIAL display_name = DEFAULT_WALL_MATERIAL
stack_type = null stack_type = null
shard_type = SHARD_NONE shard_type = SHARD_NONE
@@ -458,7 +458,8 @@ var/list/name_to_material
rod_product = null rod_product = null
/material/glass/phoron /material/glass/phoron
name = "phoron glass" name = "phglass"
display_name = "phoron glass"
stack_type = /obj/item/stack/material/glass/phoronglass stack_type = /obj/item/stack/material/glass/phoronglass
flags = MATERIAL_BRITTLE flags = MATERIAL_BRITTLE
ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE+300 ignition_point = PHORON_MINIMUM_BURN_TEMPERATURE+300
@@ -470,7 +471,8 @@ var/list/name_to_material
rod_product = /obj/item/stack/material/glass/phoronrglass rod_product = /obj/item/stack/material/glass/phoronrglass
/material/glass/phoron/reinforced /material/glass/phoron/reinforced
name = "reinforced phoron glass" name = "rphglass"
display_name = "reinforced phoron glass"
stack_type = /obj/item/stack/material/glass/phoronrglass stack_type = /obj/item/stack/material/glass/phoronrglass
stack_origin_tech = "materials=4;phorontech=2" stack_origin_tech = "materials=4;phorontech=2"
composite_material = list() //todo composite_material = list() //todo
@@ -491,7 +493,7 @@ var/list/name_to_material
stack_origin_tech = "materials=3" stack_origin_tech = "materials=3"
/material/plastic/holographic /material/plastic/holographic
name = "holographic plastic" name = "holoplastic"
display_name = "plastic" display_name = "plastic"
stack_type = null stack_type = null
shard_type = SHARD_NONE shard_type = SHARD_NONE
@@ -569,7 +571,7 @@ var/list/name_to_material
sheet_plural_name = "planks" sheet_plural_name = "planks"
/material/wood/holographic /material/wood/holographic
name = "holographic wood" name = "holowood"
display_name = "wood" display_name = "wood"
stack_type = null stack_type = null
shard_type = SHARD_NONE shard_type = SHARD_NONE

4
code/modules/tables/presets.dm
View File

@@ -63,11 +63,11 @@
icon_state = "holo_preview" icon_state = "holo_preview"
color = "#EEEEEE" color = "#EEEEEE"
New() New()
material = get_material_by_name("holographic [DEFAULT_TABLE_MATERIAL]") material = get_material_by_name("holo[DEFAULT_TABLE_MATERIAL]")
..() ..()
woodentable/holotable woodentable/holotable
icon_state = "holo_preview" icon_state = "holo_preview"
New() New()
material = get_material_by_name("holographic wood") material = get_material_by_name("holowood")
..() ..()