Refactors Ore Eating to Allow the Consumption of Material Sheets

Refactors ore eating to facilitate the ethical consumption of refined materials, easily obtainable on station. Suggested by the kobolds.

Also fixes the material name of Plastitanium glass throughout the codebase.
This commit is contained in:
KasparoVy
2020-05-22 03:55:04 -04:00
parent 7ebe2d6bae
commit 1a5bdf4e98
9 changed files with 118 additions and 47 deletions
+12
View File
@@ -88,6 +88,18 @@
return
return ..()
//VOREStation Add
/obj/item/stack/material/attack(mob/living/M as mob, mob/living/user as mob)
if(M.handle_eat_ore(src, user))
return
..()
/obj/item/stack/material/attack_generic(var/mob/living/user) //Allow adminbussed mobs to eat ore if they click it while NOT on help intent.
if(user.handle_eat_ore(src))
return
..()
//VOREStation Add End
/obj/item/stack/material/iron
name = "iron"
icon_state = "sheet-silver"
+1 -1
View File
@@ -39,7 +39,7 @@
item_state = "sheet-silver"
no_variants = FALSE
drop_sound = 'sound/items/drop/glass.ogg'
default_type = MAT_PLASTANIUMGLASS
default_type = MAT_PLASTITANIUMGLASS
/obj/fiftyspawner/plastitanium_glass
name = "stack of plastitanium glass"
+1 -1
View File
@@ -65,7 +65,7 @@
composite_material = list(MAT_TITANIUM = SHEET_MATERIAL_AMOUNT, MAT_PLASTEEL = SHEET_MATERIAL_AMOUNT)
/material/glass/plastaniumglass
name = MAT_PLASTANIUMGLASS
name = MAT_PLASTITANIUMGLASS
display_name = "plas-titanium glass"
stack_type = /obj/item/stack/material/glass/plastitanium
integrity = 200