Merge pull request #734 from CeladonSS13/beta-dev

#9 Перенос обновлений с Beta на Alpha сервер

_maps/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm

@@ -241,7 +241,7 @@
 	},
 /obj/effect/mob_spawn/human/corpse/damaged,
 /obj/item/clothing/under/rank/civilian/chaplain,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
+/obj/item/clothing/head/witchunter,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/mineral/titanium/blue,

_maps/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -153,7 +153,7 @@
 /obj/item/melee/cleric_mace{
 	pixel_x = 5
 	},
-/obj/item/clothing/head/helmet/chaplain/ancient{
+/obj/item/clothing/head/witchunter{
 	pixel_y = 13;
 	pixel_x = -5
 	},

_maps/RandomRuins/SpaceRuins/spacemall.dmm

@@ -2809,10 +2809,9 @@
 /obj/item/clothing/head/collectable/chef,
 /obj/item/clothing/head/collectable/HoP,
 /obj/item/clothing/head/collectable/rabbitears,
-/obj/item/clothing/head/helmet/chaplain,
+/obj/item/clothing/head/witchunter,
 /obj/item/clothing/neck/cloak/trans,
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/item/clothing/neck/beads,
 /obj/item/clothing/neck/necklace/dope,
 /obj/item/clothing/neck/stripedredscarf,

_maps/RandomRuins/WasteRuins/wasteplanet_pandora.dmm

@@ -424,7 +424,7 @@
 "qo" = (
 /obj/structure/closet/cabinet,
 /obj/item/spear/bonespear,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /obj/item/reagent_containers/food/snacks/grown/berries/death,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
@@ -461,7 +461,7 @@
 /area/ruin/wasteplanet)
 "qU" = (
 /obj/structure/closet/cabinet,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "rh" = (
@@ -492,7 +492,7 @@
 "sV" = (
 /obj/structure/closet/cabinet,
 /obj/item/claymore/bone,
-/obj/item/clothing/suit/armor/riot/chaplain/studentuni,
+/obj/item/clothing/suit/armor/witchhunter,
 /turf/open/floor/wood/waste,
 /area/ruin/wasteplanet)
 "tB" = (

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_SPOOKYCRASH.dmm

@@ -240,8 +240,6 @@
 	dir = 1
 	},
 /obj/effect/mob_spawn/human/corpse/damaged,
-/obj/item/clothing/under/rank/civilian/chaplain,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/glass,
 /turf/open/floor/mineral/titanium/blue,

_maps/_mod_celadon/RandomRuins/LavaRuins/lavaland_surface_lava_canyon.dmm

@@ -153,10 +153,6 @@
 /obj/item/melee/cleric_mace{
 	pixel_x = 5
 	},
-/obj/item/clothing/head/helmet/chaplain/ancient{
-	pixel_y = 13;
-	pixel_x = -5
-	},
 /obj/effect/decal/cleanable/blood/old,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit,
 /area/overmap_encounter/planetoid/lava/explored)
@@ -906,6 +902,9 @@
 /obj/structure/stone_tile/surrounding/cracked{
 	dir = 8
 	},
+/obj/effect/mob_spawn/human/corpse{
+	mob_species = /datum/species/lizard/ashwalker
+	},
 /turf/open/floor/plating/ashplanet/rocky,
 /area/ruin/unpowered/scorched_hut)
 "zz" = (
@@ -1646,9 +1645,6 @@
 /obj/structure/stone_tile/block/cracked{
 	dir = 6
 	},
-/obj/effect/mob_spawn/human/corpse{
-	mob_species = /datum/species/lizard/ashwalker
-	},
 /turf/open/floor/plating/ashplanet/rocky,
 /area/ruin/unpowered/scorched_hut)
 "UA" = (

_maps/_mod_celadon/RandomRuins/SpaceRuins/dangerous_research.dmm

@@ -333,7 +333,6 @@
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/effect/mob_spawn/human/scientist,
 /obj/effect/decal/cleanable/blood/bubblegum,
-/obj/item/switchblade,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav)
 "ln" = (
@@ -1843,8 +1842,8 @@
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav)
 "Vm" = (
-/mob/living/simple_animal/hostile/faithless,
 /obj/effect/turf_decal/industrial/warning,
+/mob/living/simple_animal/hostile/faithless,
 /turf/open/floor/plasteel/white,
 /area/ruin/space/has_grav)
 "Vo" = (
@@ -2706,7 +2705,7 @@ Bg
 Bg
 Ns
 fq
-OB
+Vm
 rr
 VL
 Ja
@@ -2748,7 +2747,7 @@ Bg
 Bg
 Ns
 GN
-Vm
+OB
 dI
 CD
 Rn

_maps/_mod_celadon/RandomRuins/SpaceRuins/spacemall.dmm

@@ -2809,15 +2809,14 @@
 /obj/item/clothing/head/collectable/chef,
 /obj/item/clothing/head/collectable/HoP,
 /obj/item/clothing/head/collectable/rabbitears,
-/obj/item/clothing/head/helmet/chaplain,
 /obj/item/clothing/neck/cloak/trans,
 /obj/item/clothing/neck/cloak/cap,
-/obj/item/clothing/head/helmet/chaplain/witchunter_hat,
 /obj/item/clothing/neck/beads,
 /obj/item/clothing/neck/necklace/dope,
 /obj/item/clothing/neck/stripedredscarf,
 /obj/item/clothing/neck/stripedgreenscarf,
 /obj/item/clothing/neck/stripedbluescarf,
+/obj/item/clothing/mask/pig,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shop)
 "kD" = (
@@ -6857,7 +6856,6 @@
 /obj/item/clothing/mask/horsehead,
 /obj/item/clothing/mask/gondola,
 /obj/item/clothing/mask/spamton,
-/obj/item/clothing/mask/pig,
 /turf/open/floor/plasteel,
 /area/ruin/space/has_grav/spacemall/shop)
 "zN" = (

_maps/_mod_celadon/RandomRuins/WasteRuins/wasteplanet_fortress_of_solitide.dmm

@@ -340,8 +340,18 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "cX" = (
-/obj/structure/statue/bananium/clown,
 /obj/effect/decal/cleanable/cobweb/cobweb2,
+/obj/item/megaphone/clown,
+/obj/item/clothing/under/rank/civilian/clown/jester,
+/obj/item/clothing/shoes/clown_shoes/banana_shoes/combat,
+/obj/item/borg/upgrade/transform/clown,
+/obj/item/stamp/clown,
+/obj/item/nullrod/clown,
+/obj/structure/closet/secure_closet/freezer/cream_pie,
+/obj/effect/mob_spawn/human/clown/corpse,
+/obj/item/clothing/suit/space/hardsuit/ert/clown{
+	armor = list("melee" = 35, "bullet" = 35, "laser" = 35, "energy" = 35, "bomb" = 35, "bio" = 100, "rad" = 100, "fire" =100, "acid" = 100)
+	},
 /turf/open/floor/plating,
 /area/ruin/powered)
 "dg" = (
@@ -504,11 +514,6 @@
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"eL" = (
-/mob/living/simple_animal/hostile/rat,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "eM" = (
 /obj/structure/chair/wood{
 	dir = 4
@@ -578,7 +583,6 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "fk" = (
-/obj/item/grown/bananapeel,
 /obj/structure/barricade/wooden/crude,
 /obj/machinery/door/airlock/maintenance{
 	name = "Detective Halligan's Office"
@@ -694,7 +698,10 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "go" = (
-/obj/machinery/light/small/directional/west,
+/mob/living/simple_animal/hostile/clown/clownhulk{
+	name = "Биба";
+	health = 500
+	},
 /turf/open/floor/plating,
 /area/ruin/powered)
 "gp" = (
@@ -948,7 +955,6 @@
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "jn" = (
-/mob/living/simple_animal/hostile/retaliate/clown/mutant/blob,
 /obj/effect/gibspawner/human,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating/rust,
@@ -976,7 +982,10 @@
 /area/ruin/powered)
 "jz" = (
 /obj/effect/decal/cleanable/blood,
-/obj/effect/mob_spawn/human/clown/corpse,
+/obj/effect/decal/cleanable/dirt/dust,
+/mob/living/simple_animal/hostile/retaliate/clown/clownhulk/chlown{
+	name = "Боба"
+	},
 /turf/open/floor/plating,
 /area/ruin/powered)
 "jA" = (
@@ -1429,7 +1438,6 @@
 /area/ruin/powered)
 "nt" = (
 /obj/effect/decal/cleanable/blood,
-/mob/living/simple_animal/hostile/rat,
 /obj/effect/decal/cleanable/dirt/dust,
 /obj/item/trash/cheesie,
 /turf/open/floor/plating,
@@ -1954,11 +1962,6 @@
 /obj/effect/decal/cleanable/generic,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"rJ" = (
-/obj/structure/falsewall/reinforced,
-/obj/structure/sign/poster/retro/smile,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "rO" = (
 /obj/structure/curtain/cloth/fancy,
 /obj/item/trash/tray,
@@ -2168,10 +2171,6 @@
 /area/ruin/powered)
 "uB" = (
 /obj/structure/table/wood,
-/obj/item/switchblade{
-	pixel_x = -3;
-	pixel_y = 4
-	},
 /obj/item/coin/antagtoken{
 	pixel_x = 4;
 	pixel_y = -2
@@ -3482,7 +3481,6 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "Gq" = (
-/mob/living/simple_animal/hostile/retaliate/clown/fleshclown,
 /obj/effect/gibspawner/human,
 /obj/effect/decal/cleanable/dirt/dust,
 /turf/open/floor/plating,
@@ -3603,7 +3601,6 @@
 "HD" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/mob_spawn/human/clown/corpse,
-/mob/living/simple_animal/hostile/rat,
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
 "HH" = (
@@ -4633,10 +4630,6 @@
 	},
 /turf/open/floor/plating/rust,
 /area/ruin/powered)
-"Ru" = (
-/obj/effect/decal/cleanable/cobweb/cobweb2,
-/turf/open/floor/plating,
-/area/ruin/powered)
 "Rw" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/effect/decal/cleanable/glass,
@@ -5233,12 +5226,6 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/powered)
-"WN" = (
-/mob/living/simple_animal/hostile/retaliate/clown/fleshclown,
-/obj/effect/decal/cleanable/blood,
-/obj/effect/decal/cleanable/dirt/dust,
-/turf/open/floor/plating/rust,
-/area/ruin/powered)
 "WO" = (
 /obj/structure/sign/poster/contraband/twelve_gauge,
 /turf/closed/wall/r_wall/rust,
@@ -5582,7 +5569,6 @@
 /turf/open/floor/plating,
 /area/ruin/powered)
 "ZL" = (
-/mob/living/simple_animal/hostile/retaliate/clown/fleshclown,
 /obj/effect/decal/cleanable/blood,
 /obj/effect/decal/cleanable/cobweb,
 /turf/open/floor/plating,
@@ -5814,8 +5800,8 @@ xx
 ZL
 hd
 Gq
-Xe
-av
+Hp
+gL
 HD
 ff
 bC
@@ -5857,9 +5843,9 @@ vh
 bG
 jn
 KR
-WN
-bC
-Ru
+KR
+Hp
+Hp
 av
 Cy
 xx
@@ -5900,12 +5886,12 @@ er
 mh
 Xe
 xx
-rJ
-xx
-xx
-gL
-bC
-Xe
+Hp
+Hp
+Hp
+av
+Hp
+Hp
 Xe
 fJ
 bG
@@ -5948,7 +5934,7 @@ OE
 go
 Hp
 av
-zh
+jz
 ed
 xx
 ve
@@ -5989,7 +5975,7 @@ cU
 jG
 xx
 Pr
-eL
+dC
 zW
 XF
 yd
@@ -6032,7 +6018,7 @@ av
 LU
 mG
 xx
-jz
+Xt
 Hp
 Hp
 wk