Fix even more of the things.
Lava not exsisting on cliffs, a typo, and using the wrong area for a POI.
This commit is contained in:
Fluff
2023-03-15 19:05:50 -04:00
parent edba3c6310
commit 68fdbd36c7
3 changed files with 89 additions and 71 deletions

View File

@@ -2,81 +2,81 @@
"a" = ( "a" = (
/mob/living/simple_mob/humanoid/cultist/tesh, /mob/living/simple_mob/humanoid/cultist/tesh,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"b" = ( "b" = (
/obj/machinery/firework_launcher, /obj/machinery/firework_launcher,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"c" = ( "c" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/device/soulstone, /obj/item/device/soulstone,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"d" = ( "d" = (
/obj/structure/railing, /obj/structure/railing,
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/medical/pillbottle, /obj/random/medical/pillbottle,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"e" = ( "e" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 1 dir = 1
}, },
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"f" = ( "f" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 8 dir = 8
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"g" = ( "g" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 9 dir = 9
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"h" = ( "h" = (
/obj/structure/simple_door/wood, /obj/structure/simple_door/wood,
/turf/simulated/floor/wood/sif, /turf/simulated/floor/wood/sif,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"i" = ( "i" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/weapon/flame/candle/everburn, /obj/item/weapon/flame/candle/everburn,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"j" = ( "j" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 10 dir = 10
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"k" = ( "k" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/energy/highend, /obj/random/energy/highend,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"l" = ( "l" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/gun/random, /obj/random/gun/random,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"m" = ( "m" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/firstaid, /obj/random/firstaid,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"n" = ( "n" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/clothing/head/psy_crown/wrath, /obj/item/clothing/head/psy_crown/wrath,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"p" = ( "p" = (
/mob/living/simple_mob/vore/alienanimals/space_jellyfish{ /mob/living/simple_mob/vore/alienanimals/space_jellyfish{
faction = "cult" faction = "cult"
}, },
/turf/simulated/floor/water, /turf/simulated/floor/water,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"q" = ( "q" = (
/obj/structure/closet/crate, /obj/structure/closet/crate,
/obj/item/weapon/firework_star/weather/storm, /obj/item/weapon/firework_star/weather/storm,
@@ -89,26 +89,26 @@
/obj/item/weapon/firework_star/weather/blizzard, /obj/item/weapon/firework_star/weather/blizzard,
/obj/item/weapon/firework_star/weather/fallout, /obj/item/weapon/firework_star/weather/fallout,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"r" = ( "r" = (
/obj/structure/railing, /obj/structure/railing,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"s" = ( "s" = (
/turf/simulated/wall/log, /turf/simulated/wall/log,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"t" = ( "t" = (
/obj/structure/railing, /obj/structure/railing,
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/firstaid, /obj/random/firstaid,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"u" = ( "u" = (
/turf/simulated/floor/water, /turf/simulated/floor/water,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"v" = ( "v" = (
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"w" = ( "w" = (
/turf/template_noop, /turf/template_noop,
/area/template_noop) /area/template_noop)
@@ -116,32 +116,32 @@
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/projectile/random, /obj/random/projectile/random,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"y" = ( "y" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 4 dir = 4
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"B" = ( "B" = (
/obj/structure/bed, /obj/structure/bed,
/obj/item/weapon/bedsheet/blue, /obj/item/weapon/bedsheet/blue,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"C" = ( "C" = (
/mob/living/simple_mob/humanoid/cultist/noodle, /mob/living/simple_mob/humanoid/cultist/noodle,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"D" = ( "D" = (
/obj/structure/cliff/automatic/corner{ /obj/structure/cliff/automatic/corner{
dir = 10 dir = 10
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"E" = ( "E" = (
/obj/structure/cliff/automatic/corner, /obj/structure/cliff/automatic/corner,
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"F" = ( "F" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 1 dir = 1
@@ -149,61 +149,61 @@
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/medical/pillbottle, /obj/random/medical/pillbottle,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"G" = ( "G" = (
/obj/structure/cliff/automatic, /obj/structure/cliff/automatic,
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"H" = ( "H" = (
/obj/structure/closet/crate/secure/loot, /obj/structure/closet/crate/secure/loot,
/obj/random/mainttoyloot/nofail, /obj/random/mainttoyloot/nofail,
/obj/random/mainttoyloot/nofail, /obj/random/mainttoyloot/nofail,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"I" = ( "I" = (
/mob/living/simple_mob/humanoid/cultist/hunter, /mob/living/simple_mob/humanoid/cultist/hunter,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"J" = ( "J" = (
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"M" = ( "M" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 6 dir = 6
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"N" = ( "N" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 4 dir = 4
}, },
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"O" = ( "O" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/clothing/head/psy_crown/gluttony, /obj/item/clothing/head/psy_crown/gluttony,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"P" = ( "P" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 8 dir = 8
}, },
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"Q" = ( "Q" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 2 dir = 2
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"R" = ( "R" = (
/mob/living/simple_mob/humanoid/cultist/castertesh, /mob/living/simple_mob/humanoid/cultist/castertesh,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"S" = ( "S" = (
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"T" = ( "T" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 1 dir = 1
@@ -211,19 +211,19 @@
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/random/firstaid, /obj/random/firstaid,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"U" = ( "U" = (
/obj/structure/cliff/automatic/corner{ /obj/structure/cliff/automatic/corner{
dir = 6 dir = 6
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"V" = ( "V" = (
/obj/structure/cliff/automatic{ /obj/structure/cliff/automatic{
dir = 5 dir = 5
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"W" = ( "W" = (
/obj/structure/railing{ /obj/structure/railing{
dir = 1 dir = 1
@@ -231,23 +231,23 @@
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/weapon/flame/candle/everburn, /obj/item/weapon/flame/candle/everburn,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"X" = ( "X" = (
/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball, /mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"Y" = ( "Y" = (
/obj/structure/cliff/automatic/corner{ /obj/structure/cliff/automatic/corner{
dir = 9 dir = 9
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/carriershuttle) /area/submap/cliffmanor)
"Z" = ( "Z" = (
/obj/structure/railing, /obj/structure/railing,
/obj/structure/table/wooden_reinforced, /obj/structure/table/wooden_reinforced,
/obj/item/weapon/flame/candle/everburn, /obj/item/weapon/flame/candle/everburn,
/turf/simulated/floor/wood, /turf/simulated/floor/wood,
/area/submap/carriershuttle) /area/submap/cliffmanor)
(1,1,1) = {" (1,1,1) = {"
w w

View File

@@ -89,6 +89,12 @@
}, },
/turf/simulated/floor/outdoors/dirt, /turf/simulated/floor/outdoors/dirt,
/area/submap/eclipselava) /area/submap/eclipselava)
"fi" = (
/obj/structure/cliff/automatic/corner{
dir = 6
},
/turf/simulated/floor/lava,
/area/submap/eclipselava)
"fG" = ( "fG" = (
/obj/structure/cable/green{ /obj/structure/cable/green{
d1 = 2; d1 = 2;
@@ -214,6 +220,12 @@
}, },
/turf/simulated/floor/reinforced, /turf/simulated/floor/reinforced,
/area/submap/eclipselava) /area/submap/eclipselava)
"mI" = (
/obj/structure/cliff/automatic/corner{
dir = 10
},
/turf/simulated/floor/lava,
/area/submap/eclipselava)
"mL" = ( "mL" = (
/obj/machinery/door/window/southright{ /obj/machinery/door/window/southright{
dir = 4 dir = 4
@@ -507,6 +519,12 @@
}, },
/turf/simulated/floor/reinforced, /turf/simulated/floor/reinforced,
/area/submap/eclipselava) /area/submap/eclipselava)
"Ad" = (
/obj/structure/cliff/automatic{
dir = 2
},
/turf/simulated/floor/lava,
/area/submap/eclipselava)
"Bm" = ( "Bm" = (
/turf/template_noop, /turf/template_noop,
/area/template_noop) /area/template_noop)
@@ -1435,7 +1453,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
Rz Rz
gu gu
@@ -1487,7 +1505,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
WP WP
bp bp
@@ -1539,7 +1557,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
dj dj
MO MO
@@ -1591,7 +1609,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
dj dj
Ez Ez
@@ -1643,7 +1661,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
dj dj
MO MO
@@ -1695,7 +1713,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
WP WP
bp bp
@@ -1747,7 +1765,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
dj dj
MO MO
@@ -1799,7 +1817,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
dj dj
gt gt
@@ -1851,7 +1869,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
wU wU
QN QN
@@ -1903,7 +1921,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
MO MO
qb qb
@@ -1955,7 +1973,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
MO MO
MO MO
@@ -2007,7 +2025,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
eH mI
bp bp
bp bp
bp bp
@@ -2839,7 +2857,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
ZI fi
bp bp
bp bp
bp bp
@@ -2891,7 +2909,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
ZK ZK
Pq Pq
@@ -2943,7 +2961,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
En En
MO MO
@@ -2995,7 +3013,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
ph ph
Pm Pm
@@ -3047,7 +3065,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
En En
MO MO
@@ -3099,7 +3117,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
ZK ZK
Ej Ej
@@ -3151,7 +3169,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
bp bp
bp bp
@@ -3203,7 +3221,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
rs rs
MO MO
@@ -3255,7 +3273,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
Gl Gl
rs rs
@@ -3307,7 +3325,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
MO MO
rs rs
@@ -3359,7 +3377,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
MO MO
MO MO
@@ -3411,7 +3429,7 @@ Ke
Ke Ke
Ke Ke
Ke Ke
jU Ad
bp bp
rs rs
MO MO

View File

@@ -539,7 +539,7 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/pummler /mob/living/simple_mob/humanoid/eclipse/lunar/pummler
name = "Lunar Eclipse Punnler" name = "Lunar Eclipse Pummeler"
projectiletype = /obj/item/projectile/bullet/shotgun/ion/eclipse projectiletype = /obj/item/projectile/bullet/shotgun/ion/eclipse
ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
melee_damage_lower = 20 melee_damage_lower = 20