From fd0acbbbd57f76e52df2c25517efd205534b8b71 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Fri, 20 Dec 2019 17:32:18 -0300 Subject: [PATCH 1/5] Fixes the scraphead again. (#7751) --- maps/space_ruins/scrapheap.dmm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maps/space_ruins/scrapheap.dmm b/maps/space_ruins/scrapheap.dmm index ef94f0ac467..f8c93d37c3e 100644 --- a/maps/space_ruins/scrapheap.dmm +++ b/maps/space_ruins/scrapheap.dmm @@ -1506,7 +1506,7 @@ /turf/simulated/floor/tiled/dark, /area/derelict/ship) "er" = ( -/obj/item/robot_parts/robot_component/armor/combat, +/obj/item/robot_parts/robot_component/armor/mech/combat, /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/dark, /area/derelict/ship) From 0849ce89a6a16ad38cf5ffeaab43cbea29d52ee4 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Fri, 20 Dec 2019 21:33:13 +0100 Subject: [PATCH 2/5] Fixes the advanced scanner not printing the brain result. (#7742) --- code/game/machinery/adv_med.dm | 5 ++- html/changelogs/mattatlas-tiniestfix.yml | 41 ++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/mattatlas-tiniestfix.yml diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 7e3dfabb92b..fe09126ba12 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -538,11 +538,10 @@ if (!occupant || !istype(occupant, /mob/living/carbon/human)) return var/mob/living/carbon/human/H = occupant - var/brain_result = H.get_brain_status() var/list/occupant_data = list( "stationtime" = worldtime2text(), - "brain_activity" = brain_result, + "brain_activity" = H.get_brain_status(), "virus_present" = H.virus2.len, "blood_volume" = H.get_blood_volume(), "blood_oxygenation" = H.get_blood_oxygenation(), @@ -577,7 +576,7 @@ /obj/machinery/body_scanconsole/proc/format_occupant_data(var/list/occ) var/dat = "Scan performed at [occ["stationtime"]]
" dat += "Occupant Statistics:
" - dat += text("Brain Activity: []
", occ["brain_result"]) + dat += text("Brain Activity: []
", occ["brain_activity"]) if (occ["virus_present"]) dat += "Viral pathogen detected in blood stream.
" dat += text("Blood Pressure: []
", occ["blood_pressure"]) diff --git a/html/changelogs/mattatlas-tiniestfix.yml b/html/changelogs/mattatlas-tiniestfix.yml new file mode 100644 index 00000000000..0ee8b211d71 --- /dev/null +++ b/html/changelogs/mattatlas-tiniestfix.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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: + - bugfix: "Fixed the advanced scanner not printing a brain activity result." \ No newline at end of file From 7adbdebf08846b61a2412f44236d2ae7d9080a93 Mon Sep 17 00:00:00 2001 From: AuroraBuildBot Date: Fri, 20 Dec 2019 20:33:46 +0000 Subject: [PATCH 3/5] "[ci skip] Automatic Build - 2019.12.20.20.33.46" --- html/changelog.html | 6 ++++ html/changelogs/.all_changelog.yml | 3 ++ html/changelogs/mattatlas-tiniestfix.yml | 41 ------------------------ 3 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 html/changelogs/mattatlas-tiniestfix.yml diff --git a/html/changelog.html b/html/changelog.html index 2649473e8a8..0b9999f74f5 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -35,6 +35,12 @@ -->
+

20 December 2019

+

MattAtlas updated:

+
    +
  • Fixed the advanced scanner not printing a brain activity result.
    • +
+

19 December 2019

Alberyk updated: