Fixes interaction AI stuff

This commit is contained in:
kevinz000
2018-04-11 12:10:03 -07:00
committed by CitadelStationBot
parent 4063781baf
commit 9da197469b
7 changed files with 152 additions and 29 deletions

View File

@@ -268,10 +268,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
CHECK_TICK
// attack with hand, switch position
/obj/machinery/conveyor_switch/attack_hand(mob/user)
. = ..()
if(.)
return
/obj/machinery/conveyor_switch/interact(mob/user)
add_fingerprint(user)
if(position == 0)
if(convdir) //is it a oneway switch

View File

@@ -9,7 +9,8 @@
armor = list("melee" = 25, "bullet" = 10, "laser" = 10, "energy" = 100, "bomb" = 0, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 30)
max_integrity = 200
resistance_flags = FIRE_PROOF
interaction_flags_machine = INTERACT_MACHINE_OPEN
interaction_flags_machine = INTERACT_MACHINE_OPEN | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON
obj_flags = CAN_BE_HIT | USES_TGUI
var/datum/gas_mixture/air_contents // internal reservoir
var/full_pressure = FALSE
var/pressure_charging = TRUE
@@ -280,7 +281,7 @@
// handle machine interaction
/obj/machinery/disposal/bin/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
if(stat & BROKEN)
return
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)