Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Redgate #1334

Merged
merged 5 commits into from
Dec 8, 2023
Merged

Redgate #1334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c9c3c52
Redgate test commit - ISSUES: Exploration is not landing on Debris Fi…
Repede Dec 8, 2023
8e8ab17
fixed debrisfield somehow
Repede Dec 8, 2023
0cf10bd
Merge branch 'master' into redgate
Repede Dec 8, 2023
f318192
Added yw debrisfield, reverted debrisfield to old one
Repede Dec 8, 2023
c037b83
Merge branch 'redgate' of https://github.com/Yawn-Wider/YWPolarisVore…
Repede Dec 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions maps/expedition_vr/aerostat/_aerostat.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "../../submaps/pois_vr/aerostat/virgo2.dm"

/obj/effect/overmap/visitable/sector/virgo2
name = "Virgo 2"
name = "Borealis 3" //YW Edit - Borealis
desc = "Includes the Remmi Aerostat and associated ground mining complexes."
scanner_desc = @{"[i]Stellar Body[/i]: Virgo 2
scanner_desc = @{"[i]Stellar Body[/i]: Borealis 3
[i]Class[/i]: R-Class Planet
[i]Habitability[/i]: Low (High Temperature, Toxic Atmosphere)
[b]Notice[/b]: Planetary environment not suitable for life. Landing may be hazardous."}
Expand Down
2 changes: 1 addition & 1 deletion maps/expedition_vr/aerostat/_aerostat_science_outpost.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@


/obj/effect/overmap/visitable/sector/virgo2
name = "Virgo 2"
name = "Borealis 3" //YW Edit - Borealis
desc = "Includes the Remmi Aerostat and associated ground mining complexes."
scanner_desc = @{"[i]Stellar Body[/i]: Virgo 2
[i]Class[/i]: R-Class Planet
Expand Down
12 changes: 11 additions & 1 deletion maps/expedition_vr/space/_debrisfield.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,16 @@
icon = 'icons/turf/areas_vr.dmi'
icon_state = "dark"

//YW ADDITIONS - DEBRIS FIELD LANDMARK
/obj/effect/shuttle_landmark/premade/debrisfield/east
name = "Debris Field - East"
landmark_tag = "debrisfield_nw"

/obj/effect/shuttle_landmark/premade/debrisfield/west
name = "Debris Field - West"
landmark_tag = "debrisfield_se"
//END YW ADDITIONS

/area/tether_away/debrisfield/shuttle_buffer //For space around shuttle landmarks to keep submaps from generating to block them
icon_state = "debrisexplored"
name = "\improper Space"
Expand Down Expand Up @@ -168,7 +178,7 @@

/obj/effect/overmap/visitable/ship/landable/luxury_boat/Initialize()
. = ..()
var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/elysia]
var/datum/lore/organization/O = loremaster.organizations[/datum/lore/organization/gov/almachi] //YW Change - gov we actually have
var/newname = "ECS-T [pick(O.ship_names)]"
name = newname
scanner_desc = {"\[i\]Registration\[/i\]: [newname]
Expand Down
28 changes: 14 additions & 14 deletions maps/expedition_vr/space/debrisfield.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@
/obj/effect/overmap/visitable/sector/debrisfield,
/turf/space,
/area/space)
"b" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/debrisfield/shuttle_buffer;
base_turf = /turf/space;
landmark_tag = "debrisfield_nw";
name = "North West"
},
"d" = (
/turf/space,
/area/tether_away/debrisfield/shuttle_buffer)
"c" = (
"h" = (
/turf/space,
/area/space)
"G" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/debrisfield/shuttle_buffer;
base_turf = /turf/space;
Expand All @@ -21,12 +18,15 @@
},
/turf/space,
/area/tether_away/debrisfield/shuttle_buffer)
"d" = (
"J" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether_away/debrisfield/shuttle_buffer;
base_turf = /turf/space;
landmark_tag = "debrisfield_nw";
name = "North West"
},
/turf/space,
/area/tether_away/debrisfield/shuttle_buffer)
"h" = (
/turf/space,
/area/space)

(1,1,1) = {"
h
Expand Down Expand Up @@ -4319,7 +4319,7 @@ d
d
d
d
b
J
d
d
d
Expand Down Expand Up @@ -17760,7 +17760,7 @@ d
d
d
d
c
G
d
d
d
Expand Down
Loading