diff --git a/code/game/objects/items/circuitboards/circuitboard.dm b/code/game/objects/items/circuitboards/circuitboard.dm index 84f5aef3d82..2af90932a2f 100644 --- a/code/game/objects/items/circuitboards/circuitboard.dm +++ b/code/game/objects/items/circuitboards/circuitboard.dm @@ -14,6 +14,8 @@ w_class = WEIGHT_CLASS_SMALL grind_results = list(/datum/reagent/silicon = 20) var/build_path = null + ///determines if the circuit board originated from a vendor off station or not. + var/onstation = TRUE /obj/item/circuitboard/proc/apply_default_parts(obj/machinery/M) if(LAZYLEN(M.component_parts)) diff --git a/code/modules/vending/_vending.dm b/code/modules/vending/_vending.dm index 4621bf0024b..464a1420371 100644 --- a/code/modules/vending/_vending.dm +++ b/code/modules/vending/_vending.dm @@ -169,9 +169,6 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /// used for narcing on underages var/obj/item/radio/Radio -/obj/item/circuitboard - ///determines if the circuit board originated from a vendor off station or not. - var/onstation = TRUE /** * Initialize the vending machine @@ -1004,6 +1001,12 @@ GLOBAL_LIST_EMPTY(vending_products) tilt(L) +///Crush the mob that the vending machine got thrown at +/obj/machinery/vending/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) + if(isliving(hit_atom)) + tilt(fatty=hit_atom) + return ..() + /obj/machinery/vending/custom name = "Custom Vendor" icon_state = "robotics"