Changed based on feedback

This commit is contained in:
Aurorablade
2015-10-13 23:01:28 -04:00
parent bce376e875
commit d141945b10
5 changed files with 16 additions and 12 deletions
+1 -5
View File
@@ -329,11 +329,7 @@ Class Procs:
var/turf/T = get_turf(src)
for(var/atom/movable/AM in contents)
AM.forceMove(T)
//if(occupant)
// if(occupant.client)
// occupant.client.eye = occupant
// occupant.client.perspective = MOB_PERSPECTIVE
// occupant = null
////////////////////////////////////////////////////////////////////////////////////////////
/obj/machinery/attack_ai(var/mob/user as mob)
@@ -142,14 +142,14 @@
for (var/atom/movable/A as mob|obj in src)
A.forceMove(loc)
A.ex_act(severity++)
new /obj/item/stack/sheet/metal(loc)
new /obj/item/stack/sheet/metal(loc)
qdel(src)
if(3)
if(prob(5))
for(var/atom/movable/A as mob|obj in src)
A.forceMove(loc)
A.ex_act(severity++)
new /obj/item/stack/sheet/metal(loc)
new /obj/item/stack/sheet/metal(loc)
qdel(src)
/obj/structure/closet/bullet_act(var/obj/item/projectile/Proj)
+1 -1
View File
@@ -515,7 +515,7 @@
ask_verb = "tones"
exclaim_verb = "tones"
colour = "say_quote"
key = "z"//Zwarmer...Or Zerg!
key = "zw"//Zwarmer...Or Zerg!
flags = RESTRICTED || HIVEMIND
follow = 1
@@ -23,7 +23,6 @@
/datum/event/spawn_swarmer/start()
src << "[the_gateway]"
if(find_swarmer())
return 0
if(!the_gateway)
@@ -511,11 +511,20 @@
return 0
return 1
/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype = BRUTE)
if(damage <= force_threshold || ignored_damage_types[damagetype])
/mob/living/simple_animal/proc/attack_threshold_check(damage, damagetype)
if(damage <= force_threshold)
visible_message("<span class='warning'>[src] looks unharmed.</span>")
else
adjustBruteLoss(damage)
switch(damagetype)
if(BRUTE)
adjustBruteLoss(damage)
if(BURN)
adjustFireLoss(damage)
if(TOX)
adjustToxLoss(damage)
if(CLONE)
adjustCloneLoss(damage)
/mob/living/simple_animal/update_fire()
return