Skip to content

Commit

Permalink
Removes comms consoles from ships and ruins (#3000)
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
replaces all ruin and ship comms consoles with frames
<!-- 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
Ships should not have access to some of these global things

![image](https://github.com/shiptest-ss13/Shiptest/assets/86381784/38354c7b-c902-441a-b814-d86eb1e6630a)

<!-- 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:
del: Removed comms consoles from ruins and ships
/: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 authored May 24, 2024
1 parent e9f32f4 commit 014139b
Show file tree
Hide file tree
Showing 13 changed files with 21 additions and 32 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7195,7 +7195,7 @@
/turf/open/floor/plating/rust,
/area/ruin/jungle/starport)
"WR" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 4
},
/turf/open/floor/mineral/plastitanium/red,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@
/turf/open/floor/plasteel,
/area/ruin/jungle/cavecrew/hallway)
"ei" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 8
},
/obj/effect/turf_decal/techfloor{
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_paradise.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1711,7 +1711,7 @@
/turf/open/floor/mineral/titanium/white,
/area/overmap_encounter/planetoid/cave/explored)
"kk" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 4
},
/turf/open/floor/mineral/titanium/blue,
Expand Down
3 changes: 1 addition & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2744,9 +2744,8 @@
/turf/open/floor/plasteel/tech/grid,
/area/ruin/rockplanet/nanotrasen)
"WY" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 1;
req_access = null
},
/obj/effect/turf_decal/corner/opaque/red/diagonal,
/turf/open/floor/plasteel/tech/techmaint,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/astraeus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1724,7 +1724,7 @@
/turf/open/floor/plasteel/airless,
/area/ruin/space/has_grav/astraeus/munitions)
"TV" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plating/airless,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/ntfacility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1633,7 +1633,7 @@
dir = 8
},
/obj/structure/window/reinforced,
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 1
},
/turf/open/floor/wood,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/onehalf.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1766,7 +1766,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/onehalf)
"Gv" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plasteel,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4857,7 +4857,7 @@
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"VV" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 8
},
/obj/effect/turf_decal/techfloor{
Expand Down
9 changes: 4 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1467,9 +1467,8 @@
/turf/closed/wall/mineral/titanium/nodiagonal,
/area/ship/cargo/port)
"ph" = (
/obj/machinery/computer/communications{
dir = 8;
icon_state = "computer-left"
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
Expand Down Expand Up @@ -1934,7 +1933,7 @@
/obj/structure/railing,
/obj/machinery/computer/atmos_control/incinerator{
dir = 4;
sensors = list("gecko_burn_sensor"="Combustion Chamber")
sensors = list("gecko_burn_sensor"="Combustion Chamber")
},
/turf/open/floor/plasteel/tech/techmaint,
/area/ship/engineering/engine)
Expand Down Expand Up @@ -2853,7 +2852,7 @@
"CI" = (
/obj/machinery/computer/helm{
dir = 8;
icon_state = "computer-middle"
icon_state = "computer-left"
},
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
Expand Down
8 changes: 3 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2334,9 +2334,8 @@
/turf/open/floor/plasteel,
/area/ship/crew/cryo)
"pm" = (
/obj/machinery/computer/communications{
dir = 8;
icon_state = "computer-right"
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
Expand Down Expand Up @@ -3088,8 +3087,7 @@
/area/ship/bridge)
"ud" = (
/obj/machinery/computer/helm{
dir = 8;
icon_state = "computer-left"
dir = 8
},
/turf/open/floor/plasteel/tech/grid,
/area/ship/bridge)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2693,7 +2693,7 @@
/turf/open/floor/wood,
/area/ship/hallway/central)
"uY" = (
/obj/machinery/computer/communications{
/obj/structure/frame/computer{
dir = 8
},
/obj/effect/turf_decal/corner/opaque/ntblue/half{
Expand Down
8 changes: 2 additions & 6 deletions _maps/shuttles/pirate/pirate_noderider.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -435,9 +435,7 @@
id = "noderiders";
name = "cargo airshield"
},
/obj/machinery/computer/crew{
icon_state = "computer-right"
},
/obj/machinery/computer/crew,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"fG" = (
Expand Down Expand Up @@ -1570,9 +1568,7 @@
pixel_y = 25
},
/obj/machinery/firealarm/directional/west,
/obj/machinery/computer/communications{
icon_state = "computer-left"
},
/obj/structure/frame/computer,
/obj/machinery/light/small/built/directional/north{
pixel_x = 16
},
Expand Down
9 changes: 3 additions & 6 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2560,11 +2560,8 @@
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 4
},
/obj/machinery/computer/communications{
dir = 8;
req_access = list(151);
set_obj_flags = "EMAGGED";
icon_state = "computer-right"
/obj/structure/frame/computer{
dir = 8
},
/turf/open/floor/mineral/plastitanium,
/area/ship/bridge)
Expand Down Expand Up @@ -4262,7 +4259,7 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/machinery/computer/helm{
dir = 8;
icon_state = "computer-middle"
icon_state = "computer-right"
},
/obj/effect/turf_decal/corner/opaque/syndiered/half{
dir = 4
Expand Down

0 comments on commit 014139b

Please sign in to comment.