cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup global.dm and setup.dm, fix typos in the other files

Browse Source 
`code/setup.dm`:
	Fixed large amounts of indenting.
	Fixed large numbers of comments and their clarity.
	Added parentheses to macros using expressions.
	Added FIXME for unused duplicated macros, without certainty of their requirement.
	Removed some duplicate macros present. (`BRUTE`, `BURN`, etc.)
	Removed macro `PI`, and replaced instances of its use with `var/const/Pi` from `maths.dm`

`code/global.dm`:
	Fixed large amounts of indenting, added newlines to long single-lined list definitions.
	Slightly clarified comments.
This commit is contained in:
Zulker Nayeen Nahiyan
2015-01-10 01:48:56 +06:00
parent 6e550d7308
commit b6ab0b64c0
20 changed files with 803 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
code/ATMOSPHERICS/_atmospherics_helpers.dm
View File

@@ -26,7 +26,7 @@
//transfer_moles - Limits the amount of moles to transfer. The actual amount of gas moved may also be limited by available_power, if given. //transfer_moles - Limits the amount of moles to transfer. The actual amount of gas moved may also be limited by available_power, if given.
//available_power - the maximum amount of power that may be used when moving gas. If null then the transfer is not limited by power. //available_power - the maximum amount of power that may be used when moving gas. If null then the transfer is not limited by power.
/proc/pump_gas(var/obj/machinery/M, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null, var/available_power = null) /proc/pump_gas(var/obj/machinery/M, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/transfer_moles = null, var/available_power = null)
if (source.total_moles < MINUMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing if (source.total_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//var/source_moles_initial = source.total_moles //var/source_moles_initial = source.total_moles
@@ -41,7 +41,7 @@
if (!isnull(available_power) && specific_power > 0) if (!isnull(available_power) && specific_power > 0)
transfer_moles = min(transfer_moles, available_power / specific_power) transfer_moles = min(transfer_moles, available_power / specific_power)
if (transfer_moles < MINUMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing if (transfer_moles < MINIMUM_MOLES_TO_PUMP) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//Update flow rate meter //Update flow rate meter
@@ -75,7 +75,7 @@
//total_transfer_moles - Limits the amount of moles to scrub. The actual amount of gas scrubbed may also be limited by available_power, if given. //total_transfer_moles - Limits the amount of moles to scrub. The actual amount of gas scrubbed may also be limited by available_power, if given.
//available_power - the maximum amount of power that may be used when scrubbing gas. If null then the scrubbing is not limited by power. //available_power - the maximum amount of power that may be used when scrubbing gas. If null then the scrubbing is not limited by power.
/proc/scrub_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null) /proc/scrub_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink, var/total_transfer_moles = null, var/available_power = null)
if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
@@ -84,14 +84,14 @@
var/total_filterable_moles = 0 //the total amount of filterable gas var/total_filterable_moles = 0 //the total amount of filterable gas
var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
for (var/g in filtering) for (var/g in filtering)
if (source.gas[g] < MINUMUM_MOLES_TO_FILTER) if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
continue continue
var/specific_power = calculate_specific_power_gas(g, source, sink)/ATMOS_FILTER_EFFICIENCY var/specific_power = calculate_specific_power_gas(g, source, sink)/ATMOS_FILTER_EFFICIENCY
specific_power_gas[g] = specific_power specific_power_gas[g] = specific_power
total_filterable_moles += source.gas[g] total_filterable_moles += source.gas[g]
if (total_filterable_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_filterable_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//now that we know the total amount of filterable gas, we can calculate the amount of power needed to scrub one mole of gas //now that we know the total amount of filterable gas, we can calculate the amount of power needed to scrub one mole of gas
@@ -110,7 +110,7 @@
if (!isnull(available_power) && total_specific_power > 0) if (!isnull(available_power) && total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power) total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
if (total_transfer_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//Update flow rate var //Update flow rate var
@@ -146,7 +146,7 @@
//total_transfer_moles - Limits the amount of moles to input. The actual amount of gas filtered may also be limited by available_power, if given. //total_transfer_moles - Limits the amount of moles to input. The actual amount of gas filtered may also be limited by available_power, if given.
//available_power - the maximum amount of power that may be used when filtering gas. If null then the filtering is not limited by power. //available_power - the maximum amount of power that may be used when filtering gas. If null then the filtering is not limited by power.
/proc/filter_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_filtered, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null) /proc/filter_gas(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_filtered, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
@@ -156,7 +156,7 @@
var/total_unfilterable_moles = 0 //the total amount of non-filterable gas var/total_unfilterable_moles = 0 //the total amount of non-filterable gas
var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
for (var/g in source.gas) for (var/g in source.gas)
if (source.gas[g] < MINUMUM_MOLES_TO_FILTER) if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
continue continue
if (g in filtering) if (g in filtering)
@@ -179,7 +179,7 @@
if (!isnull(available_power) && total_specific_power > 0) if (!isnull(available_power) && total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power) total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
if (total_transfer_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//Update flow rate var //Update flow rate var
@@ -218,7 +218,7 @@
//I don't like the copypasta, but I decided to keep both versions of gas filtering as filter_gas is slightly faster (doesn't create as many temporary lists, doesn't call update_values() as much) //I don't like the copypasta, but I decided to keep both versions of gas filtering as filter_gas is slightly faster (doesn't create as many temporary lists, doesn't call update_values() as much)
//filter_gas can be removed and replaced with this proc if need be. //filter_gas can be removed and replaced with this proc if need be.
/proc/filter_gas_multi(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null) /proc/filter_gas_multi(var/obj/machinery/M, var/list/filtering, var/datum/gas_mixture/source, var/datum/gas_mixture/sink_clean, var/total_transfer_moles = null, var/available_power = null)
if (source.total_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (source.total_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &= filtering = filtering & source.gas //only filter gasses that are actually there. DO NOT USE &=
@@ -228,7 +228,7 @@
var/total_unfilterable_moles = 0 //the total amount of non-filterable gas var/total_unfilterable_moles = 0 //the total amount of non-filterable gas
var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type var/list/specific_power_gas = list() //the power required to remove one mole of pure gas, for each gas type
for (var/g in source.gas) for (var/g in source.gas)
if (source.gas[g] < MINUMUM_MOLES_TO_FILTER) if (source.gas[g] < MINIMUM_MOLES_TO_FILTER)
continue continue
if (g in filtering) if (g in filtering)
@@ -252,7 +252,7 @@
if (!isnull(available_power) && total_specific_power > 0) if (!isnull(available_power) && total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power) total_transfer_moles = min(total_transfer_moles, available_power/total_specific_power)
if (total_transfer_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//Update Flow Rate var //Update Flow Rate var
@@ -304,7 +304,7 @@
var/total_input_moles = 0 //for flow rate calculation var/total_input_moles = 0 //for flow rate calculation
var/list/source_specific_power = list() var/list/source_specific_power = list()
for (var/datum/gas_mixture/source in mix_sources) for (var/datum/gas_mixture/source in mix_sources)
if (source.total_moles < MINUMUM_MOLES_TO_FILTER) if (source.total_moles < MINIMUM_MOLES_TO_FILTER)
return -1 //either mix at the set ratios or mix no gas at all return -1 //either mix at the set ratios or mix no gas at all
var/mix_ratio = mix_sources[source] var/mix_ratio = mix_sources[source]
@@ -321,7 +321,7 @@
total_input_volume += source.volume total_input_volume += source.volume
total_input_moles += source.total_moles total_input_moles += source.total_moles
if (total_mixing_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_mixing_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
if (isnull(total_transfer_moles)) if (isnull(total_transfer_moles))
@@ -333,7 +333,7 @@
if (!isnull(available_power) && total_specific_power > 0) if (!isnull(available_power) && total_specific_power > 0)
total_transfer_moles = min(total_transfer_moles, available_power / total_specific_power) total_transfer_moles = min(total_transfer_moles, available_power / total_specific_power)
if (total_transfer_moles < MINUMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing if (total_transfer_moles < MINIMUM_MOLES_TO_FILTER) //if we cant transfer enough gas just stop to avoid further processing
return -1 return -1
//Update flow rate var //Update flow rate var

2
code/ATMOSPHERICS/components/omni_devices/filter.dm
View File

@@ -68,7 +68,7 @@
var/transfer_moles = (set_flow_rate/input_air.volume)*input_air.total_moles var/transfer_moles = (set_flow_rate/input_air.volume)*input_air.total_moles
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINIMUM_MOLES_TO_FILTER)
power_draw = filter_gas_multi(src, filtering_outputs, input_air, output_air, transfer_moles, power_rating) power_draw = filter_gas_multi(src, filtering_outputs, input_air, output_air, transfer_moles, power_rating)
if (power_draw >= 0) if (power_draw >= 0)

2
code/ATMOSPHERICS/components/omni_devices/mixer.dm
View File

@@ -107,7 +107,7 @@
transfer_moles += (set_flow_rate*P.concentration/P.air.volume)*P.air.total_moles transfer_moles += (set_flow_rate*P.concentration/P.air.volume)*P.air.total_moles
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINIMUM_MOLES_TO_FILTER)
power_draw = mix_gas(src, mixing_inputs, output.air, transfer_moles, power_rating) power_draw = mix_gas(src, mixing_inputs, output.air, transfer_moles, power_rating)
if (power_draw >= 0) if (power_draw >= 0)

2
code/ATMOSPHERICS/components/trinary_devices/filter.dm
View File

@@ -109,7 +109,7 @@
var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles var/transfer_moles = (set_flow_rate/air1.volume)*air1.total_moles
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINIMUM_MOLES_TO_FILTER)
power_draw = filter_gas(src, filtered_out, air1, air2, air3, transfer_moles, power_rating) power_draw = filter_gas(src, filtered_out, air1, air2, air3, transfer_moles, power_rating)
if(network2) if(network2)

2
code/ATMOSPHERICS/components/trinary_devices/mixer.dm
View File

@@ -85,7 +85,7 @@
var/transfer_moles = (set_flow_rate*mixing_inputs[air1]/air1.volume)*air1.total_moles + (set_flow_rate*mixing_inputs[air1]/air2.volume)*air2.total_moles var/transfer_moles = (set_flow_rate*mixing_inputs[air1]/air1.volume)*air1.total_moles + (set_flow_rate*mixing_inputs[air1]/air2.volume)*air2.total_moles
var/power_draw = -1 var/power_draw = -1
if (transfer_moles > MINUMUM_MOLES_TO_FILTER) if (transfer_moles > MINIMUM_MOLES_TO_FILTER)
power_draw = mix_gas(src, mixing_inputs, air3, transfer_moles, power_rating) power_draw = mix_gas(src, mixing_inputs, air3, transfer_moles, power_rating)
if(network1 && mixing_inputs[air1]) if(network1 && mixing_inputs[air1])

4
code/WorkInProgress/Cael_Aislinn/Rust/core_field.dm
View File

@@ -111,7 +111,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
//init values //init values
major_radius = field_strength * 0.21875// max = 8.75 major_radius = field_strength * 0.21875// max = 8.75
minor_radius = field_strength * 0.2125// max = 8.625 minor_radius = field_strength * 0.2125// max = 8.625
volume_covered = PI * major_radius * minor_radius * 2.5 * 2.5 * 1000 volume_covered = Pi * major_radius * minor_radius * 2.5 * 2.5 * 1000
processing_objects.Add(src) processing_objects.Add(src)
@@ -131,7 +131,7 @@ Deuterium-tritium fusion: 4.5 x 10^7 K
var/transfer_ratio = field_strength / 50 //higher field strength will result in faster phoron aggregation var/transfer_ratio = field_strength / 50 //higher field strength will result in faster phoron aggregation
major_radius = field_strength * 0.21875// max = 8.75m major_radius = field_strength * 0.21875// max = 8.75m
minor_radius = field_strength * 0.2125// max = 8.625m minor_radius = field_strength * 0.2125// max = 8.625m
volume_covered = PI * major_radius * minor_radius * 2.5 * 2.5 * 2.5 * 7 * 7 * transfer_ratio //one tile = 2.5m*2.5m*2.5m volume_covered = Pi * major_radius * minor_radius * 2.5 * 2.5 * 2.5 * 7 * 7 * transfer_ratio //one tile = 2.5m*2.5m*2.5m
//add phoron from the surrounding environment //add phoron from the surrounding environment
var/datum/gas_mixture/environment = loc.return_air() var/datum/gas_mixture/environment = loc.return_air()

2
code/game/objects/effects/chemsmoke.dm
View File

@@ -165,7 +165,7 @@
continue continue
var/offset = 0 var/offset = 0
var/points = round((radius * 2 * PI) / arcLength) var/points = round((radius * 2 * Pi) / arcLength)
var/angle = round(ToDegrees(arcLength / radius), 1) var/angle = round(ToDegrees(arcLength / radius), 1)
if(!IsInteger(radius)) if(!IsInteger(radius))

318
code/global.dm
View File

@@ -1,204 +1,205 @@
//#define TESTING //#define TESTING
//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:31
//items that ask to be called every cycle // Items that ask to be called every cycle.
var/global/obj/effect/datacore/data_core = null var/global/obj/effect/datacore/data_core = null
var/global/list/all_areas = list() var/global/list/all_areas = list()
var/global/list/machines = list() var/global/list/machines = list()
var/global/list/processing_objects = list() var/global/list/processing_objects = list()
var/global/list/active_diseases = list() var/global/list/active_diseases = list()
var/global/list/med_hud_users = list() //list of all entities using a medical HUD. var/global/list/med_hud_users = list() // List of all entities using a medical HUD.
var/global/list/sec_hud_users = list() //list of all entities using a security HUD. var/global/list/sec_hud_users = list() // List of all entities using a security HUD.
//Those networks can only be accessed by preexisting terminals. AIs and new terminals can't use them. // Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them.
var/list/restricted_camera_networks = list("thunder","ERT","NUKE") var/list/restricted_camera_networks = list("thunder","ERT","NUKE")
var/global/list/global_mutations = list() // list of hidden mutation things var/global/list/global_mutations = list() // List of hidden mutation things.
var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manually after an event.
var/global/defer_powernet_rebuild = 0 // true if net rebuild will be called manually after an event // The resulting sector map looks like:
// ___ ___
// | 1 | 4 |
// ---+---
// | 5 | 3 |
// --- ---
//
// 1: SS13.
// 4: Derelict.
// 3: AI satellite.
// 5: Empty space.
var/global/list/global_map = null var/global/list/global_map = null
//list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. //var/global/list/global_map = list(list(1,5),list(4,3))
//Resulting sector map looks like
//|_1_|_4_|
//|_5_|_3_|
//
//1 - SS13
//4 - Derelict
//3 - AI satellite
//5 - empty space
//////////////
//Noises made when hit while typing. // Noises made when hit while typing.
var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF")
var/list/paper_tag_whitelist = list("center","p","div","span","h1","h2","h3","h4","h5","h6","hr","pre", \ var/list/paper_tag_whitelist = list(
"big","small","font","i","u","b","s","sub","sup","tt","br","hr","ol","ul","li","caption","col", \ "center", "p", "div", "span", "pre", "h1", "h2", "h3", "h4", "h5", "h6", "br", "hr",
"table","td","th","tr") "big", "small", "font", "i", "u", "b", "s", "sub", "sup", "tt", "ol", "ul", "li",
var/list/paper_blacklist = list("java","onblur","onchange","onclick","ondblclick","onfocus","onkeydown", \ "caption", "col", "table", "td", "th", "tr"
"onkeypress","onkeyup","onload","onmousedown","onmousemove","onmouseout","onmouseover", \ )
"onmouseup","onreset","onselect","onsubmit","onunload") var/list/paper_blacklist = list(
"java", "onblur", "onchange", "onclick", "ondblclick", "onselect", "onfocus",
"onsubmit", "onreset", "onload", "onunload", "onkeydown", "onkeyup", "onkeypress",
"onmousedown", "onmouseup", "onmousemove", "onmouseout", "onmouseover",
)
// The way blocks are handled badly needs a rewrite, this is horrible. // The way blocks are handled badly needs a rewrite, this is horrible.
// Too much of a project to handle at the moment, TODO for later. // Too much of a project to handle at the moment, TODO for later.
var/BLINDBLOCK = 0 var/BLINDBLOCK = 0
var/DEAFBLOCK = 0 var/DEAFBLOCK = 0
var/HULKBLOCK = 0 var/HULKBLOCK = 0
var/TELEBLOCK = 0 var/TELEBLOCK = 0
var/FIREBLOCK = 0 var/FIREBLOCK = 0
var/XRAYBLOCK = 0 var/XRAYBLOCK = 0
var/CLUMSYBLOCK = 0 var/CLUMSYBLOCK = 0
var/FAKEBLOCK = 0 var/FAKEBLOCK = 0
var/COUGHBLOCK = 0 var/COUGHBLOCK = 0
var/GLASSESBLOCK = 0 var/GLASSESBLOCK = 0
var/EPILEPSYBLOCK = 0 var/EPILEPSYBLOCK = 0
var/TWITCHBLOCK = 0 var/TWITCHBLOCK = 0
var/NERVOUSBLOCK = 0 var/NERVOUSBLOCK = 0
var/MONKEYBLOCK = 27 var/MONKEYBLOCK = 27
var/BLOCKADD = 0 var/BLOCKADD = 0
var/DIFFMUT = 0 var/DIFFMUT = 0
var/HEADACHEBLOCK = 0 var/HEADACHEBLOCK = 0
var/NOBREATHBLOCK = 0 var/NOBREATHBLOCK = 0
var/REMOTEVIEWBLOCK = 0 var/REMOTEVIEWBLOCK = 0
var/REGENERATEBLOCK = 0 var/REGENERATEBLOCK = 0
var/INCREASERUNBLOCK = 0 var/INCREASERUNBLOCK = 0
var/REMOTETALKBLOCK = 0 var/REMOTETALKBLOCK = 0
var/MORPHBLOCK = 0 var/MORPHBLOCK = 0
var/BLENDBLOCK = 0 var/BLENDBLOCK = 0
var/HALLUCINATIONBLOCK = 0 var/HALLUCINATIONBLOCK = 0
var/NOPRINTSBLOCK = 0 var/NOPRINTSBLOCK = 0
var/SHOCKIMMUNITYBLOCK = 0 var/SHOCKIMMUNITYBLOCK = 0
var/SMALLSIZEBLOCK = 0 var/SMALLSIZEBLOCK = 0
var/skipupdate = 0 var/skipupdate = 0
///////////////
var/eventchance = 10 //% per 5 mins
var/event = 0
var/hadevent = 0
var/blobevent = 0
///////////////
var/diary = null var/eventchance = 10 // Percent chance per 5 minutes.
var/href_logfile = null var/event = 0
var/station_name = "NSS Exodus" var/hadevent = 0
var/game_version = "Baystation12" var/blobevent = 0
var/diary = null
var/href_logfile = null
var/station_name = "NSS Exodus"
var/game_version = "Baystation12"
var/changelog_hash = "" var/changelog_hash = ""
var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544)
var/going = 1.0 var/going = 1.0
var/master_mode = "extended"//"extended" var/master_mode = "extended" // "extended"
var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode.
var/host = null var/host = null
var/shuttle_frozen = 0 var/shuttle_frozen = 0
var/shuttle_left = 0 var/shuttle_left = 0
var/shuttlecoming = 0
var/list/jobMax = list() var/list/jobMax = list()
var/list/bombers = list( ) var/list/bombers = list()
var/list/admin_log = list ( ) var/list/admin_log = list()
var/list/lastsignalers = list( ) //keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" var/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]"
var/list/lawchanges = list( ) //Stores who uploaded laws to which silicon-based lifeform, and what the law was var/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was.
var/list/reg_dna = list( ) var/list/reg_dna = list()
// list/traitobj = list( ) //var/list/traitobj = list()
var/mouse_respawn_time = 5 //Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. var/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes.
var/CELLRATE = 0.002 // multiplier for watts per tick <> cell storage (eg: 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) var/CELLRATE = 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second)
//It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided
var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second) var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second)
var/shuttle_z = 2 //default var/shuttle_z = 2 // Default.
var/airtunnel_start = 68 // default var/airtunnel_start = 68 // Default.
var/airtunnel_stop = 68 // default var/airtunnel_stop = 68 // Default.
var/airtunnel_bottom = 72 // default var/airtunnel_bottom = 72 // Default.
var/list/monkeystart = list()
var/list/wizardstart = list() var/list/monkeystart = list()
var/list/wizardstart = list()
var/list/newplayer_start = list() var/list/newplayer_start = list()
//Spawnpoints. //Spawnpoints.
var/list/latejoin = list() var/list/latejoin = list()
var/list/latejoin_gateway = list() var/list/latejoin_gateway = list()
var/list/latejoin_cryo = list() var/list/latejoin_cryo = list()
var/list/latejoin_cyborg = list() var/list/latejoin_cyborg = list()
var/list/prisonwarp = list() //prisoners go to these var/list/prisonwarp = list() // Prisoners go to these
var/list/holdingfacility = list() //captured people go here var/list/holdingfacility = list() // Captured people go here
var/list/xeno_spawn = list()//Aliens spawn at ahahthese. var/list/xeno_spawn = list() // Aliens spawn at at these.
// list/mazewarp = list() //var/list/mazewarp = list()
var/list/tdome1 = list() var/list/tdome1 = list()
var/list/tdome2 = list() var/list/tdome2 = list()
var/list/tdomeobserve = list() var/list/tdomeobserve = list()
var/list/tdomeadmin = list() var/list/tdomeadmin = list()
var/list/prisonsecuritywarp = list() //prison security goes to these var/list/prisonsecuritywarp = list() // Prison security goes to these.
var/list/prisonwarped = list() //list of players already warped var/list/prisonwarped = list() // List of players already warped.
var/list/blobstart = list() var/list/blobstart = list()
var/list/ninjastart = list() var/list/ninjastart = list()
// list/traitors = list() //traitor list //var/list/traitors = list() // Traitor list.
var/list/cardinal = list( NORTH, SOUTH, EAST, WEST )
var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) var/list/cardinal = list(NORTH, SOUTH, EAST, WEST)
// reverse_dir[dir] = reverse of dir var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
var/list/reverse_dir = list(2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42, 41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21, 23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63) var/list/reverse_dir = list( // reverse_dir[dir] = reverse of dir
2, 1, 3, 8, 10, 9, 11, 4, 6, 5, 7, 12, 14, 13, 15, 32, 34, 33, 35, 40, 42,
41, 43, 36, 38, 37, 39, 44, 46, 45, 47, 16, 18, 17, 19, 24, 26, 25, 27, 20, 22, 21,
23, 28, 30, 29, 31, 48, 50, 49, 51, 56, 58, 57, 59, 52, 54, 53, 55, 60, 62, 61, 63
)
var/datum/station_state/start_state = null var/datum/station_state/start_state = null
var/datum/configuration/config = null var/datum/configuration/config = null
var/datum/sun/sun = null var/datum/sun/sun = null
var/list/combatlog = list() var/list/combatlog = list()
var/list/IClog = list() var/list/IClog = list()
var/list/OOClog = list() var/list/OOClog = list()
var/list/adminlog = list() var/list/adminlog = list()
var/list/powernets = list() var/list/powernets = list()
var/Debug = 0 // global debug switch var/Debug = 0 // Global debug switch.
var/Debug2 = 0 var/Debug2 = 0
var/datum/debug/debugobj var/datum/debug/debugobj
var/datum/moduletypes/mods = new() var/datum/moduletypes/mods = new()
var/wavesecret = 0 var/wavesecret = 0
var/gravity_is_on = 1 var/gravity_is_on = 1
var/shuttlecoming = 0
var/join_motd = null var/join_motd = null
var/forceblob = 0 var/forceblob = 0
// nanomanager, the manager for Nano UIs var/datum/nanomanager/nanomanager = new() // NanoManager, the manager for Nano UIs.
var/datum/nanomanager/nanomanager = new() var/datum/event_manager/event_manager = new() // Event Manager, the manager for events.
// event manager, the manager for events var/list/awaydestinations = list() // Away missions. A list of landmarks that the warpgate can take you to.
var/datum/event_manager/event_manager = new()
//away missions
var/list/awaydestinations = list() //a list of landmarks that the warpgate can take you to
// MySQL configuration // MySQL configuration
var/sqladdress = "localhost" var/sqladdress = "localhost"
var/sqlport = "3306" var/sqlport = "3306"
var/sqldb = "tgstation" var/sqldb = "tgstation"
var/sqllogin = "root" var/sqllogin = "root"
var/sqlpass = "" var/sqlpass = ""
// Feedback gathering sql connection // Feedback gathering sql connection
var/sqlfdbkdb = "test" var/sqlfdbkdb = "test"
var/sqlfdbklogin = "root" var/sqlfdbklogin = "root"
var/sqlfdbkpass = "" var/sqlfdbkpass = ""
var/sqllogging = 0 // Should we log deaths, population stats, etc? var/sqllogging = 0 // Should we log deaths, population stats, etc.?
// Forum MySQL configuration (for use with forum account/key authentication) // Forum MySQL configuration. (for use with forum account/key authentication)
// These are all default values that will load should the forumdbconfig.txt // These are all default values that will load should the forumdbconfig.txt file fail to read for whatever reason.
// file fail to read for whatever reason.
var/forumsqladdress = "localhost" var/forumsqladdress = "localhost"
var/forumsqlport = "3306" var/forumsqlport = "3306"
var/forumsqldb = "tgstation" var/forumsqldb = "tgstation"
var/forumsqllogin = "root" var/forumsqllogin = "root"
var/forumsqlpass = "" var/forumsqlpass = ""
var/forum_activated_group = "2" var/forum_activated_group = "2"
var/forum_authenticated_group = "10" var/forum_authenticated_group = "10"
// For FTP requests. (i.e. downloading runtime logs.) // For FTP requests. (i.e. downloading runtime logs.)
@@ -206,28 +207,49 @@ var/forum_authenticated_group = "10"
var/fileaccess_timer = 0 var/fileaccess_timer = 0
var/custom_event_msg = null var/custom_event_msg = null
//Database connections // Database connections. A connection is established on world creation.
//A connection is established on world creation. Ideally, the connection dies when the server restarts (After feedback logging.). // Ideally, the connection dies when the server restarts (After feedback logging.).
var/DBConnection/dbcon = new() //Feedback database (New database) var/DBConnection/dbcon = new() // Feedback database (New database)
var/DBConnection/dbcon_old = new() //Tgstation database (Old database) - See the files in the SQL folder for information what goes where. var/DBConnection/dbcon_old = new() // /tg/station database (Old database) -- see the files in the SQL folder for information on what goes where.
// Reference list for disposal sort junctions. Filled up by sorting junction's New() // Reference list for disposal sort junctions. Filled up by sorting junction's New()
/var/list/tagger_locations = list() /var/list/tagger_locations = list()
//added for Xenoarchaeology, might be useful for other stuff // Added for Xenoarchaeology, might be useful for other stuff.
var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z") var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z")
// Chemistry lists. // Chemistry lists.
var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") //increase heart rate var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate.
var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") //decrease heart rate var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") // Decrease heart rate.
var/list/heartstopper = list("potassium_phorochloride", "zombie_powder") //this stops the heart var/list/heartstopper = list("potassium_phorochloride", "zombie_powder") // This stops the heart.
var/list/cheartstopper = list("potassium_chloride") //this stops the heart when overdose is met -- c = conditional var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional
//Used by robots and robot preferences. // Used by robots and robot preferences.
var/list/robot_module_types = list("Standard", "Engineering", "Construction", "Surgeon", "Crisis", "Miner", "Janitor", "Service", "Clerical", "Security") var/list/robot_module_types = list(
"Standard", "Engineering", "Construction", "Surgeon", "Crisis",
"Miner", "Janitor", "Service", "Clerical", "Security"
)
// Some scary sounds. // Some scary sounds.
var/static/list/scarySounds = list('sound/weapons/thudswoosh.ogg','sound/weapons/Taser.ogg','sound/weapons/armbomb.ogg','sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg','sound/voice/hiss5.ogg','sound/voice/hiss6.ogg','sound/effects/Glassbr1.ogg','sound/effects/Glassbr2.ogg','sound/effects/Glassbr3.ogg','sound/items/Welder.ogg','sound/items/Welder2.ogg','sound/machines/airlock.ogg','sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') var/static/list/scarySounds = list(
'sound/weapons/thudswoosh.ogg',
'sound/weapons/Taser.ogg',
'sound/weapons/armbomb.ogg',
'sound/voice/hiss1.ogg',
'sound/voice/hiss2.ogg',
'sound/voice/hiss3.ogg',
'sound/voice/hiss4.ogg',
'sound/voice/hiss5.ogg',
'sound/voice/hiss6.ogg',
'sound/effects/Glassbr1.ogg',
'sound/effects/Glassbr2.ogg',
'sound/effects/Glassbr3.ogg',
'sound/items/Welder.ogg',
'sound/items/Welder2.ogg',
'sound/machines/airlock.ogg',
'sound/effects/clownstep1.ogg',
'sound/effects/clownstep2.ogg'
)
// Bomb cap! // Bomb cap!
var/max_explosion_range = 14 var/max_explosion_range = 14

