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

Eyebots now come with a portable intercom #18085

Merged
merged 2 commits into from Apr 16, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/mob/living/silicon/hivebot.dm
Expand Up @@ -933,7 +933,7 @@ Frequency:
if (ticker?.mode && istype(ticker.mode, /datum/game_mode/construction))
src.module = new /obj/item/robot_module/construction_ai( src )
else
src.module = new /obj/item/robot_module( src )
src.module = new /obj/item/robot_module/eyebot( src )
hud.update_tool_selector()

//ew
Expand Down
5 changes: 5 additions & 0 deletions code/modules/robotics/robot/module/construction_ai.dm
@@ -1,3 +1,8 @@
// used to add some tools to AI shells in construction mode
/obj/item/robot_module/construction_ai
included_tools = /datum/robot/module_tool_creator/recursive/module/construction_ai

// Using this code for normal eyebot stuff because this file hasn't been used in over ten years thus I can claim squatter rights (I could make my own file but that seems bloaty for two lines of code)

/obj/item/robot_module/eyebot
included_tools = /datum/robot/module_tool_creator/recursive/module/eyebot
5 changes: 5 additions & 0 deletions code/modules/robotics/robot/module_tool_creator/modules.dm
Expand Up @@ -186,6 +186,11 @@
// TODO: make cargo transporter (i.e. atmosporter, but allow single crate instead of canisters)
)

/datum/robot/module_tool_creator/recursive/module/eyebot
definitions = list(
/datum/robot/module_tool_creator/recursive/module/common,
/obj/item/device/radio/intercom/AI/handheld)

//These are not publically used anymore
/datum/robot/module_tool_creator/recursive/module/construction_ai
definitions = list(
Expand Down
10 changes: 9 additions & 1 deletion code/obj/item/device/radios/intercoms.dm
Expand Up @@ -2,7 +2,7 @@ TYPEINFO(/obj/item/device/radio/intercom)
mats = 3

/obj/item/device/radio/intercom
name = "Station Intercom (Radio)"

ThatFiveGuys marked this conversation as resolved.
Show resolved Hide resolved
#ifndef IN_MAP_EDITOR
icon_state = "intercom"
#else
Expand Down Expand Up @@ -358,3 +358,11 @@ TYPEINFO(/obj/item/device/radio/intercom)

update_pixel_offset_dir()
return // no

/obj/item/device/radio/intercom/AI/handheld
name = "Portable Intercom"
desc = "A portable intercom that's useful to do all the things intercoms normally do, which is mostly listening in on people."
broadcasting = FALSE
listening = FALSE
anchored = UNANCHORED
icon_state = "intercom_pot"
Binary file modified icons/obj/items/device.dmi
Binary file not shown.