From 0c96a0f8eb8a19218af490745c63e9a1569162c5 Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Sun, 10 Jun 2012 10:31:29 +0000 Subject: [PATCH] - one file's proc definitions standardized - added feedback logging for handcuff use git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3783 316c924e-a436-60f5-8080-3fe189b3f50e --- code/ATMOSPHERICS/atmospherics.dm | 51 +++++++++++++++---------------- code/game/objects/items.dm | 2 ++ 2 files changed, 27 insertions(+), 26 deletions(-) diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index fca51ad7ce..d745a48d89 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -20,40 +20,39 @@ obj/machinery/atmospherics - var/initialize_directions = 0 - var/color +obj/machinery/atmospherics/var/initialize_directions = 0 +obj/machinery/atmospherics/var/color - process() - build_network() +obj/machinery/atmospherics/process() + build_network() - proc - network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference) - // Check to see if should be added to network. Add self if so and adjust variables appropriately. - // Note don't forget to have neighbors look as well! +obj/machinery/atmospherics/proc/network_expand(datum/pipe_network/new_network, obj/machinery/atmospherics/pipe/reference) + // Check to see if should be added to network. Add self if so and adjust variables appropriately. + // Note don't forget to have neighbors look as well! - return null + return null - build_network() - // Called to build a network from this node +obj/machinery/atmospherics/proc/build_network() + // Called to build a network from this node - return null + return null - return_network(obj/machinery/atmospherics/reference) - // Returns pipe_network associated with connection to reference - // Notes: should create network if necessary - // Should never return null +obj/machinery/atmospherics/proc/return_network(obj/machinery/atmospherics/reference) + // Returns pipe_network associated with connection to reference + // Notes: should create network if necessary + // Should never return null - return null + return null - reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network) - // Used when two pipe_networks are combining +obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network) + // Used when two pipe_networks are combining - return_network_air(datum/network/reference) - // Return a list of gas_mixture(s) in the object - // associated with reference pipe_network for use in rebuilding the networks gases list - // Is permitted to return null +obj/machinery/atmospherics/proc/return_network_air(datum/network/reference) + // Return a list of gas_mixture(s) in the object + // associated with reference pipe_network for use in rebuilding the networks gases list + // Is permitted to return null - disconnect(obj/machinery/atmospherics/reference) +obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) - update_icon() - return null \ No newline at end of file +obj/machinery/atmospherics/update_icon() + return null \ No newline at end of file diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 1de1ed8a88..ea0f266028 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -63,8 +63,10 @@ M.requests += O spawn( 0 ) if(istype(src, /obj/item/weapon/handcuffs/cable)) + feedback_add_details("handcuffs","C") playsound(src.loc, 'cablecuff.ogg', 30, 1, -2) else + feedback_add_details("handcuffs","H") playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) O.process() return