From cb4b9a91c60b3065a784379a199feb96247f1d6d Mon Sep 17 00:00:00 2001 From: Lzimann Date: Fri, 17 Mar 2017 15:04:00 -0300 Subject: [PATCH] Requests console now have a receive ore updates variable. Also updates all maps with it. --- .../map_files/Deltastation/DeltaStation2.dmm | 22 ++++++++++----- _maps/map_files/MetaStation/MetaStation.dmm | 27 ++++++++++++------- _maps/map_files/OmegaStation/OmegaStation.dmm | 15 +++++++---- _maps/map_files/PubbyStation/PubbyStation.dmm | 27 ++++++++++++------- _maps/map_files/TgStation/tgstation.2.1.3.dmm | 27 ++++++++++++------- code/game/machinery/requests_console.dm | 1 + code/modules/mining/machine_redemption.dm | 2 +- 7 files changed, 81 insertions(+), 40 deletions(-) diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 670b5e9621e..596ec62a6b9 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -13986,7 +13986,8 @@ departmentType = 0; name = "Bar RC"; pixel_x = 0; - pixel_y = 32 + pixel_y = 32; + receive_ore_updates = 1 }, /obj/item/weapon/book/manual/barman_recipes, /obj/item/weapon/reagent_containers/food/drinks/shaker, @@ -79707,7 +79708,8 @@ departmentType = 0; name = "Xenobiology RC"; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/machinery/camera{ c_tag = "Xenobiology - Starboard"; @@ -83139,6 +83141,7 @@ name = "Research RC"; pixel_x = 32; pixel_y = 0 + receive_ore_updates = 1 }, /obj/machinery/camera{ c_tag = "Science - Research and Development"; @@ -84658,7 +84661,8 @@ departmentType = 0; name = "Chemistry RC"; pixel_x = 0; - pixel_y = -64 + pixel_y = -64; + receive_ore_updates = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -90825,7 +90829,8 @@ departmentType = 5; name = "Research Director's RC"; pixel_x = -32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -93413,7 +93418,8 @@ departmentType = 0; name = "Robotics RC"; pixel_x = 0; - pixel_y = 32 + pixel_y = 32; + receive_ore_updates = 1 }, /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -95895,7 +95901,8 @@ departmentType = 0; name = "Toxins RC"; pixel_x = -32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -104740,7 +104747,8 @@ departmentType = 0; name = "Virology RC"; pixel_x = 0; - pixel_y = 32 + pixel_y = 32; + receive_ore_updates = 1 }, /obj/item/weapon/folder/white, /obj/item/weapon/pen/red, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 5f0bf9ee0dc..bd7cc4aff06 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -43116,7 +43116,8 @@ department = "Bar"; departmentType = 2; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/structure/table, /obj/item/weapon/book/manual/barman_recipes{ @@ -67238,7 +67239,8 @@ department = "Chemistry"; departmentType = 2; pixel_x = -30; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/structure/table/glass, /turf/open/floor/plasteel/whiteyellow/side{ @@ -67438,7 +67440,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk, @@ -69769,7 +69772,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -71350,7 +71354,8 @@ departmentType = 5; name = "Research Director RC"; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/machinery/modular_computer/console/preset/research, /turf/open/floor/plasteel/cafeteria{ @@ -76971,7 +76976,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /obj/structure/table/reinforced, /obj/machinery/light, @@ -78451,7 +78457,8 @@ department = "Virology"; name = "Virology Requests Console"; pixel_x = 29; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/item/stack/sheet/mineral/plasma{ layer = 2.9 @@ -79175,7 +79182,8 @@ departmentType = 2; name = "Robotics RC"; pixel_x = -31; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -91461,7 +91469,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/machinery/light{ dir = 1 diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index d9d37ca0468..3e2701bcfa8 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -15489,7 +15489,8 @@ departmentType = 0; name = "Bar RC"; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ tag = "icon-manifold (EAST)"; @@ -27872,7 +27873,8 @@ departmentType = 0; name = "Research RC"; pixel_x = 0; - pixel_y = 32 + pixel_y = 32; + receive_ore_updates = 1 }, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 @@ -29314,7 +29316,8 @@ departmentType = 0; name = "Chemistry RC"; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /turf/open/floor/plasteel/whiteyellow/corner, /area/medical/chemistry) @@ -32130,7 +32133,8 @@ departmentType = 0; name = "Robotics RC"; pixel_x = 0; - pixel_y = 32 + pixel_y = 32; + receive_ore_updates = 1 }, /obj/machinery/light_switch{ pixel_x = 24 @@ -37997,7 +38001,8 @@ departmentType = 0; name = "Xenobiology RC"; pixel_x = 0; - pixel_y = -32 + pixel_y = -32; + receive_ore_updates = 1 }, /obj/structure/cable/white{ tag = "icon-1-4"; diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index c14554f9a7a..cece047a607 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -21536,7 +21536,8 @@ department = "Bar"; departmentType = 2; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/machinery/camera{ c_tag = "Bar Access"; @@ -28450,7 +28451,8 @@ department = "Robotics"; departmentType = 2; name = "Robotics RC"; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /turf/open/floor/plasteel, /area/assembly/robotics) @@ -30034,7 +30036,8 @@ dir = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -31246,7 +31249,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = -32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/item/weapon/book/manual/research_and_development, /turf/open/floor/plasteel/purple/side{ @@ -33277,7 +33281,8 @@ department = "Chemistry"; departmentType = 2; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -35021,7 +35026,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /turf/open/floor/plasteel/whitepurple/side{ dir = 6 @@ -36833,7 +36839,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 32; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -38357,7 +38364,8 @@ departmentType = 5; name = "Research Director RC"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /turf/open/floor/plasteel/whitepurple/side, /area/crew_quarters/hor) @@ -40685,7 +40693,8 @@ /obj/machinery/requests_console{ department = "Virology"; name = "Virology Requests Console"; - pixel_x = 32 + pixel_x = 32; + receive_ore_updates = 1 }, /obj/item/weapon/storage/box/monkeycubes{ layer = 3.1 diff --git a/_maps/map_files/TgStation/tgstation.2.1.3.dmm b/_maps/map_files/TgStation/tgstation.2.1.3.dmm index 21b9151d4a7..f9634a566b4 100644 --- a/_maps/map_files/TgStation/tgstation.2.1.3.dmm +++ b/_maps/map_files/TgStation/tgstation.2.1.3.dmm @@ -20195,7 +20195,8 @@ department = "Bar"; departmentType = 2; pixel_x = 30; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/machinery/camera{ c_tag = "Bar"; @@ -26296,7 +26297,8 @@ department = "Robotics"; departmentType = 2; name = "Robotics RC"; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/machinery/light{ dir = 1 @@ -26694,7 +26696,8 @@ department = "Chemistry"; departmentType = 2; pixel_x = -30; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /obj/machinery/light{ icon_state = "tube1"; @@ -27682,7 +27685,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = -30; - pixel_y = 0 + pixel_y = 0; + receive_ore_updates = 1 }, /turf/open/floor/plasteel/white, /area/toxins/lab) @@ -32431,7 +32435,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 1; @@ -34110,7 +34115,8 @@ departmentType = 5; name = "Research Director RC"; pixel_x = -2; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /obj/structure/window/reinforced{ dir = 4 @@ -40330,7 +40336,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /obj/structure/table/reinforced, /turf/open/floor/plasteel/white, @@ -42997,7 +43004,8 @@ departmentType = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = -30 + pixel_y = -30; + receive_ore_updates = 1 }, /obj/item/weapon/paper_bin{ pixel_x = 1; @@ -43474,7 +43482,8 @@ dir = 2; name = "Science Requests Console"; pixel_x = 0; - pixel_y = 30 + pixel_y = 30; + receive_ore_updates = 1 }, /turf/open/floor/plasteel, /area/toxins/misc_lab) diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index 1d9ac221d33..a583e579924 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -56,6 +56,7 @@ var/list/obj/machinery/requests_console/allConsoles = list() var/priority = -1 ; //Priority of the message being sent var/obj/item/device/radio/Radio var/emergency //If an emergency has been called by this device. Acts as both a cooldown and lets the responder know where it the emergency was triggered from + var/receive_ore_updates = FALSE //If ore redemption machines will send an update when it receives new ores. obj_integrity = 300 max_integrity = 300 armor = list(melee = 70, bullet = 30, laser = 30, energy = 30, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm index f12a8def5dd..49b5a7a7710 100644 --- a/code/modules/mining/machine_redemption.dm +++ b/code/modules/mining/machine_redemption.dm @@ -86,7 +86,7 @@ msg += "[capitalize(sheet.name)]: [sheet.amount] sheets
" for(var/obj/machinery/requests_console/D in allConsoles) - if(D.departmentType == 2) // temporary + if(D.receive_ore_updates) D.createmessage("Ore Redemption Machine", "New minerals available!", msg, 1, 0) /obj/machinery/mineral/ore_redemption/process()