mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Merge pull request #2468 from CHOMPStationBot/upstream-merge-10972
[MIRROR] Fixes #10941
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
var/supported = 0
|
var/supported = 0
|
||||||
var/active = 0
|
var/active = 0
|
||||||
var/list/resource_field = list()
|
var/list/resource_field = list()
|
||||||
var/obj/item/device/radio/intercom/faultreporter = new /obj/item/device/radio/intercom{channels=list("Supply")}(null)
|
var/obj/item/device/radio/intercom/faultreporter
|
||||||
|
|
||||||
var/list/ore_types = list(
|
var/list/ore_types = list(
|
||||||
"hematite" = /obj/item/weapon/ore/iron,
|
"hematite" = /obj/item/weapon/ore/iron,
|
||||||
@@ -65,6 +65,12 @@
|
|||||||
cell = new cell(src)
|
cell = new cell(src)
|
||||||
default_apply_parts()
|
default_apply_parts()
|
||||||
cell = default_use_hicell()
|
cell = default_use_hicell()
|
||||||
|
faultreporter = new /obj/item/device/radio/intercom{channels=list("Supply")}(null)
|
||||||
|
|
||||||
|
/obj/machinery/mining/drill/Destroy()
|
||||||
|
qdel_null(faultreporter)
|
||||||
|
qdel_null(cell)
|
||||||
|
return ..()
|
||||||
|
|
||||||
/obj/machinery/mining/drill/get_cell()
|
/obj/machinery/mining/drill/get_cell()
|
||||||
return cell
|
return cell
|
||||||
@@ -274,7 +280,7 @@
|
|||||||
|
|
||||||
if(error)
|
if(error)
|
||||||
src.visible_message("<b>\The [src]</b> flashes a '[error]' warning.")
|
src.visible_message("<b>\The [src]</b> flashes a '[error]' warning.")
|
||||||
faultreporter.autosay(error, src.name, "Supply")
|
faultreporter.autosay(error, src.name, "Supply", using_map.get_map_levels(z))
|
||||||
need_player_check = 1
|
need_player_check = 1
|
||||||
active = 0
|
active = 0
|
||||||
update_icon()
|
update_icon()
|
||||||
|
|||||||
Reference in New Issue
Block a user