Merge pull request #6272 from Mechoid/Mining_Expansion_The_Diggening

Mining Expansion, the Diggening.
This commit is contained in:
Atermonera
2019-07-12 23:47:42 -08:00
committed by GitHub
21 changed files with 464 additions and 39 deletions
@@ -63,4 +63,24 @@
. = ..()
if(!.) // Not friendly, see if they're a baddie first.
if(L.mind && raiders.is_antagonist(L.mind))
return TRUE
return TRUE
// Variant that is neutral, and thus on the station's side. It checks records.
/mob/living/simple_mob/mechanical/viscerator/station
icon_state = "viscerator_b_attack"
icon_living = "viscerator_b_attack"
faction = "station"
maxHealth = 20
health = 20
melee_damage_lower = 2
melee_damage_upper = 5
base_attack_cooldown = 8
/mob/living/simple_mob/mechanical/viscerator/station/IIsAlly(mob/living/L)
. = ..()
if(!.)
if(isrobot(L)) // They ignore synths.
return TRUE
return L.assess_perp(src, FALSE, FALSE, TRUE, FALSE) <= 4
@@ -43,7 +43,20 @@
faction = "syndicate"
/mob/living/simple_mob/mechanical/ward/monitor/crew
faction = "neutral"
icon_state = "ward-nt"
/mob/living/simple_mob/mechanical/ward/monitor/crew/attackby(var/obj/item/O as obj, var/mob/user as mob)
if(istype(O, /obj/item/weapon/card/id) && !owner)
owner = user
return
..()
/mob/living/simple_mob/mechanical/ward/monitor/crew/IIsAlly(mob/living/L)
. = ..()
if(!.)
if(isrobot(L)) // They ignore synths.
return TRUE
return L.assess_perp(src, FALSE, FALSE, TRUE, FALSE) <= 4
/mob/living/simple_mob/mechanical/ward/monitor/death()
if(owner)
@@ -55,10 +68,10 @@
/mob/living/simple_mob/mechanical/ward/monitor/update_icon()
if(seen_mobs.len)
icon_living = "ward_spotted"
icon_living = "[initial(icon_state)]_spotted"
glow_color = "#FF0000"
else
icon_living = "ward"
icon_living = "[initial(icon_state)]_ward"
glow_color = "#00FF00"
handle_light() // Update the light immediately.
..()
@@ -118,4 +131,4 @@
return FALSE
/datum/ai_holder/simple_mob/monitor/ranged_attack(atom/A)
return FALSE
return FALSE