cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Convert /material to it's correct absolute path /datum/material (#7637)

Browse Source
This commit is contained in:
ShadowLarkens
2020-09-20 02:00:09 -07:00
committed by GitHub
parent 45dcc14270
commit 927c41c7a3
35 changed files with 167 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/tables/debug.dm
View File

@@ -7,7 +7,7 @@
material = get_material_by_name("debugium")
..()
/material/debug
/datum/material/debug
name = "debugium"
stack_type = /obj/item/stack/material/debug
icon_base = "debug"

10
code/modules/tables/tables.dm
View File

@@ -18,8 +18,8 @@
var/can_plate = 1
var/manipulating = 0
var/material/material = null
var/material/reinforced = null
var/datum/material/material = null
var/datum/material/reinforced = null
// Gambling tables. I'd prefer reinforced with carpet/felt/cloth/whatever, but AFAIK it's either harder or impossible to get /obj/item/stack/material of those.
// Convert if/when you can easily get stacks of these.
@@ -235,7 +235,7 @@
// Returns the material to set the table to.
/obj/structure/table/proc/common_material_add(obj/item/stack/material/S, mob/user, verb) // Verb is actually verb without 'e' or 'ing', which is added. Works for 'plate'/'plating' and 'reinforce'/'reinforcing'.
var/material/M = S.get_material()
var/datum/material/M = S.get_material()
if(!istype(M))
to_chat(user, "<span class='warning'>You cannot [verb]e \the [src] with \the [S].</span>")
return null
@@ -251,7 +251,7 @@
return M
// Returns the material to set the table to.
/obj/structure/table/proc/common_material_remove(mob/user, material/M, delay, what, type_holding, sound)
/obj/structure/table/proc/common_material_remove(mob/user, datum/material/M, delay, what, type_holding, sound)
if(!M.stack_type)
to_chat(user, "<span class='warning'>You are unable to remove the [what] from this [src]!</span>")
return M
@@ -320,7 +320,7 @@
if(full_return || prob(20))
new /obj/item/stack/material/steel(src.loc)
else
var/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL)
var/datum/material/M = get_material_by_name(DEFAULT_WALL_MATERIAL)
S = M.place_shard(loc)
if(S) shards += S
qdel(src)