4
code/modules/clothing/head/hardhat.dm
View File

@@ -21,7 +21,7 @@
item_state = "hardhat0_red" item_state = "hardhat0_red"
item_color = "red" item_color = "red"
name = "firefighter helmet" name = "firefighter helmet"
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE
heat_protection = HEAD heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
@@ -29,7 +29,7 @@
icon_state = "hardhat0_white" icon_state = "hardhat0_white"
item_state = "hardhat0_white" item_state = "hardhat0_white"
item_color = "white" item_color = "white"
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE
heat_protection = HEAD heat_protection = HEAD
max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE

2
code/modules/clothing/spacesuits/alien.dm
View File

@@ -54,7 +54,7 @@
/obj/item/clothing/head/helmet/space/vox /obj/item/clothing/head/helmet/space/vox
armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30) armor = list(melee = 60, bullet = 50, laser = 30, energy = 15, bomb = 30, bio = 30, rad = 30)
siemens_coefficient = 0.6 siemens_coefficient = 0.6
flags = HEADCOVERSEYES|STOPSPRESSUREDMAGE flags = HEADCOVERSEYES|STOPPRESSUREDAMAGE
species_restricted = list("Vox","Vox Armalis") species_restricted = list("Vox","Vox Armalis")
sprite_sheets = list( sprite_sheets = list(
"Vox" = 'icons/mob/species/vox/head.dmi', "Vox" = 'icons/mob/species/vox/head.dmi',

4
code/modules/clothing/spacesuits/captain.dm
View File

@@ -4,7 +4,7 @@
icon_state = "capspace" icon_state = "capspace"
item_state = "capspacehelmet" item_state = "capspacehelmet"
desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads." desc = "A special helmet designed for work in a hazardous, low-pressure environment. Only for the most fashionable of military figureheads."
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE
flags_inv = HIDEFACE flags_inv = HIDEFACE
permeability_coefficient = 0.01 permeability_coefficient = 0.01
armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50) armor = list(melee = 65, bullet = 50, laser = 50,energy = 25, bomb = 50, bio = 100, rad = 50)
@@ -18,7 +18,7 @@
w_class = 4 w_class = 4
gas_transfer_coefficient = 0.01 gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02 permeability_coefficient = 0.02
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
slowdown = 1.5 slowdown = 1.5

12
code/modules/clothing/spacesuits/miscellaneous.dm
View File

@@ -17,7 +17,7 @@
w_class = 4 w_class = 4
gas_transfer_coefficient = 0.01 gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02 permeability_coefficient = 0.02
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs) allowed = list(/obj/item/weapon/tank/emergency_oxygen, /obj/item/device/flashlight,/obj/item/weapon/gun/energy, /obj/item/weapon/gun/projectile, /obj/item/ammo_magazine, /obj/item/ammo_casing, /obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
slowdown = 1.5 slowdown = 1.5
@@ -34,7 +34,7 @@
icon_state = "deathsquad" icon_state = "deathsquad"
item_state = "deathsquad" item_state = "deathsquad"
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60) armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 100, rad = 60)
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPPRESSUREDAMAGE | THICKMATERIAL
siemens_coefficient = 0.6 siemens_coefficient = 0.6
/obj/item/clothing/head/helmet/space/deathsquad/beret /obj/item/clothing/head/helmet/space/deathsquad/beret
@@ -42,7 +42,7 @@
desc = "An armored beret commonly used by special operations officers." desc = "An armored beret commonly used by special operations officers."
icon_state = "beret_badge" icon_state = "beret_badge"
armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30) armor = list(melee = 65, bullet = 55, laser = 35,energy = 20, bomb = 30, bio = 30, rad = 30)
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE
siemens_coefficient = 0.9 siemens_coefficient = 0.9
//Space santa outfit suit //Space santa outfit suit
@@ -50,7 +50,7 @@
name = "Santa's hat" name = "Santa's hat"
desc = "Ho ho ho. Merrry X-mas!" desc = "Ho ho ho. Merrry X-mas!"
icon_state = "santahat" icon_state = "santahat"
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE
body_parts_covered = HEAD body_parts_covered = HEAD
/obj/item/clothing/suit/space/santa /obj/item/clothing/suit/space/santa
@@ -59,7 +59,7 @@
icon_state = "santa" icon_state = "santa"
item_state = "santa" item_state = "santa"
slowdown = 0 slowdown = 0
flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | ONESIZEFITSALL | STOPPRESSUREDAMAGE
allowed = list(/obj/item) //for stuffing exta special presents allowed = list(/obj/item) //for stuffing exta special presents
@@ -70,7 +70,7 @@
icon_state = "pirate" icon_state = "pirate"
item_state = "pirate" item_state = "pirate"
armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30) armor = list(melee = 60, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30)
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | STOPPRESSUREDAMAGE
body_parts_covered = 0 body_parts_covered = 0
siemens_coefficient = 0.9 siemens_coefficient = 0.9

