Skip to content
This repository was archived by the owner on May 5, 2025. It is now read-only.

Commit 0ef7d08

Browse files
PaxilmaniacPaxilmaniac
authored
Merge pull request #12 from She-Is-Trying-To-Form-Her-First-Thought/update-2-doppla
Update 2 doppla
2 parents 597eea2 + eb2afaa commit 0ef7d08

File tree

722 files changed

+9159
-364857
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

722 files changed

+9159
-364857
lines changed

‎.github/guides/ISSUE_MANAGER.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ If an issue reports a runtime, it must have the actual runtime call stack provid
2828
- usr.loc: the floor (150,25,4) (/turf/open/floor/circuit)
2929
- call stack:
3030
- Camera Net (/datum/cameranet): visibility(/list (/list), null, /list (/list), 1)
31-
- AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/ai_eye))
32-
- Inactive AI Eye (/mob/eye/ai_eye): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
31+
- AI (/mob/living/silicon/ai): camera visibility(Inactive AI Eye (/mob/eye/camera/ai))
32+
- Inactive AI Eye (/mob/eye/camera/ai): setLoc(the floor (150,25,4) (/turf/open/floor/circuit), 0)
3333
- AI (/mob/living/silicon/ai): create eye()
3434
- AI (/mob/living/silicon/ai): Initialize(0, null, TagGamerGame2 (/mob/dead/new_player))
3535
- Atoms (/datum/controller/subsystem/atoms): InitAtom(AI (/mob/living/silicon/ai), 0, /list (/list))

