cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Radios in broadcasting mode would work when worn.

Browse Source 
Popcorn takes 20 bites to eat.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1271 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
rastaf.zero@gmail.com
2011-03-24 20:03:25 +00:00
parent bd586cb156
commit a526b389e7
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/Chemistry-Tools.dm
View File

@@ -2155,8 +2155,8 @@
icon_state = "popcorn" icon_state = "popcorn"
New() New()
..() ..()
reagents.add_reagent("nutriment", 10) reagents.add_reagent("nutriment", 2)
bitesize = 1 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 /obj/item/weapon/reagent_containers/food/snacks/fishburger
name = "Carpburger" name = "Carpburger"

1
code/game/objects/radio/radio.dm
View File

@@ -149,7 +149,6 @@ Speaker: <A href='byond://?src=\ref[src];ch_name=[chan_name];listen=[!list]'>[li
src.add_fingerprint(usr) src.add_fingerprint(usr)
/obj/item/device/radio/talk_into(mob/M as mob, message, channel) /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 var/datum/radio_frequency/connection = null // Code shared by Mport2004 for Security Headsets -- TLE
if(channel && src.channels && src.channels.len > 0) if(channel && src.channels && src.channels.len > 0)
if (channel == "department") if (channel == "department")

4
code/modules/mob/living/say.dm
View File

@@ -246,13 +246,13 @@
//find mobs in lockers, cryo and intellycards //find mobs in lockers, cryo and intellycards
for (var/mob/M in world) for (var/mob/M in world)
if (isturf(M.loc)) 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) if (!M.client)
continue //skip monkeys and leavers 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 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 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) spawn (0)
if (O) if (O)
O.hear_talk(src, message) O.hear_talk(src, message)