Skip to content

Commit

Permalink
Survival boxes now have radios (#2852)
Browse files Browse the repository at this point in the history 
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## 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
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Less lag.
now every ship densest need 700 radios

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: all radios start off
tweak: all survival boxs start with a radio
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
@FalloutFalcon
FalloutFalcon authored Apr 12, 2024
1 parent aade1d8 commit 7b6da27
Show file tree
Hide file tree
Showing 24 changed files with 52 additions and 149 deletions.
7 changes: 2 additions & 5 deletions _maps/RandomRuins/BeachRuins/beach_crashed_starwalker.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down Expand Up @@ -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{
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
5 changes: 1 addition & 4 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/RockRuins/rockplanet_crash.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,7 +906,7 @@
/area/ruin/unpowered)
"BX" = (
/obj/structure/table,
/obj/item/radio/off{
/obj/item/radio{
pixel_x = 6;
pixel_y = 14
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SandRuins/whitesands_surface_pubbyslopcrash.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/scav_mining.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand All @@ -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)
Expand Down
5 changes: 1 addition & 4 deletions _maps/outpost/nanotrasen_asteroid.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/independent/independent_dwayne.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@
pixel_x = -9;
pixel_y = 7
},
/obj/item/radio/off{
/obj/item/radio{
pixel_x = 6;
pixel_y = 7
},
Expand Down Expand Up @@ -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
},
Expand Down
4 changes: 2 additions & 2 deletions _maps/shuttles/independent/independent_kilo.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
42 changes: 9 additions & 33 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
},
Expand Down Expand Up @@ -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
},
Expand Down
6 changes: 3 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_meta.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@
pixel_x = -2;
pixel_y = -4
},
/obj/item/radio/off{
/obj/item/radio{
pixel_x = 6;
pixel_y = 7
},
Expand Down Expand Up @@ -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
},
Expand Down
60 changes: 12 additions & 48 deletions _maps/shuttles/pirate/pirate_ember.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
},
Expand Down
2 changes: 1 addition & 1 deletion code/_globalvars/lists/maintenance_loot.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/effects/spawners/lootdrop.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 1 addition & 7 deletions code/game/objects/items/devices/radio/radio.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down
Loading

0 comments on commit 7b6da27

Please sign in to comment.