4
code/modules/clothing/spacesuits/rig/rig.dm
View File

@@ -274,10 +274,10 @@
for(var/obj/item/piece in list(helmet,boots,gloves,chest)) for(var/obj/item/piece in list(helmet,boots,gloves,chest))
if(!piece) continue if(!piece) continue
if(canremove) if(canremove)
piece.flags &= ~STOPSPRESSUREDMAGE piece.flags &= ~STOPPRESSUREDAMAGE
piece.flags &= ~AIRTIGHT piece.flags &= ~AIRTIGHT
else else
piece.flags |= STOPSPRESSUREDMAGE piece.flags |= STOPPRESSUREDAMAGE
piece.flags |= AIRTIGHT piece.flags |= AIRTIGHT
update_icon(1) update_icon(1)

2
code/modules/clothing/spacesuits/rig/rig_pieces.dm
View File

@@ -36,7 +36,7 @@
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
flags_inv = HIDEJUMPSUIT|HIDETAIL flags_inv = HIDEJUMPSUIT|HIDETAIL
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
slowdown = 0 slowdown = 0
breach_threshold = 35 breach_threshold = 35
can_breach = 1 can_breach = 1

2
code/modules/clothing/spacesuits/rig/suits/light.dm
View File

@@ -7,7 +7,7 @@
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell) allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank,/obj/item/device/suit_cooling_unit,/obj/item/weapon/cell)
armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0) armor = list(melee = 50, bullet = 15, laser = 50, energy = 10, bomb = 25, bio = 0, rad = 0)
slowdown = 0 slowdown = 0
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE | THICKMATERIAL
offline_slowdown = 0 offline_slowdown = 0
offline_vision_restriction = 0 offline_vision_restriction = 0

