cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-29 23:46:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

repository subsystem touchups & moves materials/designs over (#6832)

Browse Source
This commit is contained in:
silicons
2024-11-05 15:22:44 +01:00
committed by GitHub
parent 219bb26cfc
commit 6ace2afd6a
278 changed files with 2614 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/materials/stack.dm
+4 -4
View File
@@ -8,10 +8,10 @@
* @params
* * material_like - material instance, type, or id. If left out, this proc returns TRUE if we are a material stack of any kind.
*/
/obj/item/proc/is_material_stack_of(datum/material/material_like)
/obj/item/proc/is_material_stack_of(datum/prototype/material/material_like)
return FALSE
/obj/item/stack/material/is_material_stack_of(datum/material/material_like)
/obj/item/stack/material/is_material_stack_of(datum/prototype/material/material_like)
if(istype(material_like))
return material == material_like
else if(ispath(material_like))
@@ -28,10 +28,10 @@
* @params
* * material_like - material instance, type, or id. If left out, this proc returns TRUE if we are a material stack of any kind.
*/
/obj/item/proc/is_material_stack_of_fuzzy(datum/material/material_like)
/obj/item/proc/is_material_stack_of_fuzzy(datum/prototype/material/material_like)
return FALSE
/obj/item/stack/material/is_material_stack_of_fuzzy(datum/material/material_like)
/obj/item/stack/material/is_material_stack_of_fuzzy(datum/prototype/material/material_like)
if(istype(material_like))
return material == material_like
else if(ispath(material_like))