Merge pull request #668 from RalseiDreemuurr/mapping

Фиксы руин

_maps/_mod_celadon/RandomRuins/IceRuins/icemoon_surface_corporate_rejects.dmm

@@ -84,8 +84,7 @@
 "cN" = (
 /obj/structure/safe/floor,
 /obj/item/hand_tele,
-/obj/item/stack/sheet/mineral/adamantine,
-/obj/item/stack/sheet/mineral/adamantine,
+/obj/item/stack/sheet/mineral/hidden/hellstone/twenty,
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/ruin/unpowered/corprejectrooms)
 "cP" = (
@@ -1726,11 +1725,7 @@
 /obj/item/spacecash/bundle/c1000,
 /obj/item/spacecash/bundle/c1000,
 /obj/item/stack/sheet/bluespace_crystal/five,
-/obj/item/stack/sheet/mineral/bananium{
-	amount = 15
-	},
 /obj/item/stack/sheet/mineral/gold/twenty,
-/obj/item/stack/sheet/mineral/runite/ten,
 /obj/item/toy/figure/captain,
 /obj/item/organ/cyberimp/brain/anti_stun,
 /obj/item/disk/design_disk/adv/knight_gear,

_maps/_mod_celadon/RandomRuins/SpaceRuins/crashedship.dmm

@@ -2232,7 +2232,7 @@
 /turf/closed/mineral/diamond,
 /area/awaymission/BMPship)
 "hw" = (
-/turf/closed/mineral/bananium,
+/turf/closed/mineral/gold,
 /area/awaymission/BMPship)
 "hE" = (
 /turf/closed/wall/mineral/titanium/nodiagonal,
@@ -2247,6 +2247,9 @@
 /obj/structure/closet,
 /turf/open/floor/carpet,
 /area/awaymission/BMPship/Fore)
+"lG" = (
+/turf/closed/mineral/gibtonite,
+/area/awaymission/BMPship)
 "pe" = (
 /obj/machinery/light/directional/south,
 /obj/effect/turf_decal/corner/transparent/bar,
@@ -2481,6 +2484,9 @@
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/BMPship/Aft)
+"Ma" = (
+/turf/closed/mineral/gibtonite,
+/area/awaymission/BMPship/Midship)
 "Mx" = (
 /turf/closed/mineral/random,
 /area/awaymission/BMPship/Midship)
@@ -3367,7 +3373,7 @@ gb
 gb
 gb
 gb
-gb
+lG
 gb
 gb
 hv
@@ -3519,14 +3525,14 @@ gb
 gb
 gb
 gb
+hw
 gb
 gb
 gb
 gb
 gb
 gb
 gb
-hw
 gb
 gb
 fS
@@ -3627,7 +3633,7 @@ gb
 gb
 gb
 gb
-hw
+gb
 gb
 gb
 gb
@@ -3676,10 +3682,10 @@ gb
 gb
 gb
 gb
+hw
 gb
 gb
 gb
-hw
 gb
 gb
 gb
@@ -3725,7 +3731,7 @@ gb
 gb
 gb
 gb
-gb
+hw
 gb
 gb
 gb
@@ -3979,7 +3985,7 @@ gb
 gb
 gb
 gb
-gb
+hw
 gb
 gb
 gb
@@ -4126,7 +4132,7 @@ fm
 at
 gL
 gs
-Mx
+Ma
 Mx
 gb
 gb

_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_clowncrash.dmm

