Makes Mobs Lazier and Removes Hard References (#13693)

* Makes Mobs Lazier and Removes Hard References

* fluff
This commit is contained in:
Fox McCloud
2020-06-30 17:52:28 -06:00
committed by GitHub
parent 0dea896023
commit e438ff4d36
31 changed files with 99 additions and 171 deletions
@@ -480,8 +480,8 @@ Congratulations! You are now trained for invasive xenobiology research!"}
H.update_inv_r_hand()
/obj/item/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user)
user.lastattacked = L
L.lastattacker = user
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
L.Stun(7)
L.Weaken(7)
+4 -12
View File
@@ -573,9 +573,10 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
// /vg/; Vox Inviolate for humans :V
/datum/objective/minimize_casualties
explanation_text = "Minimise casualties."
/datum/objective/minimize_casualties/check_completion()
if(owner.kills.len>5) return 0
return 1
return TRUE
//Vox heist objectives.
@@ -781,16 +782,7 @@ GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective)
explanation_text = "Follow the Inviolate. Minimise death and loss of resources."
/datum/objective/heist/inviolate_death/check_completion()
var/vox_allowed_kills = 3 // The number of people the vox can accidently kill. Mostly a counter to people killing themselves if a raider touches them to force fail.
var/vox_total_kills = 0
var/datum/game_mode/heist/H = SSticker.mode
for(var/datum/mind/raider in H.raiders)
vox_total_kills += raider.kills.len // Kills are listed in the mind; uses this to calculate vox kills
if(vox_total_kills > vox_allowed_kills) return 0
return 1
return TRUE
// Traders
// These objectives have no check_completion, they exist only to tell Sol Traders what to aim for.
@@ -166,10 +166,6 @@
var/mob/M = A
if(istype(firer, /mob))
add_attack_logs(firer, M, "Mecha-shot with <b>[src]</b>")
if(!iscarbon(firer))
M.LAssailant = null
else
M.LAssailant = firer
else
add_attack_logs(null, M, "Mecha-shot with <b>[src]</b>")
if(life <= 0)
@@ -147,10 +147,6 @@
to_chat(user, "<span class='notice'>You inject yourself with [src].</span>")
add_attack_logs(user, M, attack_log, ATKLOG_ALL)
if(!iscarbon(user))
M.LAssailant = null
else
M.LAssailant = user
inject(M, user)
used = TRUE
+2 -2
View File
@@ -189,8 +189,8 @@
L.apply_effect(STUTTER, stunforce)
if(user)
user.lastattacked = L
L.lastattacker = user
L.lastattacker = user.real_name
L.lastattackerckey = user.ckey
L.visible_message("<span class='danger'>[user] has stunned [L] with [src]!</span>", \
"<span class='userdanger'>[user] has stunned you with [src]!</span>")
add_attack_logs(user, L, "stunned")