From 1ce01f34b91d44005c68db3d27c87f7744d621cc Mon Sep 17 00:00:00 2001 From: "johnsonmt88@gmail.com" Date: Thu, 19 Jul 2012 18:06:23 +0000 Subject: [PATCH] Rounded off the shuttle time message. "The Emergency Shuttle has left the station. Estimate 2.98662 minutes until the shuttle docks at Central Command." should no longer happen. Removed some while(1) loops from object process()s. Removed some unused object process()s. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4116 316c924e-a436-60f5-8080-3fe189b3f50e --- code/datums/shuttle_controller.dm | 4 +- code/game/objects/alien/resin.dm | 4 +- code/game/objects/effect_system.dm | 37 +++++++++---------- .../objects/items/weapons/cigs_lighters.dm | 14 +++---- code/game/objects/transfer_valve.dm | 3 -- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index 427e34b9d3..e5e209f554 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -173,7 +173,7 @@ datum/shuttle_controller start_location.move_contents_to(end_location) settimeleft(SHUTTLELEAVETIME) send2irc("Server", "The Emergency Shuttle has docked with the station.") - captain_announce("The Emergency Shuttle has docked with the station. You have [timeleft()/60] minutes to board the Emergency Shuttle.") + captain_announce("The Emergency Shuttle has docked with the station. You have [round(timeleft()/60,1)] minutes to board the Emergency Shuttle.") world << sound('shuttledock.ogg') return 1 @@ -243,7 +243,7 @@ datum/shuttle_controller D.close() - captain_announce("The Emergency Shuttle has left the station. Estimate [timeleft()/60] minutes until the shuttle docks at Central Command.") + captain_announce("The Emergency Shuttle has left the station. Estimate [round(timeleft()/60,1)] minutes until the shuttle docks at Central Command.") // Some aesthetic turbulance shaking for(var/mob/M in end_location) diff --git a/code/game/objects/alien/resin.dm b/code/game/objects/alien/resin.dm index 63f1e5aef0..e7e16f0060 100644 --- a/code/game/objects/alien/resin.dm +++ b/code/game/objects/alien/resin.dm @@ -118,7 +118,7 @@ ..() return -/obj/effect/alien/resin/process() //Buggy and irrelevant now that you're able to just make nice little infection chambers - Urist +///obj/effect/alien/resin/process() //Buggy and irrelevant now that you're able to just make nice little infection chambers - Urist /*if(affecting) var/mob/living/carbon/M = affecting var/check = 0 @@ -157,7 +157,7 @@ else for(var/mob/O in viewers(src, 3)) O.show_message(text("\red An alien larva bursts from the resin wall!"), 1, text("\red You hear a high, alien screech nearby!"), 2)*/ - return +// return /obj/effect/alien/resin/CanPass(atom/movable/mover, turf/target, height=0, air_group=0) if(air_group) return 0 diff --git a/code/game/objects/effect_system.dm b/code/game/objects/effect_system.dm index 5963a09251..5415daf442 100644 --- a/code/game/objects/effect_system.dm +++ b/code/game/objects/effect_system.dm @@ -827,7 +827,7 @@ steam.start() -- spawns the effect spawn(3 + metal*3) process() spawn(120) - expand = 0 // stop expanding + processing_objects.Remove(src) sleep(30) if(metal) @@ -854,30 +854,27 @@ steam.start() -- spawns the effect return - while(expand) // keep trying to expand while true - - for(var/direction in cardinal) + for(var/direction in cardinal) - var/turf/T = get_step(src,direction) - if(!T) - continue + var/turf/T = get_step(src,direction) + if(!T) + continue - if(!T.Enter(src)) - continue + if(!T.Enter(src)) + continue - var/obj/effect/effect/foam/F = locate() in T - if(F) - continue + var/obj/effect/effect/foam/F = locate() in T + if(F) + continue - F = new(T, metal) - F.amount = amount - if(!metal) - F.create_reagents(10) - if (reagents) - for(var/datum/reagent/R in reagents.reagent_list) - F.reagents.add_reagent(R.id,1) - sleep(15) + F = new(T, metal) + F.amount = amount + if(!metal) + F.create_reagents(10) + if (reagents) + for(var/datum/reagent/R in reagents.reagent_list) + F.reagents.add_reagent(R.id,1) // foam disolves when heated // except metal foams diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm index 8c37ab76e0..c9b9001eed 100644 --- a/code/game/objects/items/weapons/cigs_lighters.dm +++ b/code/game/objects/items/weapons/cigs_lighters.dm @@ -26,14 +26,12 @@ ZIPPO process() - while(src.lit == 1) - src.smoketime-- - sleep(10) - if(src.smoketime < 1) - src.icon_state = "match_burnt" - src.lit = -1 - processing_objects.Remove(src) - return + src.smoketime-- + if(src.smoketime < 1) + src.icon_state = "match_burnt" + src.lit = -1 + processing_objects.Remove(src) + return dropped(mob/user as mob) diff --git a/code/game/objects/transfer_valve.dm b/code/game/objects/transfer_valve.dm index c3daaae202..bc4891a8db 100644 --- a/code/game/objects/transfer_valve.dm +++ b/code/game/objects/transfer_valve.dm @@ -114,9 +114,6 @@ spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever toggle = 1 -/obj/item/device/transfer_valve/process() - return - /obj/item/device/transfer_valve/update_icon() overlays = null underlays = null