Skip to content

Commit

Permalink
Electrochromic Helpers, Placing Said Helpers in Atlas, and fixing Car…
Browse files Browse the repository at this point in the history
…go's Conveyor ID's (#6698)

<!-- 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
This PR adds a new mapping helper that lets you ID electrochromic
windows placed below, and IDs conveyors.
<!-- 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
Because we needed more control over what windows are affected by which
tint other than the surface area covered on windows placed by builders,
which could not be ID'd and because having the two conveyor belts be
synced sucks.
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog
Adds new mapping helper:
/obj/map_helper/electrochromatic_linker
and litters Riftmap with them.

Separates the controls of the two cargo belts in Riftmap.

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: tweaked conveyor belt ids
imageadd: edited access helper into a fitting icon
code: added mapping helper
/: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
washikarasu authored Sep 1, 2024
1 parent 997e5e5 commit f4c95bb
Show file tree
Hide file tree
Showing 7 changed files with 230 additions and 33 deletions.
1 change: 1 addition & 0 deletions citadel.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3213,6 +3213,7 @@
#include "code\modules\mapping\map_helpers\_map_helpers.dm"
#include "code\modules\mapping\map_helpers\baseturf.dm"
#include "code\modules\mapping\map_helpers\component_injector.dm"
#include "code\modules\mapping\map_helpers\electrochromatic_linker.dm"
#include "code\modules\mapping\map_helpers\engine_loader.dm"
#include "code\modules\mapping\map_helpers\gear_marker.dm"
#include "code\modules\mapping\map_helpers\paint.dm"
Expand Down
17 changes: 17 additions & 0 deletions code/modules/mapping/map_helpers/electrochromatic_linker.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/obj/map_helper/electrochromatic_linker
icon = 'icons/mapping/helpers/electrochromatic_helper.dmi'
icon_state = "electrochromatic"
early = FALSE
late = TRUE
/**
* the ID to bind electrochromatic objects on our tile to
*/
var/id

/obj/map_helper/electrochromatic_linker/LateInitialize()
for(var/obj/structure/window/reinforced/polarized/chromatic_window in loc)
chromatic_window.id = id
/**
* Same behaviour needs to be applied to polarised airlocks, currently unable too
*/
qdel(src)
Binary file added icons/mapping/helpers/electrochromatic_helper.dmi
Binary file not shown.
9 changes: 9 additions & 0 deletions maps/rift/levels/rift-02-underground2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7891,6 +7891,9 @@
"CH" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/sun,
/obj/map_helper/electrochromatic_linker{
id = "ce_office"
},
/turf/simulated/floor,
/area/crew_quarters/heads/chief)
"CI" = (
Expand Down Expand Up @@ -8485,6 +8488,9 @@
"ET" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/palebottlegreen,
/obj/map_helper/electrochromatic_linker{
id = "chapel_office"
},
/turf/simulated/floor/plating,
/area/chapel/office)
"EU" = (
Expand Down Expand Up @@ -8963,6 +8969,9 @@
"Ha" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/palebottlegreen,
/obj/map_helper/electrochromatic_linker{
id = "chapel_hall"
},
/turf/simulated/floor/plating,
/area/chapel/main)
"Hb" = (
Expand Down
81 changes: 59 additions & 22 deletions maps/rift/levels/rift-04-surface1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -873,6 +873,9 @@
"aFU" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/obj/map_helper/electrochromatic_linker{
id = "cmo_office"
},
/turf/simulated/floor/plating,
/area/crew_quarters/heads/cmo)
"aGd" = (
Expand Down Expand Up @@ -1702,7 +1705,8 @@
},
/obj/machinery/conveyor_switch{
pixel_y = 12;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 8
Expand Down Expand Up @@ -2136,7 +2140,8 @@
"bxV" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/structure/railing,
/obj/structure/railing{
Expand Down Expand Up @@ -2258,7 +2263,8 @@
},
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/structure/railing,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -2381,7 +2387,8 @@
"bFI" = (
/obj/structure/plasticflaps,
/obj/machinery/conveyor{
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -3142,6 +3149,9 @@
/area/hallway/primary/surfaceone)
"cdW" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/map_helper/electrochromatic_linker{
id = "iaa"
},
/turf/simulated/floor/plating,
/area/lawoffice)
"cec" = (
Expand Down Expand Up @@ -3286,6 +3296,9 @@
"clK" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/beastybrown,
/obj/map_helper/electrochromatic_linker{
id = "QM_office"
},
/turf/simulated/floor/plating,
/area/quartermaster/qm)
"cmb" = (
Expand Down Expand Up @@ -3514,6 +3527,9 @@
"ctO" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/obj/map_helper/electrochromatic_linker{
id = "patient_room_b"
},
/turf/simulated/floor/plating,
/area/medical/patient_a)
"cuR" = (
Expand Down Expand Up @@ -3679,6 +3695,9 @@
"czx" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/obj/map_helper/electrochromatic_linker{
id = "exam_room"
},
/turf/simulated/floor/plating,
/area/medical/exam_room)
"czN" = (
Expand Down Expand Up @@ -6961,7 +6980,8 @@
pixel_x = -32
},
/obj/machinery/conveyor{
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -7936,6 +7956,9 @@
"flS" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/obj/map_helper/electrochromatic_linker{
id = "psych_office"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/medical/mentalhealth)
"flT" = (
Expand Down Expand Up @@ -9100,7 +9123,8 @@
"gbL" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/structure/railing,
/obj/machinery/camera/network/cargo,
Expand Down Expand Up @@ -10301,7 +10325,8 @@
},
/obj/structure/disposalpipe/trunk,
/obj/machinery/conveyor{
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -10543,7 +10568,8 @@
dir = 1
},
/obj/machinery/conveyor{
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -15997,6 +16023,9 @@
"kko" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/babyblue,
/obj/map_helper/electrochromatic_linker{
id = "patient_room_a"
},
/turf/simulated/floor/plating,
/area/medical/patient_b)
"kku" = (
Expand Down Expand Up @@ -18431,7 +18460,8 @@
"lJv" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/machinery/door/blast/shutters{
density = 0;
Expand Down Expand Up @@ -19447,10 +19477,6 @@
},
/turf/simulated/floor/tiled/monowhite,
/area/medical/psych_ward)
"mpA" = (
/obj/structure/undies_wardrobe,
/turf/simulated/wall/r_wall/prepainted,
/area/rift/surfacebase/outside/outside1)
"mpD" = (
/obj/machinery/atmospherics/component/unary/outlet_injector{
id = "violet_protocol";
Expand Down Expand Up @@ -23284,6 +23310,9 @@
"oBN" = (
/obj/spawner/window/low_wall/reinforced/electrochromic/full/firelocks,
/obj/effect/paint/darkred,
/obj/map_helper/electrochromatic_linker{
id = "det_office"
},
/turf/simulated/floor/plating,
/area/security/forensics)
"oBO" = (
Expand Down Expand Up @@ -23926,7 +23955,8 @@
"oTu" = (
/obj/machinery/conveyor_switch{
pixel_y = 12;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/effect/floor_decal/industrial/warning{
dir = 5
Expand Down Expand Up @@ -28591,7 +28621,8 @@
"rEL" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/machinery/light{
dir = 8
Expand Down Expand Up @@ -30802,7 +30833,8 @@
"sMB" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/machinery/door/firedoor/glass,
/obj/structure/plasticflaps/mining,
Expand Down Expand Up @@ -31830,7 +31862,8 @@
dir = 4
},
/obj/machinery/conveyor{
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/plating,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -32223,7 +32256,8 @@
},
/obj/machinery/conveyor_switch/oneway{
convdir = -1;
tag = "mailroom"
tag = "mailroom";
id = "DLBelt"
},
/turf/simulated/floor/tiled/steel_grid,
/area/quartermaster/delivery)
Expand Down Expand Up @@ -33143,7 +33177,8 @@
"udl" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/structure/railing,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -34887,7 +34922,8 @@
"vaP" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/obj/structure/railing,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -36741,7 +36777,8 @@
"wjJ" = (
/obj/machinery/conveyor{
dir = 4;
tag = "cargoshuttle"
tag = "cargoshuttle";
id = "CVLoad"
},
/turf/simulated/floor/plating,
/area/quartermaster/hallway)
Expand Down Expand Up @@ -46117,7 +46154,7 @@ iFN
iFN
iFN
iFN
mpA
vUA
vUA
vUA
iFN
Expand Down
Loading

0 comments on commit f4c95bb

Please sign in to comment.