Mob bump fixes.

ED-209 is considered massive enough to not bump easily.
update_canmove() no longer unconditionally sets mob density. Fixes #10365. Fixes #10682.
This commit is contained in:
PsiOmega
2015-08-16 20:55:02 +02:00
parent f0c9f16099
commit 4d826e68cb
4 changed files with 10 additions and 3 deletions
+3 -1
View File
@@ -101,10 +101,12 @@
..(message, null, verb)
/mob/living/bot/Bump(var/atom/A)
if(istype(A, /obj/machinery/door) && botcard)
if(on && botcard && istype(A, /obj/machinery/door))
var/obj/machinery/door/D = A
if(!istype(D, /obj/machinery/door/firedoor) && !istype(D, /obj/machinery/door/blast) && D.check_access(botcard))
D.open()
else
..()
/mob/living/bot/proc/Emag(var/mob/user)
log_and_message_admins("emagged [src]")
+5
View File
@@ -11,6 +11,11 @@
is_ranged = 1
preparing_arrest_sounds = new()
a_intent = I_HURT
mob_bump_flag = HEAVY
mob_swap_flags = ALLMOBS
mob_push_flags = ALLMOBS|HEAVY
var/shot_delay = 4
var/last_shot = 0
+1 -1
View File
@@ -717,7 +717,7 @@
drop_l_hand()
drop_r_hand()
else
density = 1
density = initial(density)
for(var/obj/item/weapon/grab/G in grabbed_by)
if(G.state >= GRAB_AGGRESSIVE)