@@ -96,7 +96,7 @@
 /area/overmap_encounter/planetoid/cave/explored)
 "r" = (
 /obj/structure/table/reinforced,
-/obj/item/stack/ore/bananium,
+/obj/item/megaphone/clown,
 /turf/open/floor/plating/asteroid,
 /area/overmap_encounter/planetoid/cave/explored)
 "s" = (
@@ -175,11 +175,14 @@
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "I" = (
-/obj/item/clothing/suit/space/hardsuit/clown,
-/obj/item/clothing/head/helmet/space/hardsuit/clown,
 /obj/structure/rack,
 /obj/machinery/power/terminal,
 /obj/structure/cable,
+/obj/item/storage/backpack/duffelbag/clown/syndie,
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat,
+/obj/item/clothing/suit/space/hardsuit/ert/clown{
+	armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 35, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+	},
 /turf/open/floor/noslip,
 /area/overmap_encounter/planetoid/cave/explored)
 "J" = (
@@ -252,6 +255,7 @@
 /obj/structure/table/reinforced,
 /obj/item/seeds/banana/bluespace,
 /obj/item/circuitboard/computer/arcade/orion_trail,
+/obj/item/robot_module/clown,
 /turf/open/floor/plating/asteroid/wasteplanet,
 /area/overmap_encounter/planetoid/cave/explored)
 "X" = (

_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm

@@ -342,7 +342,7 @@
 "cX" = (
 /obj/structure/statue/bananium/clown,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating,
 /area/ruin/powered)
 "dg" = (
 /obj/structure/sign/poster/contraband/eat,
@@ -430,7 +430,7 @@
 /area/ruin/powered)
 "ed" = (
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "ee" = (
 /obj/machinery/photocopier,
@@ -578,12 +578,12 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "fk" = (
-/obj/machinery/door/airlock/bananium{
-	name = "Clown Embassy";
-	dir = 4
-	},
 /obj/item/grown/bananapeel,
-/turf/open/floor/mineral/bananium,
+/obj/structure/barricade/wooden/crude,
+/obj/machinery/door/airlock/maintenance{
+	name = "Detective Halligan's Office"
+	},
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "fn" = (
 /obj/effect/gibspawner/human,
@@ -695,7 +695,7 @@
 /area/ruin/powered)
 "go" = (
 /obj/machinery/light/small/directional/west,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating,
 /area/ruin/powered)
 "gp" = (
 /mob/living/simple_animal/hostile/rat,
@@ -735,7 +735,8 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "gL" = (
-/turf/open/floor/mineral/bananium,
+/obj/item/grown/bananapeel,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "gM" = (
 /obj/structure/rack,
@@ -762,7 +763,7 @@
 /area/ruin/powered)
 "hd" = (
 /obj/item/reagent_containers/food/snacks/cakeslice/clown_slice,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "he" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -950,7 +951,7 @@
 /mob/living/simple_animal/hostile/retaliate/clown/mutant/blob,
 /obj/effect/gibspawner/human,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "jr" = (
 /obj/structure/table/reinforced,
@@ -1123,7 +1124,7 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "kO" = (
 /obj/item/trash/chips,
@@ -1133,7 +1134,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "kS" = (
 /obj/effect/decal/cleanable/blood,
@@ -1507,7 +1508,7 @@
 /obj/item/pneumatic_cannon/pie,
 /obj/item/reagent_containers/spray/waterflower/lube,
 /obj/machinery/light/small/directional/east,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "nK" = (
 /obj/structure/table,
@@ -2180,7 +2181,6 @@
 /area/ruin/powered)
 "uD" = (
 /obj/structure/rack,
-/obj/effect/mob_spawn/drone,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/trash/raisins,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -2375,7 +2375,6 @@
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
 /obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
 /area/ruin/powered)
 "vX" = (
 /obj/item/ammo_casing,
@@ -2773,7 +2772,7 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/decal/cleanable/generic,
 /obj/item/trash/cheesie,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "Aa" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -3113,7 +3112,6 @@
 /area/ruin/powered)
 "Cy" = (
 /obj/structure/closet/cardboard,
-/obj/item/coin/bananium,
 /obj/item/reagent_containers/food/snacks/soup/clownstears,
 /turf/open/floor/plating,
 /area/ruin/powered)
@@ -3524,7 +3522,7 @@
 /obj/structure/table/wood/fancy/orange,
 /obj/item/toy/figure/clown,
 /obj/item/trash/candle,
-/turf/open/floor/plating,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "GF" = (
 /obj/structure/table/bronze,
@@ -4333,7 +4331,7 @@
 "Ow" = (
 /obj/structure/table/wood/fancy/orange,
 /obj/item/clothing/under/rank/civilian/clown/rainbow,
-/turf/open/floor/mineral/bananium,
+/turf/open/floor/plating/rust,
 /area/ruin/powered)
 "Ox" = (
 /obj/effect/decal/cleanable/dirt/dust,
@@ -4421,8 +4419,8 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "Pr" = (
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/mineral/bananium,
+/obj/item/trash/cheesie,
+/turf/open/floor/plating,
 /area/ruin/powered)
 "Px" = (
 /mob/living/simple_animal/hostile/rat,
@@ -4828,7 +4826,9 @@
 	name = "The Great Throne"
 	},
 /mob/living/simple_animal/hostile/regalrat{
-	dir = 8
+	dir = 8;
+	del_on_death = 1;
+	loot = list(/obj/effect/gibspawner/generic/animal)
 	},
 /obj/effect/decal/cleanable/blood,
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
@@ -5860,7 +5860,7 @@ KR
 WN
 bC
 Ru
-gL
+av
 Cy
 xx
 vD
@@ -5903,7 +5903,7 @@ xx
 rJ
 xx
 xx
-fk
+gL
 bC
 Xe
 Xe
@@ -5988,12 +5988,12 @@ fj
 cU
 jG
 xx
-ed
+Pr
 eL
 zW
-Pr
+XF
 yd
-gL
+av
 bC
 KC
 bG
@@ -6033,8 +6033,8 @@ LU
 mG
 xx
 jz
-gL
-gL
+Hp
+Hp
 wk
 dM
 kK
@@ -6124,7 +6124,7 @@ cX
 we
 VK
 nt
-Pr
+XF
 nJ
 xx
 zV