cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb

Browse Source 
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
This commit is contained in:
bgobandit
2016-05-18 03:13:37 -04:00
parent eaf93e34cd 5c5e671c57
commit b94ce1968b
72 changed files with 3039 additions and 2958 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/gasmixtures/gas_types.dm
+4
View File
@@ -28,6 +28,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
var/name = ""
var/gas_overlay = "" //icon_state in icons/effects/tile_effects.dmi
var/moles_visible = null
var/dangerous_concentration = 0 // levels at which Bad Shit(tm) starts to happen
/datum/gas/oxygen
id = "o2"
@@ -43,6 +44,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
id = "co2"
specific_heat = 30
name = "Carbon Dioxide"
dangerous_concentration = 0.01
/datum/gas/plasma
id = "plasma"
@@ -50,6 +52,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
name = "Plasma"
gas_overlay = "plasma"
moles_visible = MOLES_PLASMA_VISIBLE
dangerous_concentration = 0.005
/datum/gas/nitrous_oxide
id = "n2o"
@@ -72,6 +75,7 @@ var/list/hardcoded_gases = list("o2","n2","co2","plasma") //the main four gases,
id = "bz"
specific_heat = 20
name = "BZ"
dangerous_concentration = 0.01
/obj/effect/overlay/gas/
icon = 'icons/effects/tile_effects.dmi'
code/modules/atmospherics/machinery/airalarm.dm
+3
View File
@@ -76,6 +76,7 @@
"co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
"plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"bz" = new/datum/tlv(-1, -1, 0.2, 0.5)
)
/obj/machinery/airalarm/server // No checks here.
@@ -87,6 +88,7 @@
"co2" = new/datum/tlv(-1, -1, -1, -1),
"plasma" = new/datum/tlv(-1, -1, -1, -1),
"n2o" = new/datum/tlv(-1, -1, -1, -1),
"bz" = new/datum/tlv(-1, -1, -1, -1),
)
/obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
@@ -98,6 +100,7 @@
"co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
"plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
"bz" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
)
//all air alarms in area are connected via magic
code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+1 -1
View File
@@ -161,7 +161,7 @@
user << "[src] seems empty."
/obj/machinery/atmospherics/components/unary/cryo_cell/MouseDrop_T(mob/target, mob/user)
if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target))
if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser())
return
close_machine(target)