mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 02:34:00 +00:00
Fixes robot radio component not using power
Also shifts power usage so binary talk uses less power while radio uses more.
This commit is contained in:
@@ -689,6 +689,13 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
|
|||||||
icon_state = "radio"
|
icon_state = "radio"
|
||||||
canhear_range = 3
|
canhear_range = 3
|
||||||
|
|
||||||
|
/obj/item/device/radio/borg/talk_into()
|
||||||
|
..()
|
||||||
|
if (isrobot(src.loc))
|
||||||
|
var/mob/living/silicon/robot/R = src.loc
|
||||||
|
var/datum/robot_component/C = R.components["radio"]
|
||||||
|
R.cell_use_power(C.active_usage)
|
||||||
|
|
||||||
/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
/obj/item/device/radio/borg/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||||
// ..()
|
// ..()
|
||||||
user.set_machine(src)
|
user.set_machine(src)
|
||||||
|
|||||||
@@ -244,6 +244,12 @@
|
|||||||
continue
|
continue
|
||||||
M.show_message("<i><span class='game say'><span class='name'>synthesised voice</span> <span class='message'>beeps, \"beep beep beep\"</span></span></i>",2)
|
M.show_message("<i><span class='game say'><span class='name'>synthesised voice</span> <span class='message'>beeps, \"beep beep beep\"</span></span></i>",2)
|
||||||
|
|
||||||
|
//robot binary xmitter component power usage
|
||||||
|
if (isrobot(speaker))
|
||||||
|
var/mob/living/silicon/robot/R = speaker
|
||||||
|
var/datum/robot_component/C = R.components["comms"]
|
||||||
|
R.cell_use_power(C.active_usage)
|
||||||
|
|
||||||
/datum/language/binary/drone
|
/datum/language/binary/drone
|
||||||
name = "Drone Talk"
|
name = "Drone Talk"
|
||||||
desc = "A heavily encoded damage control coordination stream."
|
desc = "A heavily encoded damage control coordination stream."
|
||||||
|
|||||||
@@ -112,7 +112,8 @@
|
|||||||
/datum/robot_component/radio
|
/datum/robot_component/radio
|
||||||
name = "radio"
|
name = "radio"
|
||||||
external_type = /obj/item/robot_parts/robot_component/radio
|
external_type = /obj/item/robot_parts/robot_component/radio
|
||||||
active_usage = 10
|
idle_usage = 15 //it's not actually possible to tell when we receive a message over our radio, so just use 10W every tick for passive listening
|
||||||
|
active_usage = 75 //transmit power
|
||||||
max_damage = 40
|
max_damage = 40
|
||||||
|
|
||||||
|
|
||||||
@@ -122,7 +123,8 @@
|
|||||||
/datum/robot_component/binary_communication
|
/datum/robot_component/binary_communication
|
||||||
name = "binary communication device"
|
name = "binary communication device"
|
||||||
external_type = /obj/item/robot_parts/robot_component/binary_communication_device
|
external_type = /obj/item/robot_parts/robot_component/binary_communication_device
|
||||||
active_usage = 10
|
idle_usage = 5
|
||||||
|
active_usage = 25
|
||||||
max_damage = 30
|
max_damage = 30
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user