Skip to content

Commit

Permalink
[MIRROR] Nukes radio.dmi, adds inhands for somewhat relevant items. […
Browse files Browse the repository at this point in the history
…MDB IGNORE] (#25147)

* Nukes radio.dmi, adds inhands for somewhat relevant items. (#79792)

Third /icon/ cleansing splinter 1. Comments on commits say all it does
pretty much.

![image](https://github.com/tgstation/tgstation/assets/122572637/6540e588-bed8-4e98-81f5-2a6f449c53c3)

Inhand for walkietalkie was requested in the project, gets rid of some
usecases of old 'gangtool', headset splitoff requested by Fazzie.
Inhands reflecting the items they are supposed to represent is nice.

:cl:
image: Following now have unique item sprites: syndicate war declaration
radio, curator and chief beacon's, chaplain beacon.
image: Following now have unique inhand sprites: radio, export scanner,
walkie-talkie, syndicate war declaration radio, curator and chief
beacon's, chaplain beacon.
/:cl:

* Nukes radio.dmi, adds inhands for somewhat relevant items.

---------

Co-authored-by: YesterdaysPromise <[email protected]>
  • Loading branch information
2 people authored and FFMirrorBot committed Nov 20, 2023
1 parent 8b905c9 commit 67150d2
Show file tree
Hide file tree
Showing 40 changed files with 57 additions and 50 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomZLevels/SnowCabin.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4459,7 +4459,7 @@
/obj/structure/signpost/salvation{
density = 0;
desc = "An intercomm. Someone seems to be on the other end. I should use it.";
icon = 'icons/obj/radio.dmi';
icon = 'icons/obj/device.dmi';
icon_state = "intercom";
max_integrity = 99999;
name = "\proper Fun Jail intercom";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,52 +167,52 @@

/datum/greyscale_config/encryptionkey_basic
name = "Basic Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_basic.json'

/datum/greyscale_config/encryptionkey_cube
name = "Block Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_cube.json'

/datum/greyscale_config/encryptionkey_research
name = "Research Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_research.json'

/datum/greyscale_config/encryptionkey_syndicate
name = "Syndicate Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_syndicate.json'

/datum/greyscale_config/encryptionkey_medical
name = "Medical Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_medical.json'

/datum/greyscale_config/encryptionkey_service
name = "Service Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_service.json'

/datum/greyscale_config/encryptionkey_engineering
name = "Engineering Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_engineering.json'

/datum/greyscale_config/encryptionkey_centcom
name = "Centcom Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_centcom.json'

/datum/greyscale_config/encryptionkey_cargo
name = "Cargo Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_cargo.json'

/datum/greyscale_config/encryptionkey_security
name = "Security Encryptionkey"
icon_file = 'icons/obj/radio.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/encryptionkey_security.json'

/datum/greyscale_config/quantum_keycard
Expand Down Expand Up @@ -344,7 +344,7 @@

/datum/greyscale_config/circuit
name = "Circuit Board"
icon_file = 'icons/obj/assemblies/module.dmi'
icon_file = 'icons/obj/assemblies/circuitry_n_data.dmi'
json_config = 'code/datums/greyscale/json_configs/circuit.json'

/datum/greyscale_config/janicart_upgrade
Expand Down
2 changes: 1 addition & 1 deletion code/datums/mutations/antenna.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
/obj/item/implant/radio/antenna
name = "internal antenna organ"
desc = "The internal organ part of the antenna. Science has not yet given it a good name."
icon = 'icons/obj/radio.dmi'//maybe make a unique sprite later. not important
icon = 'icons/obj/device.dmi'//maybe make a unique sprite later. not important
icon_state = "walkietalkie"

/obj/item/implant/radio/antenna/Initialize(mapload)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/AI_modules/_AI_modules.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

/obj/item/ai_module
name = "\improper AI module"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "std_mod"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
Expand Down
12 changes: 9 additions & 3 deletions code/game/objects/items/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,8 @@
/obj/item/choice_beacon/ingredient
name = "ingredient delivery beacon"
desc = "Summon a box of ingredients to help you get started cooking."
icon_state = "gangtool-white"
icon_state = "sb_delivery"
inhand_icon_state = "sb_delivery"
company_source = "Sophronia Broadcasting"
company_message = span_bold("Please enjoy your Sophronia Broadcasting's 'Plasteel Chef' Ingredients Box, exactly as shown in the hit show!")

Expand All @@ -86,6 +87,8 @@
/obj/item/choice_beacon/hero
name = "heroic beacon"
desc = "To summon heroes from the past to protect the future."
icon_state = "sb_delivery"
inhand_icon_state = "sb_delivery"
company_source = "Sophronia Broadcasting"
company_message = span_bold("Please enjoy your Sophronia Broadcasting's 'History Comes Alive branded' Costume Set, exactly as shown in the hit show!")

Expand Down Expand Up @@ -129,7 +132,11 @@

/obj/item/choice_beacon/holy
name = "armaments beacon"
desc = "Contains a set of armaments for the chaplain."
desc = "Summon a set of standard issue chaplain armaments, as dictated by I.C.R.A."
icon_state = "icra_delivery"
inhand_icon_state = "icra_delivery"
company_source = "Interstellar Conservation of Religion Association"
company_message = span_bold("A choice has already been made.")

/obj/item/choice_beacon/holy/can_use_beacon(mob/living/user)
if(user.mind?.holy_role)
Expand All @@ -141,7 +148,6 @@
// Overrides generate options so that we can show a neat radial instead
/obj/item/choice_beacon/holy/open_options_menu(mob/living/user)
if(GLOB.holy_armor_type)
to_chat(user, span_warning("A selection has already been made."))
consume_use(GLOB.holy_armor_type, user)
return

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/circuitboards/circuitboard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
name = "circuit board"
/// extension that is applied after the initial name AKA (Computer/Machine Board)
var/name_extension = null
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "circuit_map"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/obj/item/electroadaptive_pseudocircuit
name = "electroadaptive pseudocircuit"
desc = "An all-in-one circuit imprinter, designer, synthesizer, outfitter, creator, and chef. It can be used in place of any generic circuit board during construction."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "boris"
w_class = WEIGHT_CLASS_TINY
custom_materials = list(/datum/material/iron = SMALL_MATERIAL_AMOUNT * 0.5, /datum/material/glass = SMALL_MATERIAL_AMOUNT * 3)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/electropack.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/electropack
name = "electropack"
desc = "Dance my monkeys! DANCE!!!"
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/device.dmi'
icon_state = "electropack0"
inhand_icon_state = "electropack"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/radio/encryptionkey.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/encryptionkey
name = "standard encryption key"
desc = "An encryption key for a radio headset."
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "cypherkey_basic"
w_class = WEIGHT_CLASS_TINY
/// Can this radio key access the binary radio channel?
Expand Down
1 change: 1 addition & 0 deletions code/game/objects/items/devices/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
/obj/item/radio/headset
name = "radio headset"
desc = "An updated, modular intercom that fits over the head. Takes encryption keys."
icon = 'icons/obj/clothing/headsets.dmi'
icon_state = "headset"
inhand_icon_state = "headset"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/devices/radio/radio.dm
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#define FREQ_LISTENING (1<<0)

/obj/item/radio
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/device.dmi'
name = "station bounced radio"
icon_state = "walkietalkie"
inhand_icon_state = "radio"
inhand_icon_state = "walkietalkie"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
worn_icon_state = "radio"
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/implants/implant_misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
var/obj/item/radio/radio
var/radio_key
var/subspace_transmission = FALSE
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/device.dmi'
icon_state = "walkietalkie"

/obj/item/implant/radio/activate()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/implants/implantuplink.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/implant/uplink
name = "uplink implant"
desc = "Sneeki breeki."
icon = 'icons/obj/radio.dmi'
icon = 'icons/obj/device.dmi'
icon_state = "radio"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/rcd/RHD.dm
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@
/obj/item/rcd_upgrade
name = "RCD advanced design disk"
desc = "It seems to be empty."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "datadisk3"
var/upgrade

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/rcd/RPD.dm
Original file line number Diff line number Diff line change
Expand Up @@ -655,7 +655,7 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
/obj/item/rpd_upgrade
name = "RPD advanced design disk"
desc = "It seems to be empty."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "datadisk3"
/// Bitflags for upgrades
var/upgrade_flags
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/robot/ai_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
/obj/item/malf_upgrade
name = "combat software upgrade"
desc = "A highly illegal, highly dangerous upgrade for artificial intelligence units, granting them a variety of powers as well as the ability to hack APCs.<br>This upgrade does not override any active laws, and must be applied directly to an active AI core."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "datadisk3"


Expand Down Expand Up @@ -34,7 +34,7 @@
/obj/item/surveillance_upgrade
name = "surveillance software upgrade"
desc = "An illegal software package that will allow an artificial intelligence to 'hear' from its cameras via lip reading and hidden microphones."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "datadisk3"

/obj/item/surveillance_upgrade/pre_attack(atom/A, mob/living/user, proximity)
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/robot/robot_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/obj/item/borg/upgrade
name = "borg upgrade module."
desc = "Protected by FRM."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "cyborg_upgrade"
w_class = WEIGHT_CLASS_SMALL
var/locked = FALSE
Expand Down Expand Up @@ -268,7 +268,7 @@
/obj/item/borg/upgrade/lavaproof
name = "mining cyborg lavaproof chassis"
desc = "An upgrade kit to apply specialized coolant systems and insulation layers to a mining cyborg's chassis, enabling them to withstand exposure to molten rock and liquid plasma."
icon_state = "ash_plating"
icon_state = "cyborg_ash_tracks"
resistance_flags = LAVA_PROOF | FIRE_PROOF | FREEZE_PROOF
require_model = TRUE
model_type = list(/obj/item/robot_model/miner)
Expand Down Expand Up @@ -932,7 +932,7 @@
name = "cyborg emergency reboot module"
desc = "A reusable firmware reset tool that can force a reboot of a disabled-but-repaired cyborg, bringing it back online."
w_class = WEIGHT_CLASS_SMALL
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "cyborg_upgrade1"

/obj/item/borg_restart_board/pre_attack(mob/living/silicon/robot/borgo, mob/living/user, params)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/wall_mounted.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@

/obj/item/electronics
desc = "Looks like a circuit. Probably is."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "door_electronics"
inhand_icon_state = "electronic"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/obj/item/disk
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
w_class = WEIGHT_CLASS_TINY
inhand_icon_state = "card-id"
lefthand_file = 'icons/mob/inhands/equipment/idcards_lefthand.dmi'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ GLOBAL_LIST_EMPTY(jam_on_wardec)
/obj/item/nuclear_challenge
name = "Declaration of War (Challenge Mode)"
icon = 'icons/obj/device.dmi'
icon_state = "gangtool-red"
inhand_icon_state = "radio"
icon_state = "nukietalkie"
inhand_icon_state = "nukietalkie"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
desc = "Use to send a declaration of hostilities to the target, delaying your shuttle departure for 20 minutes while they prepare for your assault. \
Expand Down
2 changes: 1 addition & 1 deletion code/modules/bitrunning/objects/debug.dm
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/bitrunning_debug
name = "bitrunning debug item"
desc = "Adds points and reduces cooldown time for debugging"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
base_icon_state = "datadisk"
icon_state = "datadisk0"

2 changes: 1 addition & 1 deletion code/modules/bitrunning/objects/disks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
/obj/item/bitrunning_disk
name = "generic bitrunning program"
desc = "A disk containing source code."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
base_icon_state = "datadisk"
icon_state = "datadisk0"
/// Name of the choice made
Expand Down
2 changes: 1 addition & 1 deletion code/modules/cargo/supplypod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -704,7 +704,7 @@
/obj/item/disk/cargo/bluespace_pod //Disk that can be inserted into the Express Console to allow for Advanced Bluespace Pods
name = "Bluespace Drop Pod Upgrade"
desc = "This disk provides a firmware update to the Express Supply Console, granting the use of Nanotrasen's Bluespace Drop Pods to the supply department."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "cargodisk"
inhand_icon_state = "card-id"
w_class = WEIGHT_CLASS_SMALL
2 changes: 1 addition & 1 deletion code/modules/cargo/universal_scanner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
desc = "A device used to check objects against Nanotrasen exports database, assign price tags, or ready an item for a custom vending machine."
icon = 'icons/obj/device.dmi'
icon_state = "export scanner"
inhand_icon_state = "radio"
inhand_icon_state = "export_scanner"
lefthand_file = 'icons/mob/inhands/items/devices_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items/devices_righthand.dmi'
item_flags = NOBLUDGEON
Expand Down
2 changes: 1 addition & 1 deletion code/modules/library/skill_learning/skillchip.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
name = "skillchip"
desc = "This biochip integrates with user's brain to enable mastery of specific skill. Consult certified Nanotrasen neurosurgeon before use."

icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "skillchip"
custom_price = PAYCHECK_CREW * 3
w_class = WEIGHT_CLASS_SMALL
Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/living/basic/minebots/minebot_upgrades.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "minebot melee upgrade"
desc = "A minebot upgrade."
icon_state = "door_electronics"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'

/obj/item/mine_bot_upgrade/afterattack(mob/living/basic/mining_drone/minebot, mob/user, proximity)
. = ..()
Expand Down Expand Up @@ -39,7 +39,7 @@
name = "minebot AI upgrade"
desc = "Can be used to grant sentience to minebots. It's incompatible with minebot armor and melee upgrades, and will override them."
icon_state = "door_electronics"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
sentience_type = SENTIENCE_MINEBOT
///health boost to add
var/base_health_add = 5
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/robot/robot_model.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
**/
/obj/item/robot_model
name = "Default"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "std_mod"
w_class = WEIGHT_CLASS_GIGANTIC
inhand_icon_state = "electronic"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/computer_disk
name = "data disk"
desc = "Removable disk used to store data."
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
icon_state = "datadisk6"
w_class = WEIGHT_CLASS_TINY
///The amount of storage space is on the disk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@
name = "minebot cooldown decrease"
desc = "Decreases the cooldown of a kinetic accelerator. Only rated for minebot use."
icon_state = "door_electronics"
icon = 'icons/obj/assemblies/module.dmi'
icon = 'icons/obj/assemblies/circuitry_n_data.dmi'
denied_type = /obj/item/borg/upgrade/modkit/cooldown/minebot
modifier = 10
cost = 0
Expand Down
Loading

0 comments on commit 67150d2

Please sign in to comment.