mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-27 05:57:24 +01:00
Let ghosts interact with requests consoles/turret controls, mecha bay console icon fix
This commit is contained in:
@@ -601,6 +601,11 @@
|
||||
|
||||
/obj/machinery/alarm/attack_robot(mob/user)
|
||||
return attack_ai(user)
|
||||
|
||||
/obj/machinery/alarm/attack_ghost(user as mob)
|
||||
if(stat & (BROKEN|MAINT))
|
||||
return
|
||||
return ui_interact(user)
|
||||
|
||||
/obj/machinery/alarm/attack_hand(mob/user)
|
||||
. = ..()
|
||||
|
||||
@@ -53,12 +53,7 @@ FIRE ALARM
|
||||
if(src.detecting)
|
||||
if(temperature > T0C+200)
|
||||
src.alarm() // added check of detector status here
|
||||
return
|
||||
|
||||
/obj/machinery/alarm/attack_ghost(user as mob)
|
||||
if(stat & (BROKEN|MAINT))
|
||||
return
|
||||
return ui_interact(user)
|
||||
return
|
||||
|
||||
/obj/machinery/firealarm/attack_ai(mob/user as mob)
|
||||
src.add_hiddenprint(user)
|
||||
|
||||
@@ -98,6 +98,12 @@ var/list/obj/machinery/requests_console/allConsoles = list()
|
||||
req_console_information -= department
|
||||
..()
|
||||
|
||||
/obj/machinery/requests_console/attack_ghost(user as mob)
|
||||
if(stat & NOPOWER)
|
||||
return
|
||||
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/requests_console/attack_hand(user as mob)
|
||||
if(..(user))
|
||||
return
|
||||
@@ -132,7 +138,8 @@ var/list/obj/machinery/requests_console/allConsoles = list()
|
||||
ui.set_auto_update(1)
|
||||
|
||||
/obj/machinery/requests_console/Topic(href, href_list)
|
||||
if(..()) return
|
||||
if(..())
|
||||
return 1
|
||||
usr.set_machine(src)
|
||||
add_fingerprint(usr)
|
||||
|
||||
|
||||
@@ -107,6 +107,9 @@
|
||||
return
|
||||
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/turretid/attack_ghost(mob/user as mob)
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/turretid/attack_hand(mob/user as mob)
|
||||
if(isLocked(user))
|
||||
|
||||
@@ -223,6 +223,7 @@
|
||||
/obj/machinery/computer/mech_bay_power_console/proc/mecha_out()
|
||||
if(recharge_port)
|
||||
recharge_port.stop_charge()
|
||||
update_icon()
|
||||
return
|
||||
|
||||
/obj/machinery/computer/mech_bay_power_console/power_change()
|
||||
|
||||
Reference in New Issue
Block a user