diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a4adf489985..bba9a0cb4b6 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -614,6 +614,18 @@ var/global/list/default_medbay_channels = list( channels[ch_name] = 0 ..() +/obj/item/device/radio/med + icon_state = "walkietalkie-med" + +/obj/item/device/radio/sec + icon_state = "walkietalkie-sec" + +/obj/item/device/radio/eng + icon_state = "walkietalkie-eng" + +/obj/item/device/radio/sci + icon_state = "walkietalkie-sci" + /////////////////////////////// //////////Borg Radios////////// /////////////////////////////// diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 510714384bc..fa095bbe28b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -118,7 +118,7 @@ new /obj/item/device/gps(src) new /obj/item/reagent_containers/hypospray(src) new /obj/item/taperoll/medical(src) - new /obj/item/device/radio(src) + new /obj/item/device/radio/med(src) new /obj/item/roller(src) new /obj/item/crowbar/red(src) new /obj/item/clothing/mask/gas/alt(src) diff --git a/html/changelogs/radiosprites.yml b/html/changelogs/radiosprites.yml new file mode 100644 index 00000000000..4b7ff9cae74 --- /dev/null +++ b/html/changelogs/radiosprites.yml @@ -0,0 +1,8 @@ +author: Sparky_hotdog + +delete-after: True + +changes: + - rscadd: "Added new station bounced radio sprites, as well as some department specific ones." + - maptweak: "Added three station bounced radios to telescience." + - maptweak: "Removed the virology uplink phone from medical reception." diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi index 1a052548a34..cc092005bce 100644 Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 94915a11904..c941c8b313e 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -23668,33 +23668,21 @@ /turf/simulated/floor/tiled/white, /area/crew_quarters/sleep/medical) "bbS" = ( -/obj/item/device/radio{ - frequency = 1487; - name = "Medbay Emergency Radio Link"; - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/device/radio{ - frequency = 1487; - name = "Medbay Emergency Radio Link"; - pixel_x = 5; - pixel_y = 5 - }, -/obj/item/device/radio{ - frequency = 1487; - name = "Medbay Emergency Radio Link"; - pixel_x = 5; - pixel_y = -5 - }, -/obj/item/device/radio{ - frequency = 1487; - name = "Medbay Emergency Radio Link"; - pixel_x = -5; - pixel_y = -5 - }, /obj/effect/floor_decal/corner/white/diagonal, /obj/structure/table/standard, /obj/machinery/firealarm/south, +/obj/item/device/radio/med{ + name = "Medbay Emergency Radio Link" + }, +/obj/item/device/radio/med{ + name = "Medbay Emergency Radio Link" + }, +/obj/item/device/radio/med{ + name = "Medbay Emergency Radio Link" + }, +/obj/item/device/radio/med{ + name = "Medbay Emergency Radio Link" + }, /turf/simulated/floor/tiled, /area/medical/medbay4) "bbT" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 06133a07138..5f19b297a3b 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -2811,10 +2811,6 @@ /area/security/main) "afx" = ( /obj/structure/table/standard, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, -/obj/item/device/radio, /obj/effect/floor_decal/corner/blue{ dir = 9 }, @@ -2822,8 +2818,11 @@ dir = 5 }, /obj/machinery/firealarm/north, -/obj/item/device/radio, -/obj/item/device/radio, +/obj/item/device/radio/sec, +/obj/item/device/radio/sec, +/obj/item/device/radio/sec, +/obj/item/device/radio/sec, +/obj/item/device/radio/sec, /turf/simulated/floor/tiled, /area/security/main) "afy" = ( @@ -7616,15 +7615,15 @@ /area/engineering/atmos/storage) "aoV" = ( /obj/structure/table/standard, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, /obj/effect/floor_decal/corner/blue{ dir = 1 }, /obj/effect/floor_decal/corner/yellow{ dir = 4 }, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, /turf/simulated/floor/tiled, /area/engineering/atmos/storage) "aoW" = ( @@ -19222,12 +19221,12 @@ /area/engineering/storage_eva) "aHA" = ( /obj/structure/table/standard, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, -/obj/item/device/radio/off, /obj/item/device/flashlight/heavy, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, +/obj/item/device/radio/eng, /turf/simulated/floor/tiled, /area/engineering/storage_eva) "aHB" = ( @@ -38717,15 +38716,6 @@ dir = 8 }, /obj/structure/table/standard, -/obj/item/device/radio{ - anchored = 1; - canhear_range = 1; - frequency = 1487; - icon_state = "red_phone"; - name = "Virology Lab Emergency Phone"; - pixel_x = 8; - pixel_y = -2 - }, /obj/effect/floor_decal/corner/grey/diagonal, /turf/simulated/floor/tiled/white, /area/medical/reception) @@ -62384,6 +62374,16 @@ }, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) +"ikn" = ( +/obj/structure/table/standard, +/obj/effect/floor_decal/corner_wide/mauve{ + dir = 6 + }, +/obj/item/device/radio/sci, +/obj/item/device/radio/sci, +/obj/item/device/radio/sci, +/turf/simulated/floor/tiled/white, +/area/rnd/telesci) "ikR" = ( /obj/random/gloves, /turf/simulated/floor/plating, @@ -93678,7 +93678,7 @@ aYh aEK auX bIN -azR +ikn azR ciy aCU