Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Archie
2021-04-21 18:44:54 -03:00
2 changed files with 1 additions and 1 deletions
+1 -1
View File
@@ -3598,7 +3598,7 @@
"brj" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/holopad,/obj/structure/cable{icon_state = "2-8"},/turf/open/floor/carpet/royalblue,/area/crew_quarters/heads/captain)
"brk" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/effect/turf_decal/loading_area{dir = 4; icon_state = "drain"; name = "drain"},/turf/open/floor/plasteel,/area/hallway/primary/central)
"brl" = (/obj/machinery/vending/wardrobe/chem_wardrobe,/obj/structure/medkit_cabinet{pixel_y = 27},/turf/open/floor/plasteel/white,/area/medical/chemistry)
"brm" = (/obj/machinery/power/apc{areastring = "/area/medical/chemistry"; dir = 1; name = "Chemistry APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"},/mob/living/simple_animal/bot/medbot{desc = "A little cat medical robot. He looks determined."; icon = !INVALID_VALUE!; name = "Runtime V.2"},/turf/open/floor/plasteel/white,/area/medical/chemistry)
"brm" = (/obj/machinery/power/apc{areastring = "/area/medical/chemistry"; dir = 1; name = "Chemistry APC"; pixel_y = 24},/obj/structure/cable{icon_state = "0-2"},/mob/living/simple_animal/bot/medbot{desc = "A little cat medical robot. He looks determined."; icon = 'hyperstation/icons/mob/catmedbot.dmi'; name = "Runtime V.2"},/turf/open/floor/plasteel/white,/area/medical/chemistry)
"brn" = (/obj/machinery/camera{c_tag = "Chemistry"},/obj/machinery/firealarm{pixel_y = 24},/obj/machinery/chem_heater,/turf/open/floor/plasteel/white,/area/medical/chemistry)
"bro" = (/obj/machinery/chem_dispenser,/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/machinery/light{dir = 1},/turf/open/floor/plasteel/white,/area/medical/chemistry)
"brp" = (/obj/machinery/chem_master,/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/machinery/button/door{id = "chem_window_top"; name = "chemistry shutters"; pixel_x = 28},/turf/open/floor/plasteel/white,/area/medical/chemistry)
Binary file not shown.

Before

Width:  |  Height:  |  Size: 430 KiB

After

Width:  |  Height:  |  Size: 426 KiB