diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index b3e55d3c2c3..9335e0caeeb 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -379,14 +379,14 @@ var/list/uplink_items = list() /datum/uplink_item/device_tools/syndicate_bomb name = "Syndicate Bomb" - desc = "The Syndicate Bomb has an adjustable timer with a minimum setting of 30 seconds. Ordering the bomb sends you a small beacon, which will teleport the explosive to your location when you activate it. \ + desc = "The Syndicate Bomb has an adjustable timer with a minimum setting of 60 seconds. Ordering the bomb sends you a small beacon, which will teleport the explosive to your location when you activate it. \ You can wrench the bomb down to prevent removal. The crew may attempt to defuse the bomb." item = /obj/item/device/sbeacondrop/bomb cost = 5 /datum/uplink_item/device_tools/syndicate_detonator name = "Syndicate Detonator" desc = "The Syndicate Detonator is a companion device to the Syndicate Bomb. Simply press the included button and an encrypted radio frequency will instruct all live syndicate bombs to detonate. \ -Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of the blast radius before using the detonator." + Useful for when speed matters or you wish to synchronize multiple bomb blasts. Be sure to stand clear of the blast radius before using the detonator." item = /obj/item/device/syndicatedetonator cost = 1 diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 82860031680..3839e5f7325 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -16,6 +16,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use var/canhear_range = 3 // the range which mobs can hear this radio from var/obj/item/device/radio/patch_link = null var/datum/wires/radio/wires = null + var/prison_radio = 0 var/b_stat = 0 var/broadcasting = 0 var/listening = 1 @@ -490,7 +491,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use freq_text = "Security" if(SERV_FREQ) freq_text = "Service" - if(SUP_FREQ) + if(SUPP_FREQ) freq_text = "Supply" //There's probably a way to use the list var of channels in code\game\communications.dm to make the dept channels non-hardcoded, but I wasn't in an experimentive mood. --NEO @@ -514,8 +515,8 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use part_a = "" else if (display_freq==SERV_FREQ) part_a = "" - else if (display_freq==SUP_FREQ) - part_a = "" + else if (display_freq==SUPP_FREQ) + part_a = "" else if (display_freq==DSQUAD_FREQ) part_a = "" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b458de9f9e6..48e0ac47769 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -695,7 +695,7 @@ playsound(loc, M.attack_sound, 50, 1, 1) for(var/mob/O in viewers(src, null)) O.show_message("\red [M] [M.attacktext] [src]!", 1) - add_logs((M, src, "attacked", admin=0) + add_logs(M, src, "attacked", admin=0) var/damage = rand(M.melee_damage_lower, M.melee_damage_upper) adjustBruteLoss(damage) updatehealth()