From 904f71f08ab06ea4128426458d8f92262344feea Mon Sep 17 00:00:00 2001 From: "elly1989@rocketmail.com" Date: Sat, 11 Aug 2012 15:41:21 +0000 Subject: [PATCH] Removing some unused loops and the last of the speech-bubble stuff. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4370 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/mecha/mecha.dm | 4 ---- code/game/objects/closets.dm | 7 ------- code/modules/mob/living/say.dm | 3 --- code/modules/mob/mob_movement.dm | 3 --- 4 files changed, 17 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 4119aac8d8a..1852c2ca1c3 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -292,10 +292,6 @@ move_result = mechturn(direction) else move_result = mechstep(direction) - if(occupant) - for(var/obj/effect/speech_bubble/B in range(1, src)) - if(B.parent == occupant) - B.loc = loc if(move_result) can_move = 0 use_power(step_energy_drain) diff --git a/code/game/objects/closets.dm b/code/game/objects/closets.dm index 7c1fdd906e2..7186eec2dab 100644 --- a/code/game/objects/closets.dm +++ b/code/game/objects/closets.dm @@ -218,13 +218,6 @@ spawn(30) lastbang = 0 -/obj/structure/closet/Move() - ..() - for(var/mob/M in contents) - for(var/obj/effect/speech_bubble/B in range(1, src)) - if(B.parent == M) - B.loc = loc - /obj/structure/closet/attack_paw(mob/user as mob) return src.attack_hand(user) diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index d19f0140090..643f1d4cc8b 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -383,6 +383,3 @@ var/list/department_radio_keys = list( log_say("[name]/[key] : [message]") - -/obj/effect/speech_bubble - var/mob/parent \ No newline at end of file diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm index e2090c6e1f4..2e9d3734df0 100644 --- a/code/modules/mob/mob_movement.dm +++ b/code/modules/mob/mob_movement.dm @@ -372,9 +372,6 @@ step(mob, pick(cardinal)) else . = ..() - for(var/obj/effect/speech_bubble/S in range(1, mob)) - if(S.parent == mob) - S.loc = mob.loc moving = 0