Аккаунто_Апдейт

Author: x0MRk

Acceses.dm

@@ -23,7 +23,7 @@ Checked jobs: HoP, HoS, Security Officer, Doctor, CE, Detective, Scientist RD, C
     access_emergency_storage = 14 (HoP, CE, Atmos Tec) (Got name from Strumpet. Not used at all???)
     access_change_id = 15 (HoP)
     access_ai_facilities = 16 (HoP, CE)
-    access_teleporter = 17 (HoS, RD)
+    access_teleporter = 17 (HoS, RD, QM)
     access_eva = 18 (HoP, CE)
     access_heads_only = 19 (HoP, CE, RD, HoS)
     access_captain_only = 20
@@ -52,5 +52,5 @@ Checked jobs: HoP, HoS, Security Officer, Doctor, CE, Detective, Scientist RD, C
     access_hydroponics = 40 (Botanist)
     access_theater = 41 (Clown, Mime)
     access_HoSoffice = 42 (HoS)
-
+	access_mining = 43 (Shaft Miner, QM)
     */

READ ME.txt

@@ -0,0 +1,24 @@
+NSV Luna LG2 FP0
+�� ������ �����, ��� �������, ���� � ����� ��������� ����: http://forum.ss13.ru/index.php?showtopic=5767
+
+����� libmysql.dll � database.sql �� ������� ��� ������� �� ���, ��� ������������� ��� ���������� ������� ������������� ��������/���������.
+
+���� �� �������:
+1. ������ ����� � ����� http://www.denwer.ru/ .
+2. ������������� �����, ������������� � ��������� denwer. ��� denwer ������ ����������� ��������� ���������.
+3. ��������� � �������� http://localhost/Tools/phpMyAdmin/ .
+3.1 (���������� ���� ��������� ���������) ������ ������������ 80 ����� � ����� 7. ������ ����� ������� ������ W3SVC � ���������� �����. ������������� denwer. ��������� phpMyAdmin - ��������� � ������ 4 .
+4. ���� ������ - ������� ���� ������ luna .
+5. �������� �� luna � ������, ��������� �� ������� SQL.
+6. ���������� ���� ���������� database.sql � ������� ������ �������. ���� ��.
+7. ������� ���������, ������� admins, �������� ��������.
+8. � ���� ckey �������� �������� ������ ���������� �������, � rank ����� 6. ���� ��.
+9. � ����� config � ����� db_config.txt ����������� ����� ��������:
+DB_SERVER 127.0.0.1
+DB_USER root
+DB_PASSWORD
+DB_DBNAME luna
+DB_PORT 3306
+10. �������� ���� �, ��������, ��������� ��. ��� �� �����! ��� �����! �����! �������!
+
+�������, ������ ������ ��� �� �� - ��������. ������������ ������ ���-����� denwer ���� MySQL � phpMyAdmin - ����. �� ��� ������ ������. 

README.txt

@@ -46,7 +46,4 @@ obj/machinery/atmospherics
 			//		associated with reference pipe_network for use in rebuilding the networks gases list
 			// Is permitted to return null
 
-		disconnect(obj/machinery/atmospherics/reference)
-
-		update_icon()
-			return null
+		disconnect(obj/machinery/atmospherics/reference)

bs12.dme

@@ -12,8 +12,23 @@ Thus, the two variables affect pump operation are set in New():
 			but overall network volume is also increased as this increases...
 */
 
+
+/*
+Every cycle, the pump uses the air in air_in to try and make air_out the perfect pressure.
+
+node1, air1, network1 correspond to input
+node2, air2, network2 correspond to output
+
+Thus, the two variables affect pump operation are set in New():
+	air1.volume
+		This is the volume of gas available to the pump that may be transfered to the output
+	air2.volume
+		Higher quantities of this cause more air to be perfected later
+			but overall network volume is also increased as this increases...
+*/
+
 obj/machinery/atmospherics/binary/pump
-	icon = 'pump.dmi'
+	icon = 'icons/obj/atmospherics/pump.dmi'
 	icon_state = "intact_off"
 
 	name = "Gas pump"
@@ -22,12 +37,18 @@ obj/machinery/atmospherics/binary/pump
 	var/on = 0
 	var/target_pressure = ONE_ATMOSPHERE
 
-	attack_hand(mob/user)
-		on = !on
-		update_icon()
+	var/frequency = 0
+	var/id = null
+	var/datum/radio_frequency/radio_connection
+
+	on
+		on = 1
+		icon_state = "intact_on"
 
 	update_icon()
-		if(node1&&node2)
+		if(stat & NOPOWER)
+			icon_state = "intact_off"
+		else if(node1 && node2)
 			icon_state = "intact_[on?("on"):("off")]"
 		else
 			if(node1)
@@ -36,18 +57,18 @@ obj/machinery/atmospherics/binary/pump
 				icon_state = "exposed_2_off"
 			else
 				icon_state = "exposed_3_off"
-			on = 0
-
 		return
 
 	process()