4
code/modules/clothing/spacesuits/spacesuits.dm
View File

@@ -6,7 +6,7 @@
name = "Space helmet" name = "Space helmet"
icon_state = "space" icon_state = "space"
desc = "A special helmet designed for work in a hazardous, low-pressure environment." desc = "A special helmet designed for work in a hazardous, low-pressure environment."
flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPSPRESSUREDMAGE | THICKMATERIAL | AIRTIGHT flags = FPRINT | TABLEPASS | HEADCOVERSEYES | BLOCKHAIR | HEADCOVERSMOUTH | STOPPRESSUREDAMAGE | THICKMATERIAL | AIRTIGHT
item_state = "space" item_state = "space"
permeability_coefficient = 0.01 permeability_coefficient = 0.01
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 50)
@@ -53,7 +53,7 @@
w_class = 4//bulky item w_class = 4//bulky item
gas_transfer_coefficient = 0.01 gas_transfer_coefficient = 0.01
permeability_coefficient = 0.02 permeability_coefficient = 0.02
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE | THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/device/suit_cooling_unit)
slowdown = 3 slowdown = 3

2
code/modules/clothing/suits/armor.dm
View File

@@ -71,7 +71,7 @@
item_state = "swat_suit" item_state = "swat_suit"
gas_transfer_coefficient = 0.01 gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01 permeability_coefficient = 0.01
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE | THICKMATERIAL flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE | THICKMATERIAL
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen) allowed = list(/obj/item/weapon/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/tank/emergency_oxygen)
slowdown = 1 slowdown = 1

