Merge pull request #10 from skull132/development

Development

code/ATMOSPHERICS/components/valve.dm

@@ -171,7 +171,7 @@
 			break
 
 	build_network()
-	
+
 	update_icon()
 	update_underlays()
 
@@ -230,7 +230,7 @@
 	name = "digital valve"
 	desc = "A digitally controlled valve."
 	icon = 'icons/atmos/digital_valve.dmi'
-	
+
 	var/frequency = 0
 	var/id = null
 	var/datum/radio_frequency/radio_connection
@@ -245,6 +245,9 @@
 		user << "\red Access denied."
 		return
 	..()
+	message_admins("[src] [open?"<font color='red'>OPENED</font>":"<font color='green'>CLOSED</font>"] by [key_name(usr, usr.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)",0,1)
+	message_mods("[src] [open?"<font color='red'>OPENED</font>":"<font color='green'>CLOSED</font>"] by [key_name(usr, usr.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[usr]'>?</A>) in ([x],[y],[z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[x];Y=[y];Z=[z]'>JMP</a>)")
+	log_game("[src] [open?"<font color='red'>OPENED</font>":"<font color='green'>CLOSED</font>"] by [usr.ckey]([usr]) in ([x],[y],[z])")
 
 /obj/machinery/atmospherics/valve/digital/open
 	open = 1

code/modules/recycling/conveyor2.dm

@@ -6,7 +6,7 @@
 	icon_state = "conveyor0"
 	name = "conveyor belt"
 	desc = "A conveyor belt."
-	layer = 2			// so they appear under stuff
+	layer = 3			// so they appear under stuff
 	anchored = 1
 	var/operating = 0	// 1 if running forward, -1 if backwards, 0 if off
 	var/operable = 1	// true if can operate (no broken segments in this belt run)