-		..()
+//		..()
+		if(stat & (NOPOWER|BROKEN))
+			return
 		if(!on)
 			return 0
 
 		var/output_starting_pressure = air2.return_pressure()
 
-		if(output_starting_pressure >= target_pressure)
+		if( (target_pressure - output_starting_pressure) < 0.01)
 			//No need to pump gas if target is already reached!
 			return 1
 
@@ -75,7 +96,7 @@ obj/machinery/atmospherics/binary/pump
 			radio_controller.remove_object(src, frequency)
 			frequency = new_frequency
 			if(frequency)
-				radio_connection = radio_controller.add_object(src, frequency)
+				radio_connection = radio_controller.add_object(src, frequency, filter = RADIO_ATMOSIA)
 
 		broadcast_status()
 			if(!radio_connection)
@@ -85,44 +106,109 @@ obj/machinery/atmospherics/binary/pump
 			signal.transmission_method = 1 //radio signal
 			signal.source = src
 
-			signal.data["tag"] = id
-			signal.data["device"] = "AGP"
-			signal.data["power"] = on
-			signal.data["target_output"] = target_pressure
+			signal.data = list(
+				"tag" = id,
+				"device" = "AGP",
+				"power" = on,
+				"target_output" = target_pressure,
+				"sigtype" = "status"
+			)
 
-			radio_connection.post_signal(src, signal)
+			radio_connection.post_signal(src, signal, filter = RADIO_ATMOSIA)
 
 			return 1
 
-	var/frequency = 0
-	var/id = null
-	var/datum/radio_frequency/radio_connection
+	interact(mob/user as mob)
+		var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
+					<b>Desirable output pressure: </b>
+					[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
+					"}
+
+		user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
+		onclose(user, "atmo_pump")
 
 	initialize()
 		..()
 		if(frequency)
 			set_frequency(frequency)
 
 	receive_signal(datum/signal/signal)
-		if(signal.data["tag"] && (signal.data["tag"] != id))
+		if(!signal.data["tag"] || (signal.data["tag"] != id) || (signal.data["sigtype"]!="command"))
 			return 0
 
-		switch(signal.data["command"])
-			if("power_on")
-				on = 1
+		if("power" in signal.data)
+			on = text2num(signal.data["power"])
 
-			if("power_off")
-				on = 0
+		if("power_toggle" in signal.data)
+			on = !on
 
-			if("power_toggle")
-				on = !on
+		if("set_output_pressure" in signal.data)
+			target_pressure = between(
+				0,
+				text2num(signal.data["set_output_pressure"]),
+				ONE_ATMOSPHERE*50
+			)
 
-			if("set_output_pressure")
-				var/number = text2num(signal.data["parameter"])
-				number = min(max(number, 0), ONE_ATMOSPHERE*50)
+		if("status" in signal.data)
+			spawn(2)
+				broadcast_status()
+			return //do not update_icon
 
-				target_pressure = number
+		spawn(2)
+			broadcast_status()
+		update_icon()
+		return
 
-		if(signal.data["tag"])
-			spawn(5 * tick_multiplier) broadcast_status()
-		update_icon()
+
+	attack_hand(user as mob)
+		if(..())
+			return
+		src.add_fingerprint(usr)
+		if(!src.allowed(user))
+			user << "\red Access denied."
+			return
+		usr.set_machine(src)
+		interact(user)
+		return
+
+	Topic(href,href_list)
+		if(..()) return
+		if(href_list["power"])
+			on = !on
+		if(href_list["set_press"])
+			var/new_pressure = input(usr,"Enter new output pressure (0-4500kPa)","Pressure control",src.target_pressure) as num
+			src.target_pressure = max(0, min(4500, new_pressure))
+		usr.set_machine(src)
+		src.update_icon()
+		src.updateUsrDialog()
+		return
+
+	power_change()
+		..()
+		update_icon()
+
+/*	attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
+		if (!istype(W, /obj/item/weapon/wrench))
+			return ..()
+		if (!(stat & NOPOWER) && on)
+			user << "\red You cannot unwrench this [src], turn it off first."
+			return 1
+		var/turf/T = src.loc
+		if (level==1 && isturf(T) && T.intact)
+			user << "\red You must remove the plating first."
+			return 1
+		var/datum/gas_mixture/int_air = return_air()
+		var/datum/gas_mixture/env_air = loc.return_air()
+		if ((int_air.return_pressure()-env_air.return_pressure()) > 2*ONE_ATMOSPHERE)
+			user << "\red You cannot unwrench this [src], it too exerted due to internal pressure."
+			add_fingerprint(user)
+			return 1
+		playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1)
+		user << "\blue You begin to unfasten \the [src]..."
+		if (do_after(user, 40))
+			user.visible_message( \
+				"[user] unfastens \the [src].", \
+				"\blue You have unfastened \the [src].", \
+				"You hear ratchet.")
+			new /obj/item/pipe(loc, make_from=src)
+			del(src)*/