cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pol-defaultparts

Browse Source
This commit is contained in:
Aronai Sieyes
2020-05-05 22:51:02 -04:00
committed by GitHub
parent 6fe3734158 f6a19efef0
commit b7aae34335
489 changed files with 6497 additions and 3842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/ATMOSPHERICS/components/unary/cold_sink.dm
View File

@@ -172,6 +172,6 @@
..()
/obj/machinery/atmospherics/unary/freezer/examine(mob/user)
..(user)
. = ..()
if(panel_open)
to_chat(user, "The maintenance hatch is open.")
. += "The maintenance hatch is open."

4
code/ATMOSPHERICS/components/unary/heat_source.dm
View File

@@ -159,6 +159,6 @@
..()
/obj/machinery/atmospherics/unary/heater/examine(mob/user)
..(user)
..()
if(panel_open)
to_chat(user, "The maintenance hatch is open.")
. += "The maintenance hatch is open."

2
code/ATMOSPHERICS/components/unary/outlet_injector.dm
View File

@@ -107,7 +107,7 @@
return 0
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.transmission_method = TRANSMISSION_RADIO //radio signal
signal.source = src
signal.data = list(

11
code/ATMOSPHERICS/components/unary/vent_pump.dm
View File

@@ -247,7 +247,7 @@
return 0
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.transmission_method = TRANSMISSION_RADIO //radio signal
signal.source = src
signal.data = list(
@@ -398,12 +398,13 @@
..()
/obj/machinery/atmospherics/unary/vent_pump/examine(mob/user)
if(..(user, 1))
to_chat(user, "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W")
. = ..()
if(Adjacent(user))
. += "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W"
else
to_chat(user, "You are too far away to read the gauge.")
. += "You are too far away to read the gauge."
if(welded)
to_chat(user, "It seems welded shut.")
. += "It seems welded shut."
/obj/machinery/atmospherics/unary/vent_pump/power_change()
var/old_stat = stat

9
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
View File

@@ -93,7 +93,7 @@
return 0
var/datum/signal/signal = new
signal.transmission_method = 1 //radio signal
signal.transmission_method = TRANSMISSION_RADIO //radio signal
signal.source = src
signal.data = list(
"area" = area_uid,
@@ -287,7 +287,8 @@
deconstruct()
/obj/machinery/atmospherics/unary/vent_scrubber/examine(mob/user)
if(..(user, 1))
to_chat(user, "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W")
. = ..()
if(Adjacent(user))
. += "A small gauge in the corner reads [round(last_flow_rate, 0.1)] L/s; [round(last_power_draw)] W"
else
to_chat(user, "You are too far away to read the gauge.")
. += "You are too far away to read the gauge."