Thrown vending machines crush mobs + move circuitboard define (#55723)

* Thrown vending machines crush you

Also moves circuitboard define

* Remove extra empty line

* Move code to fitting place
This commit is contained in:
Gamer025
2020-12-26 19:53:52 -08:00
committed by GitHub
parent 2b8795020c
commit 87eda56558
2 changed files with 8 additions and 3 deletions
+6 -3
View File
@@ -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"