cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

- one file's proc definitions standardized

Browse Source 
- added feedback logging for handcuff use

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3783 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-06-10 10:31:29 +00:00
parent cded9a8282
commit 0c96a0f8eb
2 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
code/ATMOSPHERICS/atmospherics.dm
View File

@@ -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
obj/machinery/atmospherics/update_icon()
return null

2
code/game/objects/items.dm
View File

@@ -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