From 7b6da277229c727b179bc8dfd2df3adf58657aeb Mon Sep 17 00:00:00 2001 From: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com> Date: Fri, 12 Apr 2024 03:47:43 -0500 Subject: [PATCH] Survival boxes now have radios (#2852) ## About The Pull Request All radios now start turned off. All survival boxes now have radios. Also some random cleanup. like 100 radios varedited radios in the exact same way. Removed some boxes originally designed to give radios ## Why It's Good For The Game Less lag. now every ship densest need 700 radios ## Changelog :cl: tweak: all radios start off tweak: all survival boxs start with a radio /:cl: --- .../BeachRuins/beach_crashed_starwalker.dmm | 7 +-- .../JungleRuins/jungle_paradise.dmm | 5 +- .../RockRuins/rockplanet_budgetcuts.dmm | 5 +- .../RockRuins/rockplanet_crash.dmm | 2 +- .../whitesands_surface_pubbyslopcrash.dmm | 2 +- _maps/RandomRuins/SpaceRuins/scav_mining.dmm | 2 +- _maps/map_files/generic/CentCom.dmm | 4 +- _maps/outpost/nanotrasen_asteroid.dmm | 5 +- .../independent/independent_dwayne.dmm | 4 +- .../shuttles/independent/independent_kilo.dmm | 4 +- .../shuttles/nanotrasen/nanotrasen_heron.dmm | 42 +++---------- _maps/shuttles/nanotrasen/nanotrasen_meta.dmm | 6 +- _maps/shuttles/pirate/pirate_ember.dmm | 60 ++++--------------- code/_globalvars/lists/maintenance_loot.dm | 2 +- .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../game/objects/items/devices/radio/radio.dm | 8 +-- code/game/objects/items/storage/boxes.dm | 18 +----- code/game/objects/items/storage/toolbox.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 2 +- .../modules/client/loadout/loadout_general.dm | 4 -- .../clothing/outfits/ert/nanotrasen_ert.dm | 7 +-- .../clothing/outfits/factions/minutemen.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 4 +- .../research/designs/autolathe_designs.dm | 2 +- 24 files changed, 52 insertions(+), 149 deletions(-) diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm index 346458a87daf..0839518362b4 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm @@ -1159,10 +1159,7 @@ /obj/item/flashlight/lantern{ pixel_x = 8 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = -2 }, @@ -3103,7 +3100,7 @@ /obj/structure/cable/blue{ icon_state = "2-8" }, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = -7 }, /turf/open/floor/plating{ diff --git a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm index cda541385b56..bc462784bca8 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_paradise.dmm @@ -2879,10 +2879,7 @@ /obj/structure/railing{ layer = 3.9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 4; pixel_y = 5 }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm index b1ccc301325d..8d066f6f04b4 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm @@ -760,10 +760,7 @@ /obj/structure/table/reinforced{ color = "#c1b6a5" }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, diff --git a/_maps/RandomRuins/RockRuins/rockplanet_crash.dmm b/_maps/RandomRuins/RockRuins/rockplanet_crash.dmm index 2d69be814e35..43db217f9dcb 100644 --- a/_maps/RandomRuins/RockRuins/rockplanet_crash.dmm +++ b/_maps/RandomRuins/RockRuins/rockplanet_crash.dmm @@ -906,7 +906,7 @@ /area/ruin/unpowered) "BX" = ( /obj/structure/table, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = 6; pixel_y = 14 }, diff --git a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm index 244eef61fa03..e4d83a8eb842 100644 --- a/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm +++ b/_maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm @@ -686,7 +686,7 @@ "oO" = ( /obj/structure/table/reinforced, /obj/item/laser_pointer, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = 6; pixel_y = 14 }, diff --git a/_maps/RandomRuins/SpaceRuins/scav_mining.dmm b/_maps/RandomRuins/SpaceRuins/scav_mining.dmm index 48476edb1b82..cc1e434dc75b 100644 --- a/_maps/RandomRuins/SpaceRuins/scav_mining.dmm +++ b/_maps/RandomRuins/SpaceRuins/scav_mining.dmm @@ -347,7 +347,7 @@ /turf/open/floor/plating/airless, /area/ruin/space/has_grav/scav_mining/core) "xC" = ( -/obj/item/radio/off, +/obj/item/radio, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable{ icon_state = "1-2" diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 2901c166a10c..bd6d72b49562 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -3929,7 +3929,7 @@ /area/centcom/evac) "aLE" = ( /obj/structure/table, -/obj/item/radio/off, +/obj/item/radio, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "aLF" = ( @@ -3955,7 +3955,7 @@ /area/centcom/evac) "aLJ" = ( /obj/structure/table, -/obj/item/radio/off, +/obj/item/radio, /obj/machinery/light/directional/east, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) diff --git a/_maps/outpost/nanotrasen_asteroid.dmm b/_maps/outpost/nanotrasen_asteroid.dmm index 800ea0cf0cbb..2ea6c907e80e 100644 --- a/_maps/outpost/nanotrasen_asteroid.dmm +++ b/_maps/outpost/nanotrasen_asteroid.dmm @@ -3191,10 +3191,7 @@ /area/outpost/crew/bar) "lS" = ( /obj/structure/table/reinforced, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 4 }, diff --git a/_maps/shuttles/independent/independent_dwayne.dmm b/_maps/shuttles/independent/independent_dwayne.dmm index 4e7e52e85dff..f72fb5396d21 100644 --- a/_maps/shuttles/independent/independent_dwayne.dmm +++ b/_maps/shuttles/independent/independent_dwayne.dmm @@ -563,7 +563,7 @@ pixel_x = -9; pixel_y = 7 }, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = 6; pixel_y = 7 }, @@ -2125,7 +2125,7 @@ "WL" = ( /obj/structure/table, /obj/item/storage/belt/utility, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = 6; pixel_y = 7 }, diff --git a/_maps/shuttles/independent/independent_kilo.dmm b/_maps/shuttles/independent/independent_kilo.dmm index 29264dd2958f..556b235dafc5 100644 --- a/_maps/shuttles/independent/independent_kilo.dmm +++ b/_maps/shuttles/independent/independent_kilo.dmm @@ -2267,11 +2267,11 @@ /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, /obj/item/storage/belt/utility, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = -3; pixel_y = 3 }, -/obj/item/radio/off, +/obj/item/radio, /obj/effect/turf_decal/industrial/hatch/yellow, /turf/open/floor/mineral/plastitanium, /area/ship/cargo) diff --git a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm index 24e603883385..ba2c8c61533e 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_heron.dmm @@ -3851,7 +3851,7 @@ "oa" = ( /obj/item/multitool, /obj/item/clothing/glasses/meson/engine/tray, -/obj/item/radio/off, +/obj/item/radio, /obj/item/storage/belt/utility/atmostech, /obj/item/holosign_creator/atmos, /obj/item/analyzer, @@ -8660,52 +8660,31 @@ /obj/item/flashlight, /obj/item/flashlight, /obj/item/flashlight, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 2 }, @@ -10507,10 +10486,7 @@ "MM" = ( /obj/effect/turf_decal/corner/transparent/beige/full, /obj/structure/table, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = -5; pixel_y = 10 }, diff --git a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm index 70be6e034c6c..e01ceabaf3b3 100644 --- a/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm +++ b/_maps/shuttles/nanotrasen/nanotrasen_meta.dmm @@ -227,7 +227,7 @@ pixel_x = -2; pixel_y = -4 }, -/obj/item/radio/off{ +/obj/item/radio{ pixel_x = 6; pixel_y = 7 }, @@ -2237,8 +2237,8 @@ /obj/item/storage/belt/utility{ pixel_y = 6 }, -/obj/item/radio/off, -/obj/item/radio/off{ +/obj/item/radio, +/obj/item/radio{ pixel_x = -3; pixel_y = 3 }, diff --git a/_maps/shuttles/pirate/pirate_ember.dmm b/_maps/shuttles/pirate/pirate_ember.dmm index 8ab4711581dc..2694926c67ae 100644 --- a/_maps/shuttles/pirate/pirate_ember.dmm +++ b/_maps/shuttles/pirate/pirate_ember.dmm @@ -7756,87 +7756,51 @@ pixel_y = -28; dir = 1 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, -/obj/item/radio{ - desc = "An old handheld radio. You could use it, if you really wanted to."; - icon_state = "radio"; - name = "old radio"; +/obj/item/radio/old{ pixel_x = 2; pixel_y = 9 }, diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 0091b88fa15f..59f25efe9823 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -138,7 +138,7 @@ GLOBAL_LIST_INIT(common_loot, list( //common: basic items ) = 1, list(//misc - /obj/item/radio/off = 1, + /obj/item/radio = 1, /obj/item/extinguisher = 1, /obj/item/tank/internals/emergency_oxygen = 1, /obj/item/bodybag = 1, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index 3370c8b4543d..d763c46e84e9 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -87,7 +87,7 @@ /obj/item/assembly/flash/handheld = 1, /obj/item/restraints/handcuffs/cable/zipties = 1, /obj/item/restraints/handcuffs = 1, - /obj/item/radio/off = 1, + /obj/item/radio = 1, /obj/item/lighter = 3, /obj/item/storage/box/matches = 3, /obj/item/reagent_containers/syringe/contraband/space_drugs = 1, diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index dc35bebb1e30..cc528f103fe2 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -27,7 +27,7 @@ var/last_chatter_time // The time since we last played a radio chatter sound. (WS edit - Radio Chatter #434) var/broadcasting = FALSE // Whether the radio will transmit dialogue it hears nearby. - var/listening = TRUE // Whether the radio is currently receiving. + var/listening = FALSE // Whether the radio is currently receiving. var/prison_radio = FALSE // If true, the transmit wire starts cut. var/unscrewed = FALSE // Whether wires are accessible. Toggleable by screwdrivering. var/freerange = FALSE // If true, the radio has access to the full spectrum. @@ -436,12 +436,6 @@ recalculateChannels() - -/obj/item/radio/off // Station bounced radios, their only difference is spawning with the speakers off, this was made to help the lag. - listening = 0 // And it's nice to have a subtype too for future features. - dog_fashion = /datum/dog_fashion/back - - /obj/item/radio/old name = "old radio" icon_state = "radio" diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 3c9395208fad..d3b5913bbd86 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -121,9 +121,11 @@ var/mask_type = /obj/item/clothing/mask/breath var/internal_type = /obj/item/tank/internals/emergency_oxygen var/medipen_type = /obj/item/reagent_containers/hypospray/medipen + var/radio_type = /obj/item/radio /obj/item/storage/box/survival/PopulateContents() new mask_type(src) + new radio_type(src) if(!isnull(medipen_type)) new medipen_type(src) @@ -132,10 +134,6 @@ else new /obj/item/tank/internals/plasmaman/belt(src) -/obj/item/storage/box/survival/radio/PopulateContents() - ..() // we want the survival stuff too. - new /obj/item/radio/off(src) - // Mining survival box /obj/item/storage/box/survival/mining mask_type = /obj/item/clothing/mask/gas/explorer @@ -148,10 +146,6 @@ /obj/item/storage/box/survival/engineer internal_type = /obj/item/tank/internals/emergency_oxygen/engi -/obj/item/storage/box/survival/engineer/radio/PopulateContents() - ..() // we want the regular items too. - new /obj/item/radio/off(src) - // Syndie survival box /obj/item/storage/box/survival/syndie mask_type = /obj/item/clothing/mask/gas/syndicate @@ -162,10 +156,6 @@ /obj/item/storage/box/survival/security mask_type = /obj/item/clothing/mask/gas/sechailer -/obj/item/storage/box/survival/security/radio/PopulateContents() - ..() // we want the regular stuff too - new /obj/item/radio/off(src) - // Medical survival box /obj/item/storage/box/survival/medical mask_type = /obj/item/clothing/mask/breath/medical @@ -173,10 +163,6 @@ /obj/item/storage/box/survival/clip internal_type = /obj/item/tank/internals/emergency_oxygen/engi //clip actually cares about their personnel -/obj/item/storage/box/survival/clip/PopulateContents() - . = ..() - new /obj/item/radio/off(src) - /obj/item/storage/box/survival/clip/balaclava mask_type = /obj/item/clothing/mask/gas/sechailer/balaclava diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index 7b02bd6b19d3..c703aeb38a0d 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -56,7 +56,7 @@ new /obj/item/flashlight/glowstick(src) if(3) new /obj/item/flashlight/flare(src) - new /obj/item/radio/off(src) + new /obj/item/radio(src) /obj/item/storage/toolbox/emergency/old name = "rusty red toolbox" diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index abc67e252d52..112218650f85 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -149,7 +149,7 @@ name = "Demonic Friend" uniform = /obj/item/clothing/under/misc/assistantformal shoes = /obj/item/clothing/shoes/laceup - r_pocket = /obj/item/radio/off + r_pocket = /obj/item/radio back = /obj/item/storage/backpack implants = list(/obj/item/implant/mindshield) //No revolutionaries, he's MY friend. id = /obj/item/card/id diff --git a/code/modules/client/loadout/loadout_general.dm b/code/modules/client/loadout/loadout_general.dm index 042315cc981f..5b8df328e6e2 100644 --- a/code/modules/client/loadout/loadout_general.dm +++ b/code/modules/client/loadout/loadout_general.dm @@ -102,10 +102,6 @@ display_name = "cane" path = /obj/item/cane -/datum/gear/radio - display_name = "hand radio" - path = /obj/item/radio - /datum/gear/lizard display_name = "toy, lizard plushie" path = /obj/item/toy/plush/lizardplushie diff --git a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm index 7e39f0b2f32a..36445abcdb5a 100644 --- a/code/modules/clothing/outfits/ert/nanotrasen_ert.dm +++ b/code/modules/clothing/outfits/ert/nanotrasen_ert.dm @@ -282,7 +282,7 @@ suit = /obj/item/clothing/suit/armor/vest/marine back = /obj/item/storage/backpack/ert backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, + /obj/item/storage/box/survival/engineer = 1, /obj/item/gun_voucher/nanotrasen = 1 ) belt = /obj/item/storage/belt/military/assault @@ -332,7 +332,7 @@ l_pocket = /obj/item/healthanalyzer head = /obj/item/clothing/head/helmet/marine/medic backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, + /obj/item/storage/box/survival/engineer = 1, /obj/item/gun_voucher/nanotrasen = 1, /obj/item/reagent_containers/hypospray/combat = 1, /obj/item/storage/firstaid/regular = 1, @@ -359,7 +359,7 @@ head = /obj/item/clothing/head/helmet/marine/engineer back = /obj/item/storage/backpack/ert/engineer backpack_contents = list( - /obj/item/storage/box/survival/engineer/radio = 1, + /obj/item/storage/box/survival/engineer = 1, /obj/item/gun_voucher/nanotrasen = 1, /obj/item/rcd_ammo/large = 2, ) @@ -460,6 +460,5 @@ glasses = /obj/item/clothing/glasses/hud/security/sunglasses back = /obj/item/storage/backpack/ert - box = /obj/item/storage/box/survival/radio l_pocket = /obj/item/megaphone/command r_pocket = /obj/item/binoculars diff --git a/code/modules/clothing/outfits/factions/minutemen.dm b/code/modules/clothing/outfits/factions/minutemen.dm index 9de9c0d152c3..a8ce0907a35a 100644 --- a/code/modules/clothing/outfits/factions/minutemen.dm +++ b/code/modules/clothing/outfits/factions/minutemen.dm @@ -308,7 +308,7 @@ suit = /obj/item/clothing/suit/armor/vest/capcarapace/clip shoes = /obj/item/clothing/shoes/combat - box = /obj/item/storage/box/survival/engineer/radio + box = /obj/item/storage/box/survival/engineer backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1) /datum/outfit/job/clip/minutemen/captain/general/admiral // for flavor, might remove outright diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index b602e948af98..3137933fa124 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -756,7 +756,7 @@ r_pocket = pickweight(list( /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, + /obj/item/radio = 3, /obj/item/grenade/syndieminibomb/concussion = 1, /obj/item/melee/transforming/energy/ctf/solgov = 1 ) @@ -765,7 +765,7 @@ l_pocket = pickweight(list( /obj/item/reagent_containers/hypospray/medipen/stimpack = 1, /obj/item/kitchen/knife/letter_opener = 3, - /obj/item/radio/off = 3, + /obj/item/radio = 3, /obj/item/grenade/syndieminibomb/concussion = 1, /obj/item/melee/transforming/energy/ctf/solgov = 1 ) diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index f580502e0b7a..7c43c3fc5acb 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -647,7 +647,7 @@ id = "bounced_radio" build_type = AUTOLATHE materials = list(/datum/material/iron = 75, /datum/material/glass = 25) - build_path = /obj/item/radio/off + build_path = /obj/item/radio category = list("initial", "T-Comm") /datum/design/intercom_frame