mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 13:05:44 +01:00
Singularity now wont leave floor under eaten walls.
Cryo wont spit out beaker. Fixed message "You don't have the dexterity to do this" for machinery. PIPES: - Heat exchange pipes are constructable now. - Insulated pipes also were added to pipe dispenser; - And meters too; - Easy pipe rotating in hands; - bent pipes actually looks bent under construction (may be glitches, please report); - pipes now wont cover wires; - pipes unwrenching now possible; - large vent pumps now uses power as equipment, not environment - pumps now uses power; Air alarm improvements: - all alarms in area controls all environment machines in area; - machines initializes itself automatically and without interloping with existing ones; - air alarms wont duplicates it air monitoring and can clear itself; Some other typos and small issues were fixed. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@816 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -38,18 +38,19 @@ 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
|
||||
use_power(5)
|
||||
|
||||
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
|
||||
|
||||
@@ -68,6 +69,7 @@ obj/machinery/atmospherics/binary/pump
|
||||
if(network2)
|
||||
network2.update = 1
|
||||
|
||||
use_power(round(air2.volume/12))
|
||||
return 1
|
||||
|
||||
//Radio remote control
|
||||
@@ -95,6 +97,22 @@ obj/machinery/atmospherics/binary/pump
|
||||
radio_connection.post_signal(src, signal)
|
||||
|
||||
return 1
|
||||
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>
|
||||
<a href='?src=\ref[src];out_press=-1000'><b>-</b></a>
|
||||
<a href='?src=\ref[src];out_press=-100'><b>-</b></a>
|
||||
<a href='?src=\ref[src];out_press=-10'><b>-</b></a>
|
||||
<a href='?src=\ref[src];out_press=-1'>-</a>
|
||||
[round(target_pressure,0.1)]kPa
|
||||
<a href='?src=\ref[src];out_press=1'>+</a>
|
||||
<a href='?src=\ref[src];out_press=10'><b>+</b></a>
|
||||
<a href='?src=\ref[src];out_press=100'><b>+</b></a>
|
||||
<a href='?src=\ref[src];out_press=1000'><b>+</b></a>
|
||||
"}
|
||||
|
||||
user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
|
||||
onclose(user, "atmo_pump")
|
||||
|
||||
var/frequency = 0
|
||||
var/id = null
|
||||
@@ -138,19 +156,7 @@ obj/machinery/atmospherics/binary/pump
|
||||
user << "\red Access denied."
|
||||
return
|
||||
usr.machine = src
|
||||
var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
|
||||
<b>Desirable output pressure: </b>
|
||||
<a href='?src=\ref[src];out_press=-100'><b>-</b></a>
|
||||
<a href='?src=\ref[src];out_press=-10'><b>-</b></a>
|
||||
<a href='?src=\ref[src];out_press=-1'>-</a>
|
||||
[round(target_pressure,0.1)]kPa
|
||||
<a href='?src=\ref[src];out_press=1'>+</a>
|
||||
<a href='?src=\ref[src];out_press=10'><b>+</b></a>
|
||||
<a href='?src=\ref[src];out_press=100'><b>+</b></a>
|
||||
"}
|
||||
|
||||
user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
|
||||
onclose(user, "atmo_pump")
|
||||
interact(user)
|
||||
return
|
||||
|
||||
Topic(href,href_list)
|
||||
@@ -158,6 +164,37 @@ obj/machinery/atmospherics/binary/pump
|
||||
on = !on
|
||||
if(href_list["out_press"])
|
||||
src.target_pressure = max(0, min(4500, src.target_pressure + text2num(href_list["out_press"])))
|
||||
usr.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, '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/weapon/pipe(loc, make_from=src)
|
||||
del(src)
|
||||
|
||||
Reference in New Issue
Block a user