diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 6ccc690711..2d87f6d4c2 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -2155,8 +2155,8 @@ icon_state = "popcorn" New() ..() - reagents.add_reagent("nutriment", 10) - bitesize = 1 + reagents.add_reagent("nutriment", 2) + bitesize = 0.1 //this snack is supposed to be eating during looooong time. And this it not dinner food! --rastaf0 /obj/item/weapon/reagent_containers/food/snacks/fishburger name = "Carpburger" diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm index 748b6063ba..69befdfd4d 100644 --- a/code/game/objects/radio/radio.dm +++ b/code/game/objects/radio/radio.dm @@ -149,7 +149,6 @@ Speaker: [li src.add_fingerprint(usr) /obj/item/device/radio/talk_into(mob/M as mob, message, channel) - var/datum/radio_frequency/connection = null // Code shared by Mport2004 for Security Headsets -- TLE if(channel && src.channels && src.channels.len > 0) if (channel == "department") diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index aa2e7c79db..6670876ef1 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -246,13 +246,13 @@ //find mobs in lockers, cryo and intellycards for (var/mob/M in world) if (isturf(M.loc)) - continue //if M can hear us it is already was found by hearers() + continue //if M can hear us it was already found by hearers() if (!M.client) continue //skip monkeys and leavers if (get_turf(M) in V) //this slow, but I don't think we'd have a lot of wardrobewhores every round --rastaf0 listening+=M - for (var/obj/O in (V-used_radios)) + for (var/obj/O in ((V | src.contents)-used_radios)) //radio in pocket could work, radio in backpack wouldn't --rastaf0 spawn (0) if (O) O.hear_talk(src, message)