From b168c770710d5f0559df28222f154a97b6b87b2b Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 19 Jul 2019 15:11:44 -0500 Subject: [PATCH 1/8] Emitters Hit Blob Again (#6310) * Emitters Hit Blob Again * Update overmind.dm * Deletes line --- code/modules/blob2/overmind/overmind.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/blob2/overmind/overmind.dm b/code/modules/blob2/overmind/overmind.dm index 6477c86f22..223cb41e60 100644 --- a/code/modules/blob2/overmind/overmind.dm +++ b/code/modules/blob2/overmind/overmind.dm @@ -9,7 +9,6 @@ var/list/overminds = list() mouse_opacity = 1 see_in_dark = 8 invisibility = INVISIBILITY_OBSERVER - layer = FLY_LAYER + 0.1 faction = "blob" var/obj/structure/blob/core/blob_core = null // The blob overmind's core From 03ff9fa0feb1fc06ecfd24750fb111f375a48495 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 19 Jul 2019 15:19:07 -0500 Subject: [PATCH 3/8] Merge pull request #6284 from Atermonera/weather_app_atmos_reading fixes communicator weather app's air reading --- code/game/objects/items/devices/PDA/PDA.dm | 60 ++++++++++------- .../items/devices/communicator/helper.dm | 16 ++--- nano/templates/atmospheric_scan.tmpl | 65 ++++--------------- nano/templates/pda.tmpl | 5 +- 4 files changed, 55 insertions(+), 91 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index c2a77936c4..46c425bb89 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -577,31 +577,7 @@ var/global/list/obj/item/device/pda/PDAs = list() if(mode==3) - var/turf/T = get_turf(user.loc) - if(!isnull(T)) - var/datum/gas_mixture/environment = T.return_air() - - var/pressure = environment.return_pressure() - var/total_moles = environment.total_moles - - if (total_moles) - var/o2_level = environment.gas["oxygen"]/total_moles - var/n2_level = environment.gas["nitrogen"]/total_moles - var/co2_level = environment.gas["carbon_dioxide"]/total_moles - var/phoron_level = environment.gas["phoron"]/total_moles - var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) - data["aircontents"] = list(\ - "pressure" = "[round(pressure,0.1)]",\ - "nitrogen" = "[round(n2_level*100,0.1)]",\ - "oxygen" = "[round(o2_level*100,0.1)]",\ - "carbon_dioxide" = "[round(co2_level*100,0.1)]",\ - "phoron" = "[round(phoron_level*100,0.01)]",\ - "other" = "[round(unknown_level, 0.01)]",\ - "temp" = "[round(environment.temperature-T0C,0.1)]",\ - "reading" = 1\ - ) - if(isnull(data["aircontents"])) - data["aircontents"] = list("reading" = 0) + data["aircontents"] = src.analyze_air() if(mode==6) if(has_reception) feeds.Cut() @@ -1544,3 +1520,37 @@ var/global/list/obj/item/device/pda/PDAs = list() /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) A.emp_act(severity) + +/obj/item/device/pda/proc/analyze_air() + var/list/results = list() + var/turf/T = get_turf(src.loc) + if(!isnull(T)) + var/datum/gas_mixture/environment = T.return_air() + var/pressure = environment.return_pressure() + var/total_moles = environment.total_moles + if (total_moles) + var/o2_level = environment.gas["oxygen"]/total_moles + var/n2_level = environment.gas["nitrogen"]/total_moles + var/co2_level = environment.gas["carbon_dioxide"]/total_moles + var/phoron_level = environment.gas["phoron"]/total_moles + var/unknown_level = 1-(o2_level+n2_level+co2_level+phoron_level) + + // entry is what the element is describing + // Type identifies which unit or other special characters to use + // Val is the information reported + // Bad_high/_low are the values outside of which the entry reports as dangerous + // Poor_high/_low are the values outside of which the entry reports as unideal + // Values were extracted from the template itself + results = list( + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + ) + + if(isnull(results)) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) + return results diff --git a/code/game/objects/items/devices/communicator/helper.dm b/code/game/objects/items/devices/communicator/helper.dm index b7a3b752d9..273686fb46 100644 --- a/code/game/objects/items/devices/communicator/helper.dm +++ b/code/game/objects/items/devices/communicator/helper.dm @@ -19,17 +19,17 @@ // Poor_high/_low are the values outside of which the entry reports as unideal // Values were extracted from the template itself results = list( - list("entry" = "Pressure", "type" = "pressure", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), - list("entry" = "Temperature", "type" = "temp", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), - list("entry" = "Oxygen", "type" = "pressure", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), - list("entry" = "Nitrogen", "type" = "pressure", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), - list("entry" = "Carbon Dioxide", "type" = "pressure", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), - list("entry" = "Phoron", "type" = "pressure", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), - list("entry" = "Other", "type" = "pressure", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) + list("entry" = "Pressure", "units" = "kPa", "val" = "[round(pressure,0.1)]", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80), + list("entry" = "Temperature", "units" = "°C", "val" = "[round(environment.temperature-T0C,0.1)]", "bad_high" = 35, "poor_high" = 25, "poor_low" = 15, "bad_low" = 5), + list("entry" = "Oxygen", "units" = "kPa", "val" = "[round(o2_level*100,0.1)]", "bad_high" = 140, "poor_high" = 135, "poor_low" = 19, "bad_low" = 17), + list("entry" = "Nitrogen", "units" = "kPa", "val" = "[round(n2_level*100,0.1)]", "bad_high" = 105, "poor_high" = 85, "poor_low" = 50, "bad_low" = 40), + list("entry" = "Carbon Dioxide", "units" = "kPa", "val" = "[round(co2_level*100,0.1)]", "bad_high" = 10, "poor_high" = 5, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Phoron", "units" = "kPa", "val" = "[round(phoron_level*100,0.01)]", "bad_high" = 0.5, "poor_high" = 0, "poor_low" = 0, "bad_low" = 0), + list("entry" = "Other", "units" = "kPa", "val" = "[round(unknown_level, 0.01)]", "bad_high" = 1, "poor_high" = 0.5, "poor_low" = 0, "bad_low" = 0) ) if(isnull(results)) - results = list(list("entry" = "pressure", "val" = "0")) + results = list(list("entry" = "pressure", "units" = "kPa", "val" = "0", "bad_high" = 120, "poor_high" = 110, "poor_low" = 95, "bad_low" = 80)) return results diff --git a/nano/templates/atmospheric_scan.tmpl b/nano/templates/atmospheric_scan.tmpl index df1f6bf06a..000df031d7 100644 --- a/nano/templates/atmospheric_scan.tmpl +++ b/nano/templates/atmospheric_scan.tmpl @@ -1,57 +1,14 @@ -
- {{if data.aircontents.reading == 1}} -
- Pressure: -
-
- {{:helper.string('{1} kPa', data.aircontents.pressure < 80 || data.aircontents.pressure > 120 ? 'bad' : data.aircontents.pressure < 95 || data.aircontents.pressure > 110 ? 'average' : 'good' , data.aircontents.pressure)}} -
-
- Temperature: -
-
- {{:helper.string('{1} °C', data.aircontents.temp < 5 || data.aircontents.temp > 35 ? 'bad' : data.aircontents.temp < 15 || data.aircontents.temp > 25 ? 'average' : 'good' , data.aircontents.temp)}} -
-
-
- Oxygen: -
-
- {{:helper.string('{1}%', data.aircontents.oxygen < 17 ? 'bad' : data.aircontents.oxygen < 19 ? 'average' : 'good' , data.aircontents.oxygen)}} -
-
- Nitrogen: -
-
- {{:helper.string('{1}%', data.aircontents.nitrogen > 82 ? 'bad' : data.aircontents.nitrogen > 80 ? 'average' : 'good' , data.aircontents.nitrogen)}} -
- {{if data.aircontents.carbon_dioxide > 0}} -
- Carbon Dioxide: -
-
- {{:helper.string('{1}%', data.aircontents.carbon_dioxide > 5 ? 'bad' : 'good' , data.aircontents.carbon_dioxide)}} -
- {{/if}} - {{if data.aircontents.phoron > 0}} -
- Phoron: -
-
- {{:helper.string('{1}%', data.aircontents.phoron > 0 ? 'bad' : 'good' , data.aircontents.phoron)}} -
- {{/if}} - {{if data.aircontents.other > 0}} -
- Unknown: -
-
- {{:data.aircontents.other}}% +
+ {{for data.aircontents}} + {{if value.val != 0 || value.entry == "pressure" || value.entry == "temperature"}} +
+
+ {{:value.entry}}: +
+
+ {{:helper.string('{1}{2}', value.val < value.bad_low || value.val > value.bad_high ? 'bad' : value.val < value.poor_low || value.val > value.poor_high ? 'average' : 'good' , value.val, value.units)}} +
{{/if}} - {{else}} -
- Unable to get air reading -
- {{/if}} + {{/for}}
\ No newline at end of file diff --git a/nano/templates/pda.tmpl b/nano/templates/pda.tmpl index e8911f7b9b..d5647310ce 100644 --- a/nano/templates/pda.tmpl +++ b/nano/templates/pda.tmpl @@ -300,10 +300,7 @@ Used In File(s): \code\game\objects\items\devices\PDA\PDA.dm {{else data.mode == 3}}

Atmospheric Scan

-
- {{#def.atmosphericScan}} -
- + {{#def.atmosphericScan}} {{else data.mode == 40}}

Remote Signaling System

From 65f8ca05adee73b6cd7d3a6cc4f8b1f9808b8822 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 19 Jul 2019 15:18:59 -0500 Subject: [PATCH 5/8] Merge pull request #6311 from Nalarac/Hivebot Melee Mobs Can Attack with Pointblank --- code/modules/ai/ai_holder_combat.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/ai/ai_holder_combat.dm b/code/modules/ai/ai_holder_combat.dm index 12cf9e2436..63154e4fe4 100644 --- a/code/modules/ai/ai_holder_combat.dm +++ b/code/modules/ai/ai_holder_combat.dm @@ -65,6 +65,11 @@ on_engagement(target) melee_attack(target) + else if(distance <= 1 && !holder.ICheckRangedAttack(target)) // Doesn't have projectile, but is pointblank + ai_log("engage_target() : Attempting a melee attack.", AI_LOG_TRACE) + on_engagement(target) + melee_attack(target) + // Shoot them. else if(holder.ICheckRangedAttack(target) && (distance <= max_range(target)) ) on_engagement(target) From 7109e22c3fd0c5719ae9110dcd27ccbd93107ce5 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sat, 20 Jul 2019 12:26:34 -0500 Subject: [PATCH 7/8] Merge pull request #6313 from Atermonera/changelog itty bitty changelog --- html/changelog.html | 12 ++++++ html/changelogs/.all_changelog.yml | 8 ++++ ...eFurryFeline - Nalarac's Farmbot Tweak.yml | 36 ------------------ html/changelogs/maptweaksv3 - Woodrat.yml | 38 ------------------- 4 files changed, 20 insertions(+), 74 deletions(-) delete mode 100644 html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml delete mode 100644 html/changelogs/maptweaksv3 - Woodrat.yml diff --git a/html/changelog.html b/html/changelog.html index 7a0461244c..fab075d8ed 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,6 +53,18 @@ -->
+

19 July 2019

+

Nalarac updated:

+
    +
  • Add xenobio/xenobot to farmbots.
    • +
+

Woodrat updated:

+
    +
  • Added a clotting kit to the Raider Shuttle.
    • +
  • Swapped out the ai turrets for industrial turrets in the teleporter rooms.
    • +
  • Adjusted access to the turret controls to heads of staff access, moved them outside of the rooms.
    • +
+

07 July 2019

Heroman3003 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 84bda2f98b..30c75a1917 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -4614,3 +4614,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. on an invalid Z-level. - bugfix: Fixes GPSes not detecting other GPSes while on an invalid Z-level. Transit Z is unaffected by this- no spying on other shuttles! +2019-07-19: + Nalarac: + - tweak: Add xenobio/xenobot to farmbots. + Woodrat: + - rscadd: Added a clotting kit to the Raider Shuttle. + - tweak: Swapped out the ai turrets for industrial turrets in the teleporter rooms. + - tweak: Adjusted access to the turret controls to heads of staff access, moved + them outside of the rooms. diff --git a/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml b/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml deleted file mode 100644 index 179f66329a..0000000000 --- a/html/changelogs/TheFurryFeline - Nalarac's Farmbot Tweak.yml +++ /dev/null @@ -1,36 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: TheFurryFeline - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - tweak: "Add access_xenobiology to farmbots." \ No newline at end of file diff --git a/html/changelogs/maptweaksv3 - Woodrat.yml b/html/changelogs/maptweaksv3 - Woodrat.yml deleted file mode 100644 index a3bb4b8ebf..0000000000 --- a/html/changelogs/maptweaksv3 - Woodrat.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -################################# - -# Your name. -author: Woodrat - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "Added a clotting kit to the Raider Shuttle." - - tweak: "swapped out the ai turrets for industrial turrets in the teleporter rooms." - - tweak: "Adjusted access to the turret controls to heads of staff access, moved them outside of the rooms."