Alien bugfixes

This commit is contained in:
Markolie
2014-12-15 12:04:30 +01:00
parent aa40bf6bbe
commit e648bb959e
20 changed files with 129 additions and 40 deletions
+3
View File
@@ -97,6 +97,7 @@
var/global/list/status_overlays_equipment
var/global/list/status_overlays_lighting
var/global/list/status_overlays_environ
var/indestructible = 0 // If set, prevents aliens from destroying it
/obj/machinery/power/apc/updateDialog()
if (stat & (BROKEN|MAINT))
@@ -667,6 +668,8 @@
return
if(!istype(user,/mob/living/carbon/alien/humanoid))
return
if(indestructible)
return
user.visible_message("\red [user.name] slashes at the [src.name]!", "\blue You slash at the [src.name]!")
playsound(src.loc, 'sound/weapons/slash.ogg', 100, 1)
+3 -3
View File
@@ -331,13 +331,13 @@
/obj/machinery/power/smes/attack_ai(mob/user)
add_fingerprint(user)
ui_interact(user)
/obj/machinery/power/smes/attack_hand(mob/user)
add_fingerprint(user)
ui_interact(user)
/obj/machinery/power/smes/attack_alien(mob/living/carbon/alien/humanoid/user)
return
/obj/machinery/power/smes/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)