cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sorry Molti and Bibby, Im stupid, this should fix me not doing your comments (#17451)

Browse Source 
* e

* e

* oops
This commit is contained in:
Jamie D
2023-01-11 23:14:36 +00:00
committed by GitHub
parent 5ba339cd78
commit 9745a92b81
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/__DEFINES/obj_flags.dm
View File

@@ -20,8 +20,8 @@
#define FORCE_STRING_OVERRIDE (1<<2) // used for tooltips
#define NEEDS_PERMIT (1<<3) //Used by security bots to determine if this item is safe for public use.
#define SLOWS_WHILE_IN_HAND (1<<4)
#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
#define DROPDEL (1<<6) // When dropped, it calls qdel on itself
#define NO_MAT_REDEMPTION (1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
#define DROPDEL (1<<6) // When dropped, it calls qdel on itself
#define NOBLUDGEON (1<<7) // when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
#define ABSTRACT (1<<9) // for all things that are technically items but used for various different stuff
#define IMMUTABLE_SLOW (1<<10) // When players should not be able to change the slowdown of the item (Speed potions, etc)
@@ -29,7 +29,8 @@
#define SURGICAL_TOOL (1<<12) //Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
#define UNCATCHABLE (1<<13) // Makes any item uncatchable if it is thrown at them
#define MEDRESIST (1<<14) // This item will block medical sprays when worn
#define HAND_ITEM (1<<15) // If an item is just your hand (circled hand, slapper) and shouldn't block things like riding
#define HAND_ITEM (1<<15) // If an item is just your hand (circled hand, slapper) and shouldn't block things like riding
#define AUTOLATHED (1<<16) // Autolathed item innit
// Flags for the clothing_flags var on /obj/item/clothing

2
code/game/machinery/autolathe.dm
View File

@@ -365,7 +365,7 @@
for(var/i=1, i<=multiplier, i++)
var/obj/item/new_item = new D.build_path(A)
new_item.materials = new_item.materials.Copy()
new_item.printed = TRUE
new_item.item_flags |= AUTOLATHED
for(var/mat in materials_used)
new_item.materials[mat] = materials_used[mat] / multiplier
new_item.autolathe_crafted(src)

2
code/modules/cargo/exports.dm
View File

@@ -45,7 +45,7 @@ Credit dupes that require a lot of manual work shouldn't be removed, unless they
var/sold = FALSE
if(QDELETED(thing))
continue
if(istype(thingy) && thingy.printed)
if(istype(thingy) && thingy.item_flags & AUTOLATHED)
qdel(thingy)
for(var/datum/export/E in GLOB.exports_list)
if(!E)