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.

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

LZ-624 Alternative Colony Nightmare Insert #3671

Closed
wants to merge 46 commits into from
Closed
Show file tree
Hide file tree
Changes from 43 commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
d7e7387
FuckCorruptedFilesCommit
Jun 18, 2023
6d9cdd5
UpdateThisBadFile
Jun 18, 2023
58f40bd
FixedMostOfDamage
Jun 18, 2023
93e8265
AnotherChange
Jun 18, 2023
b173e4a
VentsDone
Jun 19, 2023
b5bfe0c
NoEnterArea
Jun 19, 2023
3cbc9b1
MinorFixs
Jun 19, 2023
806e0e1
FixNumbers
Jun 19, 2023
8992bb5
Cosmetics
Jun 19, 2023
03782be
AdditionalMinorChanges
Jun 19, 2023
4a6ea5f
FixPlating
Jun 19, 2023
47a02e3
LZNameChange
Jun 19, 2023
13fad19
Merge branch 'master' into MapLV624
Steelpoint Jun 19, 2023
6196520
APCPixelChange
Jun 19, 2023
8f9d31a
FixIssue
Jun 19, 2023
068c790
RemoveBadHat
Jun 19, 2023
46b2e5f
MoreFixes
Jun 19, 2023
ea7c0da
AnotherFix
Jun 19, 2023
bfbf0d8
RemoveDuplicates
Jun 19, 2023
571e88b
Merge branch 'master' into MapLV624
Steelpoint Jun 19, 2023
752f832
PipeAdditions
Jun 20, 2023
275096f
Merge branch 'master' into MapLV624
Steelpoint Jun 20, 2023
efcb141
TruckVanRemove
Jun 20, 2023
84b668d
Argh
Jun 20, 2023
767320b
Aesthetics
Jun 20, 2023
4b7011f
MoreVinesAndAesthetics
Jun 21, 2023
5c229b0
NewStuff
Jun 22, 2023
4a5abfa
Merge branch 'master' into MapLV624
Steelpoint Jun 25, 2023
1f3a9ce
AttemptedTestErrorFix1
Jun 25, 2023
7a401c9
ErrorTest2
Jun 25, 2023
f6744e2
ChangeElse
Jun 25, 2023
0899442
Fix2
Jun 25, 2023
436e7e6
ScrewedUpFix
Jun 25, 2023
1b70a12
AHHHH
Jun 25, 2023
e4140b0
AttemptFixNewnEw
Jun 25, 2023
5cf6833
FixAHH
Jun 25, 2023
1787923
asd
Jun 25, 2023
a4d72d7
AnotherChange
Jun 25, 2023
2370191
Merge branch 'master' into MapLV624
Steelpoint Jun 26, 2023
d90e19c
ReturnOfTheVan
Jun 26, 2023
f52d843
Update code/game/objects/effects/landmarks/landmarks.dm
Steelpoint Jun 26, 2023
c7abbf9
Fix one?
Jun 26, 2023
12d93a3
Merge branch 'MapLV624' of https://github.com/Steelpoint/cmss13 into …
Jun 26, 2023
ccad7de
RiverDelta
Jun 26, 2023
a092d2f
NewMap
Jun 26, 2023
f5a3841
Rename lv624AltColony.json to lv624altcolony.json
Steelpoint Jun 26, 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
14 changes: 8 additions & 6 deletions code/game/objects/effects/landmarks/landmarks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,23 +216,25 @@

/obj/effect/landmark/yautja_teleport
name = "yautja_teleport"
/// The index we registered as in mainship_yautja_desc or yautja_teleport_descs
var/desc_index

/obj/effect/landmark/yautja_teleport/Initialize(mapload, ...)
. = ..()
var/turf/T = get_turf(src)
var/turf/turf = get_turf(src)
desc_index = turf.loc.name + turf.loc_to_string()
if(is_mainship_level(z))
GLOB.mainship_yautja_teleports += src
GLOB.mainship_yautja_desc[T.loc.name + T.loc_to_string()] = src
GLOB.mainship_yautja_desc[desc_index] = src
else
GLOB.yautja_teleports += src
GLOB.yautja_teleport_descs[T.loc.name + T.loc_to_string()] = src
GLOB.yautja_teleport_descs[desc_index] = src

