Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

I've covered wars, you know: Press camera drone & microphone changes #20289

Closed
Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions code/game/objects/items/devices/radio/microphone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,40 @@
desc = "A handheld microphone, used for on-the-fly interviewing. Pose for the fans!"
icon_state = "microphone"
item_state = "microphone"
var/second_speaker = FALSE //If true, waits for the clicked-on mob to speak next to the microphone before resetting relevant variables
var/speaker //Stores the clicked-on mob's name so no one else broadcasts to the radio

/obj/item/device/radio/microphone/Initialize()
. = ..()
set_frequency(ENT_FREQ)
internal_channels = list(num2text(ENT_FREQ) = list())

/obj/item/device/radio/microphone/attack(mob/living/target_mob, mob/living/user, target_zone)
if(user.a_intent == I_HELP && target_mob != src.get_holding_mob())
visible_message("[SPAN_BOLD("[user]")] holds \the [src] over to [SPAN_BOLD("[target_mob]")].")
set_broadcasting(TRUE)
canhear_range = 1
second_speaker = TRUE
speaker = target_mob.name

/obj/item/device/radio/microphone/hear_talk(mob/M, msg, verb, datum/language/speaking)
if(M.name != speaker || !broadcasting)
return
if(M.name == speaker && !M.Adjacent(get_turf(src)))
to_chat(get_holding_mob(), SPAN_WARNING("[M] stepped too far out of range!"))
second_speaker = FALSE
canhear_range = initial(canhear_range)
speaker = null
set_broadcasting(FALSE)
return
else
second_speaker = FALSE
canhear_range = initial(canhear_range)
speaker = null
set_broadcasting(FALSE)
return talk_into(M, msg, null, verb, speaking, TRUE)





Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
A.client.eye = A.eyeobj
return TRUE

if(!is_contact_area(get_area(C)))
if(!is_contact_area(get_area(C)) && !LAZYISIN(C.network, NETWORK_NEWS))
to_chat(user, SPAN_NOTICE("This camera is too far away to connect to!"))
return FALSE
Comment on lines +148 to 150
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this respect overmap distance?
so you can't transmit from offship to horizon when they're on opposite ends of the overmap

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't believe so and I'm not sure how to go about implementing that


Expand Down
59 changes: 59 additions & 0 deletions html/changelogs/SimpleMaroon-journalismupdate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# - (fixes bugs)
# wip
# - (work in progress)
# qol
# - (quality of life)
# soundadd
# - (adds a sound)
# sounddel
# - (removes a sound)
# rscadd
# - (adds a feature)
# rscdel
# - (removes a feature)
# imageadd
# - (adds an image or sprite)
# imagedel
# - (removes an image or sprite)
# spellcheck
# - (fixes spelling or grammar)
# experiment
# - (experimental change)
# balance
# - (balance changes)
# code_imp
# - (misc internal code change)
# refactor
# - (refactors code)
# config
# - (makes a change to the config files)
# admin
# - (makes changes to administrator tools)
# server
# - (miscellaneous changes to server)
#################################

# Your name.
author: SimpleMaroon

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
changes:
- rscadd: "You can now click on another mob with the Journalist's handheld microphone to hold it up to them. Doing so will only broadcast that mob's next message, no one else's."
- qol: "The Journalist's press camera drone can now broadcast off-ship."
Loading