2
code/modules/clothing/suits/utility.dm
View File

@@ -21,7 +21,7 @@
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher) allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency_oxygen,/obj/item/weapon/extinguisher)
slowdown = 1.0 slowdown = 1.0
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAIL
flags = FPRINT | TABLEPASS | STOPSPRESSUREDMAGE flags = FPRINT | TABLEPASS | STOPPRESSUREDAMAGE
heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS heat_protection = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = FIRESUIT_MAX_HEAT_PROTECTION_TEMPERATURE
cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS cold_protection = UPPER_TORSO | LOWER_TORSO | LEGS | FEET | ARMS | HANDS

2
code/modules/mob/living/carbon/human/life.dm
View File

@@ -134,7 +134,7 @@
var/pressure_adjustment_coefficient = 1 // Assume no protection at first. var/pressure_adjustment_coefficient = 1 // Assume no protection at first.
if(wear_suit && (wear_suit.flags & STOPSPRESSUREDMAGE) && head && (head.flags & STOPSPRESSUREDMAGE)) // Complete set of pressure-proof suit worn, assume fully sealed. if(wear_suit && (wear_suit.flags & STOPPRESSUREDAMAGE) && head && (head.flags & STOPPRESSUREDAMAGE)) // Complete set of pressure-proof suit worn, assume fully sealed.
pressure_adjustment_coefficient = 0 pressure_adjustment_coefficient = 0
// Handles breaches in your space suit. 10 suit damage equals a 100% loss of pressure protection. // Handles breaches in your space suit. 10 suit damage equals a 100% loss of pressure protection.

1222
code/setup.dm
View File

File diff suppressed because it is too large Load Diff