Tigercat & Fox tweaks

This commit is contained in:
Citinited
2017-10-15 23:03:28 +01:00
parent d485bd8d41
commit be97382c26
3 changed files with 8 additions and 7 deletions
+4 -3
View File
@@ -646,9 +646,10 @@ About the new airlock wires panel:
if(user)
src.attack_ai(user)
/obj/machinery/door/airlock/CanPass(obj/item/mover)
if(isElectrified() && density)
if(mover.flags & CONDUCT)
/obj/machinery/door/airlock/CanPass(atom/movable/mover, turf/target, height=0)
if(isElectrified() && density && istype(mover, /obj/item))
var/obj/item/I = mover
if(I.flags & CONDUCT)
var/datum/effect/system/spark_spread/s = new /datum/effect/system/spark_spread
s.set_up(5, 1, src)
s.start()
+2 -2
View File
@@ -57,11 +57,11 @@
var/radiation_amount
/obj/effect/mine/dnascramble/mineEffect(mob/living/victim)
victim.apply_effect(radiation_amount, IRRADIATE, 0)
if(ishuman(victim))
var/mob/living/carbon/human/V = victim
if(V.species.flags & (RADIMMUNE | NO_DNA))
if(V.species.flags & NO_DNA)
return
victim.apply_effect(radiation_amount, IRRADIATE, 0)
randmutb(victim)
domutcheck(victim ,null)
@@ -61,7 +61,7 @@
dat += "<tr><td>&nbsp;</td></tr>"
dat += "<tr><td><B>Collar:</B></td><td><A href='?src=[UID()];item=[slot_collar]'>[(collar && !(collar.flags&ABSTRACT)) ? collar : "<font color=grey>Empty</font>"]</A></td></tr>"
if(facehugger)
dat += "<tr><td><B>Facehugger:</B></td><td><A href='?src=[UID()];["remove_hugger"]=remove_hugger'>[facehugger]</A></td></tr>"
dat += "<tr><td><B>Facehugger:</B></td><td><A href='?src=[UID()];remove_hugger=1'>[facehugger]</A></td></tr>"
dat += {"</table>
<A href='?src=[user.UID()];mach_close=mob\ref[src]'>Close</A>
"}
@@ -104,7 +104,7 @@
/mob/living/simple_animal/pet/corgi/Topic(href, href_list)
if(usr.stat) return
if(!Adjacent(usr) || !(ishuman(usr) || isrobot(usr) || isalienadult(usr)))
if((!ishuman(usr) && !isrobot(usr)) || !Adjacent(usr))
return
//Removing from inventory
if(href_list["remove_inv"])