/obj/effect/landmark/yautja_teleport/Destroy()
var/turf/T = get_turf(src)
GLOB.mainship_yautja_teleports -= src
GLOB.yautja_teleports -= src
GLOB.mainship_yautja_desc -= T.loc.name + T.loc_to_string()
GLOB.yautja_teleport_descs -= T.loc.name + T.loc_to_string()
GLOB.mainship_yautja_desc -= desc_index
GLOB.yautja_teleport_descs -= desc_index
return ..()


Expand Down
1 change: 1 addition & 0 deletions code/modules/vehicles/interior/interior.dm
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
entrance_markers = null

QDEL_NULL(reservation)
SSinterior.interiors -= src

return ..()

Expand Down
7 changes: 7 additions & 0 deletions maps/Nightmare/maps/LV624/nightmare.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@
"path": "standalone/rightsidepass.dmm",
"when": { "mainpath": "right" }
},
{
"type": "map_insert",
"landmark": "alt_colony",
"chance": 1.0,
"path": "standalone/alt_colony.dmm",
"when": { "mainpath": "alt" }
},
{
"type": "include", "name": "Standalone variations",
"file": "mapgen_variations.json"
Expand Down
3 changes: 2 additions & 1 deletion maps/Nightmare/maps/LV624/scenario.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
"choices": [
{ "type": "def", "values": { "mainpath": "left" } },
{ "type": "def", "values": { "mainpath": "bridge" } },
{ "type": "def", "values": { "mainpath": "right" } }
{ "type": "def", "values": { "mainpath": "right" } },
{ "type": "def", "values": { "mainpath": "alt" } }
]
},
{
Expand Down
26 changes: 16 additions & 10 deletions maps/map_files/LV624/LV624.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -12459,6 +12459,13 @@
/obj/effect/landmark/hunter_secondary,
/turf/open/gm/dirt,
/area/lv624/ground/barrens/south_eastern_barrens)
"bpB" = (
/obj/effect/decal/cleanable/blood/oil,
/obj/effect/vehicle_spawner/van/decrepit,
/turf/open/floor{
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
"bqf" = (
/obj/structure/surface/rack,
/obj/item/explosive/grenade/smokebomb{
Expand Down Expand Up @@ -12654,6 +12661,12 @@
/obj/structure/flora/bush/ausbushes/reedbush,
/turf/open/gm/river,
/area/lv624/ground/river/west_river)
"bGK" = (
/obj/effect/landmark/nightmare{
insert_tag = "alt_colony"
},
/turf/closed/wall/strata_ice/jungle,
/area/lv624/ground/jungle/south_west_jungle)
"bGV" = (
/obj/structure/machinery/iv_drip,
/turf/open/floor{
Expand Down Expand Up @@ -13868,7 +13881,7 @@
/obj/structure/surface/table,
/obj/structure/machinery/computer/shuttle/dropship/flight/lz2,
/turf/open/gm/dirt,
/area/lv624/landing/console2)
/area/lv624/lazarus/landing_zones/lz2)
"eDy" = (
/obj/structure/flora/bush/ausbushes/genericbush,
/turf/open/gm/grass/grass1,
Expand Down Expand Up @@ -14607,13 +14620,6 @@
/obj/structure/flora/bush/ausbushes/grassybush,
/turf/open/gm/grass/grass1,
/area/lv624/ground/jungle/east_jungle)
"gAS" = (
/obj/effect/vehicle_spawner/van/decrepit,
/obj/effect/decal/cleanable/blood/oil,
/turf/open/floor{
icon_state = "dark"
},
/area/lv624/lazarus/corporate_dome)
"gBG" = (
/obj/structure/fence,
/turf/open/gm/dirtgrassborder/grassdirt_corner2/south_west,
Expand Down Expand Up @@ -27126,7 +27132,7 @@ mWe
xTT
xdO
aKb
aKb
bGK
aac
aaa
aaa
Expand Down Expand Up @@ -32573,7 +32579,7 @@ mgs
xgE
rNq
kWH
gAS
bpB
rNq
xgE
xgE
Expand Down
Loading