‎_maps/RandomRuins/IceRuins/doppler/icemoon_underground_icewalker_lower.dmm

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
dir = 1
183183
},
184184
/obj/structure/chair/sofa/bamboo/left,
185-
/turf/open/water/hot_spring,
185+
/turf/open/water/hot_spring/icemoon,
186186
/area/ruin/unpowered/primitive_genemod_den)
187187
"dj" = (
188188
/obj/structure/flora/bush/snow/style_random,
@@ -275,7 +275,7 @@
275275
"fK" = (
276276
/obj/effect/turf_decal/siding/wood,
277277
/obj/structure/wall_torch/spawns_lit/directional/north,
278-
/turf/open/water/hot_spring,
278+
/turf/open/water/hot_spring/icemoon,
279279
/area/ruin/unpowered/primitive_genemod_den)
280280
"fV" = (
281281
/obj/effect/turf_decal/siding/wood{
@@ -302,7 +302,7 @@
302302
/obj/effect/turf_decal/weather/dirt{
303303
dir = 4
304304
},
305-
/turf/open/water/hot_spring,
305+
/turf/open/water/hot_spring/icemoon,
306306
/area/ruin/unpowered/primitive_genemod_den)
307307
"gz" = (
308308
/obj/effect/turf_decal/weather/snow/corner{
@@ -317,7 +317,7 @@
317317
/obj/effect/turf_decal/weather/dirt{
318318
dir = 9
319319
},
320-
/turf/open/water/hot_spring,
320+
/turf/open/water/hot_spring/icemoon,
321321
/area/ruin/unpowered/primitive_genemod_den)
322322
"gU" = (
323323
/obj/structure/rack/wooden,
@@ -589,7 +589,7 @@
589589
/obj/effect/turf_decal/siding/wood/corner{
590590
dir = 1
591591
},
592-
/turf/open/water/hot_spring,
592+
/turf/open/water/hot_spring/icemoon,
593593
/area/ruin/unpowered/primitive_genemod_den)
594594
"mr" = (
595595
/obj/structure/wall_torch/spawns_lit/directional/west,
@@ -646,7 +646,7 @@
646646
/obj/effect/turf_decal/weather/dirt{
647647
dir = 1
648648
},
649-
/turf/open/water/hot_spring,
649+
/turf/open/water/hot_spring/icemoon,
650650
/area/ruin/unpowered/primitive_genemod_den)
651651
"nG" = (
652652
/obj/machinery/griddle/stone,
@@ -704,7 +704,7 @@
704704
/obj/effect/turf_decal/weather/dirt{
705705
dir = 8
706706
},
707-
/turf/open/water/hot_spring,
707+
/turf/open/water/hot_spring/icemoon,
708708
/area/ruin/unpowered/primitive_genemod_den)
709709
"ol" = (
710710
/obj/structure/railing/wooden_fencing{
@@ -740,7 +740,7 @@
740740
/area/ruin/unpowered/primitive_genemod_den)
741741
"oJ" = (
742742
/obj/effect/turf_decal/weather/dirt,
743-
/turf/open/water/hot_spring,
743+
/turf/open/water/hot_spring/icemoon,
744744
/area/ruin/unpowered/primitive_genemod_den)
745745
"oL" = (
746746
/obj/machinery/smartfridge/wooden/seed_shelf,
@@ -788,7 +788,7 @@
788788
/obj/effect/turf_decal/weather/dirt{
789789
dir = 6
790790
},
791-
/turf/open/water/hot_spring,
791+
/turf/open/water/hot_spring/icemoon,
792792
/area/ruin/unpowered/primitive_genemod_den)
793793
"po" = (
794794
/obj/effect/turf_decal/siding/wood/corner{
@@ -804,7 +804,7 @@
804804
/area/ruin/unpowered/primitive_genemod_den)
805805
"pW" = (
806806
/obj/effect/turf_decal/weather/snow/corner,
807-
/turf/open/water/hot_spring,
807+
/turf/open/water/hot_spring/icemoon,
808808
/area/ruin/unpowered/primitive_genemod_den)
809809
"qb" = (
810810
/obj/effect/turf_decal/siding/wood{
@@ -816,7 +816,7 @@
816816
/obj/effect/turf_decal/weather/dirt{
817817
dir = 8
818818
},
819-
/turf/open/water/hot_spring,
819+
/turf/open/water/hot_spring/icemoon,
820820
/area/ruin/unpowered/primitive_genemod_den)
821821
"qr" = (
822822
/obj/structure/rack/wooden,
@@ -877,7 +877,7 @@
877877
/obj/structure/chair/sofa/bamboo{
878878
dir = 1
879879
},
880-
/turf/open/water/hot_spring,
880+
/turf/open/water/hot_spring/icemoon,
881881
/area/ruin/unpowered/primitive_genemod_den)
882882
"sj" = (
883883
/obj/structure/spacevine{
@@ -1010,7 +1010,7 @@
10101010
/obj/effect/turf_decal/siding/wood{
10111011
dir = 6
10121012
},
1013-
/turf/open/water/hot_spring,
1013+
/turf/open/water/hot_spring/icemoon,
10141014
/area/ruin/unpowered/primitive_genemod_den)
10151015
"vy" = (
10161016
/obj/effect/turf_decal/siding/wood{
@@ -1063,7 +1063,7 @@
10631063
/area/ruin/unpowered/primitive_genemod_den)
10641064
"wU" = (
10651065
/obj/structure/wall_torch/spawns_lit/directional/south,
1066-
/turf/open/water/hot_spring,
1066+
/turf/open/water/hot_spring/icemoon,
10671067
/area/ruin/unpowered/primitive_genemod_den)
10681068
"xc" = (
10691069
/obj/structure/wall_torch/spawns_lit/directional/west,
@@ -1149,22 +1149,22 @@
11491149
/obj/structure/chair/sofa/bamboo/right{
11501150
dir = 1
11511151
},
1152-
/turf/open/water/hot_spring,
1152+
/turf/open/water/hot_spring/icemoon,
11531153
/area/ruin/unpowered/primitive_genemod_den)
11541154
"yx" = (
11551155
/obj/effect/turf_decal/weather/dirt{
11561156
dir = 9
11571157
},
11581158
/obj/structure/wall_torch/spawns_lit/directional/south,
1159-
/turf/open/water/hot_spring,
1159+
/turf/open/water/hot_spring/icemoon,
11601160
/area/ruin/unpowered/primitive_genemod_den)
11611161
"yy" = (
11621162
/obj/effect/mob_spawn/ghost_role/human/primitive_genemod,
11631163
/turf/open/misc/dirt/icemoon,
11641164
/area/ruin/unpowered/primitive_genemod_den)
11651165
"yE" = (
11661166
/obj/effect/turf_decal/siding/wood,
1167-
/turf/open/water/hot_spring,
1167+
/turf/open/water/hot_spring/icemoon,
11681168
/area/ruin/unpowered/primitive_genemod_den)
11691169
"yN" = (
11701170
/obj/structure/rack/wooden,
@@ -1182,7 +1182,7 @@
11821182
/obj/effect/turf_decal/siding/wood{
11831183
dir = 1
11841184
},
1185-
/turf/open/water/hot_spring,
1185+
/turf/open/water/hot_spring/icemoon,
11861186
/area/ruin/unpowered/primitive_genemod_den)
11871187
"yU" = (
11881188
/obj/structure/window/green_glass_pane,
@@ -1193,7 +1193,7 @@
11931193
/obj/effect/turf_decal/weather/snow/corner{
11941194
dir = 8
11951195
},
1196-
/turf/open/water/hot_spring,
1196+
/turf/open/water/hot_spring/icemoon,
11971197
/area/ruin/unpowered/primitive_genemod_den)
11981198
"zu" = (
11991199
/obj/effect/turf_decal/siding/wood{
@@ -1543,7 +1543,7 @@
15431543
dir = 1
15441544
},
15451545
/obj/structure/chair/sofa/bamboo/right,
1546-
/turf/open/water/hot_spring,
1546+
/turf/open/water/hot_spring/icemoon,
15471547
/area/ruin/unpowered/primitive_genemod_den)
15481548
"Fj" = (
15491549
/obj/structure/chair/wood,
@@ -1631,7 +1631,7 @@
16311631
/turf/open/floor/wood/icemoon,
16321632
/area/ruin/unpowered/primitive_genemod_den)
16331633
"Hd" = (
1634-
/turf/open/water/hot_spring,
1634+
/turf/open/water/hot_spring/icemoon,
16351635
/area/ruin/unpowered/primitive_genemod_den)
16361636
"Hv" = (
16371637
/obj/structure/rack/wooden,
@@ -1690,7 +1690,7 @@
16901690
/obj/effect/turf_decal/weather/dirt{
16911691
dir = 1
16921692
},
1693-
/turf/open/water/hot_spring,
1693+
/turf/open/water/hot_spring/icemoon,
16941694
/area/ruin/unpowered/primitive_genemod_den)
16951695
"IJ" = (
16961696
/obj/structure/wall_torch/spawns_lit/directional/east,
@@ -1746,7 +1746,7 @@
17461746
name = "thick vines";
17471747
opacity = 1
17481748
},
1749-
/turf/open/water/hot_spring,
1749+
/turf/open/water/hot_spring/icemoon,
17501750
/area/ruin/unpowered/primitive_genemod_den)
17511751
"Jn" = (
17521752
/obj/effect/turf_decal/weather/snow/corner{
@@ -1755,7 +1755,7 @@
17551755
/obj/effect/turf_decal/weather/snow/corner{
17561756
dir = 8
17571757
},
1758-
/turf/open/water/hot_spring,
1758+
/turf/open/water/hot_spring/icemoon,
17591759
/area/ruin/unpowered/primitive_genemod_den)
17601760
"Jq" = (
17611761
/turf/open/misc/hay/icemoon,
@@ -1845,7 +1845,7 @@
18451845
dir = 1
18461846
},
18471847
/obj/structure/chair/sofa/bamboo,
1848-
/turf/open/water/hot_spring,
1848+
/turf/open/water/hot_spring/icemoon,
18491849
/area/ruin/unpowered/primitive_genemod_den)
18501850
"Ku" = (
18511851
/obj/effect/turf_decal/siding/wood{
@@ -1960,7 +1960,7 @@
19601960
/obj/effect/turf_decal/weather/dirt{
19611961
dir = 8
19621962
},
1963-
/turf/open/water/hot_spring,
1963+
/turf/open/water/hot_spring/icemoon,
19641964
/area/ruin/unpowered/primitive_genemod_den)
19651965
"Mr" = (
19661966
/obj/structure/wall_torch/spawns_lit/directional/north,
@@ -2000,7 +2000,7 @@
20002000
/obj/effect/turf_decal/weather/snow/corner{
20012001
dir = 1
20022002
},
2003-
/turf/open/water/hot_spring,
2003+
/turf/open/water/hot_spring/icemoon,
20042004
/area/ruin/unpowered/primitive_genemod_den)
20052005
"Nr" = (
20062006
/obj/effect/turf_decal/siding/wood{
@@ -2165,7 +2165,7 @@
21652165
/obj/effect/turf_decal/siding/wood{
21662166
dir = 4
21672167
},
2168-
/turf/open/water/hot_spring,
2168+
/turf/open/water/hot_spring/icemoon,
21692169
/area/ruin/unpowered/primitive_genemod_den)
21702170
"RZ" = (
21712171
/obj/structure/closet/crate/wooden/storage_barrel,
@@ -2229,7 +2229,7 @@
22292229
/obj/effect/turf_decal/weather/snow/corner{
22302230
dir = 4
22312231
},
2232-
/turf/open/water/hot_spring,
2232+
/turf/open/water/hot_spring/icemoon,
22332233
/area/ruin/unpowered/primitive_genemod_den)
22342234
"TW" = (
22352235
/obj/effect/turf_decal/weather/dirt{
@@ -2277,7 +2277,7 @@
22772277
/area/ruin/unpowered/primitive_genemod_den)
22782278
"Vc" = (
22792279
/obj/structure/fluff/minepost,
2280-
/turf/open/water/hot_spring,
2280+
/turf/open/water/hot_spring/icemoon,
22812281
/area/ruin/unpowered/primitive_genemod_den)
22822282
"Vp" = (
22832283
/obj/structure/table/wood,
@@ -2402,7 +2402,7 @@
24022402
/obj/effect/turf_decal/weather/dirt{
24032403
dir = 10
24042404
},
2405-
/turf/open/water/hot_spring,
2405+
/turf/open/water/hot_spring/icemoon,
24062406
/area/ruin/unpowered/primitive_genemod_den)
24072407
"YO" = (
24082408
/obj/structure/wall_torch/spawns_lit/directional/north,

‎_maps/_basemap.dm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "map_files\IceBoxStation\IceBoxStation.dmm"
1212
#include "map_files\MetaStation\MetaStation.dmm"
1313
#include "map_files\Mining\Lavaland.dmm"
14-
#include "map_files\NorthStar\north_star.dmm"
1514
#include "map_files\tramstation\tramstation.dmm"
1615
#include "map_files\NebulaStation\NebulaStation.dmm"
1716
#include "map_files\wawastation\wawastation.dmm"

0 commit comments

Comments
 (0)