shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes a bunch of mismatch atmos in ruins

Browse Source
This commit is contained in:
Detective Google
2020-05-01 01:33:14 -05:00
parent 2832b86e11
commit 7ef5246b19
8 changed files with 858 additions and 890 deletions
Download Patch File Download Diff File Expand all files Collapse all files

787
_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm
View File

File diff suppressed because it is too large Load Diff

1
_maps/RandomRuins/IceRuins/icemoon_surface_lust.dmm
View File

@@ -23,6 +23,7 @@
"f" = (
/obj/structure/sign/poster/contraband/lusty_xenomorph,
/obj/structure/falsewall/abductor,
/obj/structure/fans/tiny,
/turf/open/floor/mineral/diamond,
/area/icemoon/surface/outdoors)

4
_maps/RandomRuins/IceRuins/icemoon_surface_mining_site.dmm
View File

@@ -57,11 +57,11 @@
/area/ruin/unpowered)
"m" = (
/obj/structure/barricade/wooden/crude/snow,
/obj/structure/mineral_door/wood,
/turf/open/floor/wood,
/area/ruin/unpowered)
"n" = (
/obj/structure/mineral_door/wood,
/turf/open/floor/wood,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered)
"o" = (
/obj/item/reagent_containers/food/drinks/beer,

5
_maps/RandomRuins/IceRuins/icemoon_underground_bathhouse.dmm
View File

@@ -3,10 +3,7 @@
/turf/template_noop,
/area/template_noop)
"b" = (
/turf/closed/wall{
icon = 'icons/turf/shuttleold.dmi';
icon_state = "block"
},
/turf/closed/wall/ice,
/area/ruin/powered/bathhouse)
"c" = (
/obj/machinery/shower{

847
_maps/RandomRuins/IceRuins/icemoon_underground_lavaland.dmm
View File

File diff suppressed because it is too large Load Diff

97
_maps/RandomRuins/IceRuins/icemoon_underground_library.dmm
View File

@@ -50,9 +50,6 @@
/obj/item/book_of_babel,
/turf/open/floor/plasteel/cult,
/area/ruin/unpowered/buried_library)
"an" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/buried_library)
"ao" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
@@ -64,7 +61,6 @@
/area/ruin/unpowered/buried_library)
"aq" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood,
@@ -75,16 +71,12 @@
"as" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/paper/fluff/ruins/oldstation/protosing,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"at" = (
/obj/structure/fluff/paper,
/turf/open/floor/wood,
/area/ruin/unpowered/buried_library)
"au" = (
/obj/structure/fluff/paper/stack,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/buried_library)
"av" = (
/obj/structure/bookcase/random,
/turf/closed/mineral/random/snow/no_caves,
@@ -94,7 +86,7 @@
/area/ruin/unpowered/buried_library)
"ax" = (
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"ay" = (
/obj/machinery/door/keycard/library,
@@ -114,7 +106,7 @@
/area/ruin/unpowered/buried_library)
"aC" = (
/obj/item/feather,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"aD" = (
/turf/open/floor/carpet/black,
@@ -127,7 +119,7 @@
"aF" = (
/obj/item/book/manual/random,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"aG" = (
/obj/structure/table/bronze,
@@ -161,7 +153,7 @@
"aM" = (
/obj/item/stack/sheet/mineral/wood,
/obj/item/book/manual/random,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"aN" = (
/obj/structure/statue/sandstone/venus,
@@ -198,10 +190,6 @@
/obj/structure/fluff/paper,
/turf/open/floor/wood,
/area/ruin/unpowered/buried_library)
"aU" = (
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/buried_library)
"aV" = (
/obj/item/stack/sheet/mineral/wood,
/obj/structure/fluff/paper/stack,
@@ -227,17 +215,12 @@
/area/ruin/unpowered/buried_library)
"ba" = (
/obj/structure/barricade/wooden/snowed,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/buried_library)
"bb" = (
/obj/item/book/manual/random,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bc" = (
/obj/item/feather,
/obj/structure/fluff/paper,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood,
@@ -245,14 +228,12 @@
"bd" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/turf/open/floor/wood,
/area/ruin/unpowered/buried_library)
"be" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 5
},
/turf/open/floor/wood,
@@ -260,14 +241,13 @@
"bf" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 4
},
/turf/open/floor/wood,
/area/ruin/unpowered/buried_library)
"bg" = (
/obj/item/paper/fluff/ruins/oldstation/protogun,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bh" = (
/obj/effect/decal/cleanable/dirt,
@@ -276,7 +256,7 @@
/area/ruin/unpowered/buried_library)
"bi" = (
/obj/structure/fluff/paper,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bj" = (
/obj/item/book/manual/random,
@@ -284,7 +264,6 @@
/area/ruin/unpowered/buried_library)
"bk" = (
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 10
},
/turf/open/floor/wood,
@@ -300,7 +279,7 @@
"bn" = (
/obj/item/book/manual/random,
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bo" = (
/obj/item/stack/sheet/mineral/wood,
@@ -309,7 +288,7 @@
"bp" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper,
/turf/open/floor/plating/asteroid/snow/icemoon,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bq" = (
/obj/structure/mineral_door/wood,
@@ -320,10 +299,6 @@
/obj/structure/girder,
/turf/closed/mineral/random/snow/no_caves,
/area/ruin/unpowered/buried_library)
"bs" = (
/obj/structure/girder,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/ruin/unpowered/buried_library)
"bt" = (
/obj/effect/decal/cleanable/dirt,
/turf/template_noop,
@@ -332,16 +307,9 @@
/obj/item/stack/sheet/mineral/wood,
/turf/closed/mineral/random/snow/no_caves,
/area/icemoon/underground/explored)
"bv" = (
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"bw" = (
/turf/open/floor/wood,
/area/icemoon/underground/explored)
"bx" = (
/obj/item/stack/sheet/mineral/wood,
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/icemoon/underground/explored)
"by" = (
/obj/item/statuebust,
/turf/open/floor/carpet/black,
@@ -363,7 +331,6 @@
"bC" = (
/obj/effect/decal/cleanable/dirt,
/obj/structure/fluff/paper{
icon_state = "paper";
dir = 1
},
/mob/living/simple_animal/pet/fox,
@@ -432,11 +399,11 @@ ak
ak
ak
ak
aU
bo
ak
ak
an
au
ak
bm
ae
af
bk
@@ -455,10 +422,10 @@ aa
ak
ak
aR
an
an
ak
ak
ae
bb
bj
av
ak
ah
@@ -478,7 +445,7 @@ aa
aa
ak
ak
an
ak
aC
ae
aQ
@@ -502,13 +469,13 @@ aa
aa
ad
ac
an
ak
ae
an
ak
aM
aO
ah
au
bm
ah
aA
ah
@@ -528,7 +495,7 @@ aa
ad
ac
ak
au
bm
ak
ao
aR
@@ -555,19 +522,19 @@ ak
ak
av
aA
an
ak
aG
aD
aX
an
ak
ao
ae
ao
ah
ae
ac
bs
bv
br
ad
ad
"}
(9,1,1) = {"
@@ -593,7 +560,7 @@ ao
ac
ax
bw
bv
ad
"}
(10,1,1) = {"
aa
@@ -608,7 +575,7 @@ ak
aD
aD
aN
an
ak
aw
ak
ao
@@ -617,7 +584,7 @@ aR
ae
bq
ae
bx
bu
ad
"}
(11,1,1) = {"
@@ -631,7 +598,7 @@ ae
ah
aR
aD
an
ak
aD
aD
by
@@ -642,7 +609,7 @@ ae
bm
ac
ae
bv
ad
ad
"}
(12,1,1) = {"
@@ -662,7 +629,7 @@ aY
aD
ak
ae
au
bm
ah
ag
br
@@ -704,7 +671,7 @@ aK
al
at
ah
an
ak
ah
bh
aj

2
code/datums/map_config.dm
View File

@@ -22,7 +22,7 @@
var/traits = null
var/space_ruin_levels = 2
var/space_empty_levels = 1
var/station_ruin_budget = -1
var/station_ruin_budget = -1 // can be set to manually override the station ruins budget on maps that don't support station ruins, stopping the error from being unable to place the ruins.
var/minetype = "lavaland"

5
code/modules/ruins/icemoonruin_code/hotsprings.dm
View File

@@ -1,12 +1,9 @@
GLOBAL_LIST_EMPTY(cursed_minds)
/**
* Turns whoever enters into a mob or random person
* Turns whoever enters into a mob
*
* If mob is chosen, turns the person into a random animal type
* If appearance is chosen, turns the person into a random human with a random species
* This changes name, and changes their DNA as well
* Random species is same as wizard swap event so people don't get killed ex: plasmamen
* Once the spring is used, it cannot be used by the same mind ever again
* After usage, teleports the user back to a random safe turf (so mobs are not killed by ice moon atmosphere)
*