mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-28 06:28:01 +01:00
Gets rid of hasvar usage and moves up some vars (#18262)
* Gets rid of hasvar usage * thiiis * moves damtype to /obj/item * throwing * Move vars moved * matter as well Pretty much only used for the robot lathe and when crafting...When you could only smelt down obj/item for its materials * Update floor_light.dm * exploitable * this can be moved up... * move persist to /item you can't ever place /obj in storage anyway...It would imply you can store the supermatter, which I think we don't want. * gets rid of being_used I added this for xenoarch, that was a mistake * move these * move these to the base file * Makes floorlight autolathe recipe not shit * Update floor_light.dm * Update floor_light.dm * Mechs no longer gib when hitting things --------- Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
if(path)
|
||||
I = new path()
|
||||
|
||||
if(!I) // Something has gone horribly wrong, or right.
|
||||
log_debug("[name] created an Autolathe design without an assigned path.")
|
||||
if(!isitem(I)) // Something has gone horribly wrong, or right.
|
||||
log_debug("[name] created an Autolathe design without an assigned path or illegal item. Item = [I]")
|
||||
return
|
||||
|
||||
if(I.matter && !resources)
|
||||
|
||||
@@ -55,7 +55,7 @@
|
||||
|
||||
/datum/category_item/autolathe/general/floor_light
|
||||
name = "floor light"
|
||||
path =/obj/machinery/floor_light
|
||||
path =/obj/item/floor_light
|
||||
|
||||
/datum/category_item/autolathe/general/extinguisher
|
||||
name = "extinguisher"
|
||||
|
||||
@@ -1,6 +1,3 @@
|
||||
/obj/item
|
||||
var/list/tool_qualities
|
||||
|
||||
/// Used to check for a specific tool quality on an item.
|
||||
/// Returns TRUE or FALSE depending on whether `tool_quality` is found.
|
||||
/obj/item/proc/has_tool_quality(tool_quality)
|
||||
|
||||
@@ -42,11 +42,9 @@
|
||||
var/atom/movable/product = instances[instances.len] // Remove the last added product
|
||||
instances -= product
|
||||
product.forceMove(product_location)
|
||||
//VOREStation Addition Start
|
||||
if(istype(product, /obj))
|
||||
var/obj/item = product
|
||||
item.persist_storable = FALSE
|
||||
//VOREStation Addition End
|
||||
if(istype(product, /obj/item))
|
||||
var/obj/item/our_item = product
|
||||
our_item.persist_storable = FALSE
|
||||
return product
|
||||
|
||||
/datum/stored_item/proc/add_product(var/atom/movable/product)
|
||||
|
||||
Reference in New Issue
Block a user