5 уаауаааааа

code/controllers/subsystem/mapping.dm

@@ -37,12 +37,12 @@ SUBSYSTEM_DEF(mapping)
 	system_name = config.system_name
 	system_name = config.system_name_ru
 
-	if(config.map_module)
-		load_map_module(config.map_module)
-
 	loadWorld()
 	renameAreas()
 
+	if(config.map_module)
+		load_map_module(config.map_module)
+
 	process_teleport_locs()			//Sets up the wizard teleport locations
 	process_ghost_teleport_locs()	//Sets up ghost teleport locations.
 

code/game/gamemodes/factions/alien.dm

@@ -32,7 +32,7 @@
 	H.voice_name = "Gilbert Kane"
 
 	var/obj/item/alien_embryo/new_embryo = new /obj/item/alien_embryo(H)
-	var/mob/living/carbon/xenomorph/larva/alien/new_xeno = new /mob/living/carbon/xenomorph/larva(new_embryo)
+	var/mob/living/carbon/xenomorph/larva/new_xeno = new /mob/living/carbon/xenomorph/larva/alien(new_embryo)
 	new_xeno.loc = new_embryo
 	new_embryo.baby = new_xeno
 	new_embryo.controlled_by_ai = FALSE

code/game/gamemodes/modes_declares/alien.dm

@@ -5,9 +5,9 @@
 
 	factions_allowed = list(/datum/faction/alien)
 
-	minimum_player_count = 0
-	minimum_players_bundles = 6
+	minimum_player_count = 1
+	minimum_players_bundles = 8
 
 /datum/game_mode/alien/announce()
 	to_chat(world, "<b>Текущий режим игры - Чужой!</b>")
-	to_chat(world, "<b>Это <span class='userdanger'>Ксеноморф</span> на корабле. Экипаж: Убейте эту тварь как можно скорее.</b>")
+	to_chat(world, "<b><span class='userdanger'>Ксеноморф</span> на корабле! Экипаж, убейте эту тварь как можно скорее!</b>")

code/game/gamemodes/roles/alien.dm

@@ -11,10 +11,13 @@
 
 /datum/role/alien/Greet(greeting, custom)
 	. = ..()
-	to_chat(antag.current, {"<span class='notice'><b>Вы - ксеноморф. Ваша текущая форма - грудолом.
-Сейчас вы очень слабы и вас легко убить.
-Прячьтесь под предметами и передвигайтесь по вентиляции, что бы сохранить свою жизнь.
-Ваша главная задача - вырасти во взрослого ксеноморфа. Прогресс роста указан во вкладке Status.
-
+	to_chat(antag.current, {"<span class='notice'><b>
+Вы - ксеноморф. Ваша текущая форма - грудолом.
+Жмите кнопку внизу, чтобы пробиться сквозь грудную клетку своего носителя.
+Выбравшись наружу - бегите и прячьтесь, сейчас вы очень слабы и вас легко убить.
+Ваша задача - вырасти во взрослого ксеноморфа. Прогресс роста указан во вкладке Status.
+На этом процесс эволюции не закончится, даже будучи взрослой особью вам есть куда расти.
+Вы пассивно накапливаете очки эволюции, за которые будут открываться новые стадии развития и способности.
+Этот процесс можно ускорить, нападая на экипаж. Вам будут выдаваться очки за успешные агрессивные действия.
+Информация о ходе эволюции находится во вкладке Status.
 ------------------</b></span>"})
-

code/game/mecha/combat/gygax.dm

@@ -100,7 +100,10 @@
 		cell = C
 		return
 	cell = new(src)
-	cell.charge = 30000
+	if(map_discharged)
+		cell.charge = 0
+	else
+		cell.charge = 30000
 	cell.maxcharge = 30000
 
 

code/game/mecha/mecha.dm

@@ -36,6 +36,8 @@
 	//the values in this list show how much damage will pass through, not how much will be absorbed.
 	var/list/damage_absorption = list(BRUTE=0.8,BURN=1.2,BULLET=0.9,LASER=1,ENERGY=1,BOMB=1)
 	var/obj/item/weapon/stock_parts/cell/cell
+	//spawn with empty battery
+	var/map_discharged = FALSE
 	var/state = 0
 	var/list/log = new
 	var/last_message = 0
@@ -148,7 +150,10 @@
 		return
 	cell = new(src)
 	cell.name = "high-capacity power cell"
-	cell.charge = 15000
+	if(map_discharged)
+		cell.charge = 0
+	else
+		cell.charge = 15000
 	cell.maxcharge = 15000
 
 /obj/mecha/proc/add_cabin()

code/modules/map_module/_map_module.dm

@@ -13,7 +13,7 @@
 	var/gamemode
 
 	// lobby image and music
-	var/icon/map_lobby_image
+	var/map_lobby_image
 	var/map_lobby_music
 
 	// todo: default stats

code/modules/map_module/alien.dm

@@ -2,9 +2,10 @@
 	name = MAP_MODULE_ALIEN
 
 	default_event_name = "Alien"
-	default_event_message = {"В космосе твой крик никто не услышит..."}
+	default_event_message = {"В космосе твой крик никто не услышит."}
 
 	gamemode = "Alien"
+	config_disable_random_events = TRUE
 
-	map_lobby_image = icon('html/media/lobby_alien.png')
+	map_lobby_image = 'html/media/lobby_alien.png'
 	map_lobby_music = 'sound/lobby/alien_main.ogg'

code/modules/mob/dead/new_player/lobby.dm

@@ -140,7 +140,7 @@ var/global/lobby_screen = "lobby"
 	dat += {"<a class="menu_a" href='?src=\ref[src];lobby_changelog=1'>CHANGELOG</a>"}
 
 	dat += "</div></div>"
-	
+
 	if(global.custom_lobby_image)
 		dat += {"<img src="titlescreen.gif" class="background" alt="">"}
 	else if (client.prefs.lobbyanimation)

code/modules/mob/living/carbon/xenomorph/humanoid/caste/alien.dm

@@ -3,39 +3,82 @@
 	icon_state = "alien_s"
 	caste = ""
 	pixel_x = -8
-	heal_rate = 2
+	ventcrawler = 0
+	storedPlasma = 150
 	var/epoint = 0
 	var/estage = 1
+	var/epoint_cap = 500
+	alien_spells = list(/obj/effect/proc_holder/spell/no_target/weeds)
 
 /mob/living/carbon/xenomorph/humanoid/hunter/alien/atom_init()
 	. = ..()
-	name = "alien"
+	name = "Alien"
 	real_name = name
 	alien_list[ALIEN_HUNTER] += src
 
+// Со временем ксенос должен становиться сильнее, чтобы экипаж не мог закрыться где-то и сидеть в обороне
 /mob/living/carbon/xenomorph/humanoid/hunter/alien/Life()
-	epoint += 1
-	if(estage == 1 && epoint > 300)
-		stage_two()
-	if(estage == 2 && epoint > 600)
-		stage_three()
-	if(estage == 3 && epoint > 1200)
-		stage_four()
+	if(!invisible)
+		epoint += 1
+	if (epoint > epoint_cap)
+		next_stage()
 	. = ..()
 
-/mob/living/carbon/xenomorph/humanoid/hunter/alien/proc/stage_two()
-	estage = 2
-	maxHealth = 240
-	verbs.Add(/mob/living/carbon/xenomorph/humanoid/proc/neurotoxin)
-
-/mob/living/carbon/xenomorph/humanoid/hunter/alien/proc/stage_three()
-	estage = 3
-	maxHealth = 300
-	verbs.Add(/mob/living/carbon/xenomorph/humanoid/proc/corrosive_acid)
-
-/mob/living/carbon/xenomorph/humanoid/hunter/alien/proc/stage_four(mob/user = usr)
-	var/mob/living/carbon/xenomorph/humanoid/alien = /mob/living/carbon/xenomorph/humanoid/queen
-	var/mob/new_xeno = new alien(user.loc)
-	user.mind.transfer_to(new_xeno)
-	new_xeno.mind.name = new_xeno.real_name
-	qdel(user)
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/proc/next_stage()
+	to_chat(src, "<span class='notice'>Вы перешли на новую стадию эволюции!</span>")
+	estage++
+	epoint -= epoint_cap
+	switch(estage)
+		if (2)
+			maxHealth = 240
+			heal_rate = 4
+			verbs.Add(/mob/living/carbon/xenomorph/humanoid/proc/corrosive_acid, /mob/living/carbon/xenomorph/humanoid/proc/neurotoxin)
+			update_icons()
+		if (3)
+			plasma_rate = 10
+			max_plasma = 200
+			alien_spells += /obj/effect/proc_holder/spell/no_target/resin
+		if (4)
+			maxHealth = 300
+			heal_rate = 5
+			plasma_rate = 15
+			max_plasma = 300
+		if (5)
+			var/mob/living/carbon/xenomorph/humanoid/alien = /mob/living/carbon/xenomorph/humanoid/queen
+			var/mob/new_xeno = new alien(src.loc)
+			src.mind.transfer_to(new_xeno)
+			new_xeno.mind.name = new_xeno.real_name
+			qdel(src)
+
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/Stat()
+	..()
+	stat(null)
+	if(statpanel("Status"))
+		stat("Очки эволюции: [epoint]/[epoint_cap]")
+		stat("Стадия эволюции: [estage]/5")
+
+// Если включается одно, выключается другое
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/toggle_neurotoxin(message = TRUE)
+	..()
+	if(leap_on_click)
+		leap_on_click = 0
+		leap_icon.update_icon(src)
+		update_icons()
+
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/toggle_leap(message = TRUE)
+	..()
+	if(neurotoxin_on_click)
+		neurotoxin_on_click = 0
+		neurotoxin_icon.icon_state = "neurotoxin0"
+		update_icons()
+
+// Ксенос должен поощряться за активную и агрессивную игру
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/successful_leap()
+	epoint += 100
+
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/UnarmedAttack(atom/A)
+	..()
+	if(ishuman(A))
+		var/mob/living/carbon/human/H = A
+		if(H.stat != DEAD)
+			epoint += 20

code/modules/mob/living/carbon/xenomorph/humanoid/caste/hunter.dm

@@ -108,6 +108,7 @@
 			step_towards(src, L)
 			toggle_leap(FALSE)
 			playsound(src, pick(SOUNDIN_HUNTER_LEAP), VOL_EFFECTS_MASTER, vary = FALSE)
+			successful_leap()
 	else if(hit_atom.density)
 		visible_message("<span class='danger'>[src] smashes into [hit_atom]!</span>", "<span class='alertalien'>You smashes into [hit_atom]!</span>")
 		playsound(hit_atom, 'sound/effects/hulk_attack.ogg', VOL_EFFECTS_MASTER)
@@ -118,6 +119,9 @@
 	VARSET_IN(src, pounce_cooldown, FALSE, pounce_cooldown_time)
 	update_canmove()
 
+/mob/living/carbon/xenomorph/humanoid/hunter/proc/successful_leap()
+	return
+
 #undef MAX_ALIEN_LEAP_DIST
 
 /mob/living/carbon/xenomorph/humanoid/hunter/crawl()

code/modules/mob/living/carbon/xenomorph/humanoid/update_icons.dm

@@ -267,6 +267,21 @@
 	if(on_fire)
 		underlays += image(icon = 'icons/mob/OnFire.dmi', icon_state = fire_underlay_state)
 
+/mob/living/carbon/xenomorph/humanoid/hunter/alien/update_fire()
+	remove_standing_overlay(X_FIRE_UPPER_LAYER)
+	update_fire_underlay()
+	if(on_fire)
+		var/image/over = image(icon = 'icons/mob/OnFire48x48.dmi', icon_state = "human_overlay", layer = -X_FIRE_UPPER_LAYER)
+		over.plane = LIGHTING_LAMPS_PLANE
+		overlays_standing[X_FIRE_UPPER_LAYER] = over
+	apply_standing_overlay(X_FIRE_UPPER_LAYER)
+
+/mob/living/carbon/xenomorph/hunter/alien/update_fire_underlay()
+	if(!fire_underlay_state)
+		return
+	underlays.Cut()
+	if(on_fire)
+		underlays += image(icon = 'icons/mob/OnFire48x48.dmi', icon_state = fire_underlay_state)
 
 //Xeno Overlays Indexes//////////
 #undef X_R_HAND_LAYER

code/modules/mob/living/carbon/xenomorph/larva/larva.dm

@@ -81,5 +81,13 @@
 /mob/living/carbon/xenomorph/larva/alien
 	maxHealth = 50
 	health = 50
+	speed = -1.5
+	ventcrawler = 0
 	alien_spells = list(/obj/effect/proc_holder/spell/no_target/hide,
 						/obj/effect/proc_holder/spell/no_target/larva_evolve/alien)
+
+/mob/living/carbon/xenomorph/larva/alien/atom_init()
+	. = ..()
+	name = "alien larva"
+	real_name = name
+

config/example/maps.txt

@@ -55,3 +55,8 @@ map stroechka
 	votable
 	maxplayers 10
 endmap
+
+map nostromo
+	votable
+	maxplayers 10
+endmap

maps/boxstation/boxstation.dmm

@@ -19030,7 +19030,6 @@
 "aHJ" = (
 /obj/machinery/vending/cigarette,
 /turf/simulated/floor{
-	dir = 2;
 	icon_state = "bluecorner"
 	},
 /area/station/hallway/primary/fore)
@@ -23547,7 +23546,6 @@
 "aQb" = (
 /obj/structure/flora/tree/jungle,
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -23632,7 +23630,6 @@
 	pixel_y = 23
 	},
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -24520,7 +24517,6 @@
 "aRK" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -24553,7 +24549,6 @@
 "aRO" = (
 /obj/machinery/atmospherics/components/unary/vent_pump/on,
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -29471,7 +29466,6 @@
 "bas" = (
 /obj/structure/flora/junglebush/b,
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -29577,7 +29571,6 @@
 "baC" = (
 /obj/structure/flora/ausbushes/reedbush,
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -57084,7 +57077,6 @@
 /area/station/maintenance/engineering)
 "cdn" = (
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor/grass,
@@ -59643,17 +59635,13 @@
 /area/station/civilian/garden)
 "cla" = (
 /obj/structure/stool/bed/bench,
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "clb" = (
 /obj/structure/stool/bed/bench{
 	icon_state = "bench_2"
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "clc" = (
 /obj/item/weapon/cigbutt,
@@ -60037,9 +60025,7 @@
 "clU" = (
 /obj/machinery/disposal,
 /obj/structure/disposalpipe/trunk,
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "clZ" = (
 /obj/structure/window/thin/reinforced,
@@ -61455,9 +61441,7 @@
 /obj/structure/disposalpipe/segment{
 	dir = 4
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cpF" = (
 /obj/structure/cable{
@@ -63591,9 +63575,7 @@
 /turf/simulated/floor,
 /area/station/hallway/primary/starboard)
 "cuE" = (
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cuF" = (
 /obj/structure/table/reinforced,
@@ -63882,9 +63864,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cvx" = (
 /obj/item/weapon/flora/random,
@@ -64437,9 +64417,7 @@
 	dir = 8;
 	icon_state = "pipe-c"
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cxA" = (
 /obj/effect/decal/cleanable/blood/oil,
@@ -66274,9 +66252,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cCu" = (
 /turf/simulated/floor{
@@ -66413,9 +66389,7 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 10
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cCL" = (
 /obj/machinery/atmospherics/components/unary/vent_scrubber/on{
@@ -68964,9 +68938,7 @@
 	dir = 1;
 	icon_state = "bench_2"
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cLS" = (
 /obj/structure/cable/yellow{
@@ -69093,9 +69065,7 @@
 /obj/structure/stool/bed/bench{
 	dir = 1
 	},
-/turf/simulated/floor/garden{
-	icon_state = "asteroid"
-	},
+/turf/simulated/floor/garden,
 /area/station/civilian/garden)
 "cMo" = (
 /obj/item/clothing/suit/justice,

maps/nostromo.json

@@ -0,0 +1,16 @@
+{
+    "map_name": "Nostromo (Alien)",
+    "map_path": "_events",
+    "map_file": "nostromo.dmm",
+    "station_name": "Nostromo",
+    "station_name_ru": "Ностромо",
+    "system_name": "Tau Ceti",
+    "station_image": "nostromo",
+    "traits": [{"Linkage": null}],
+    "space_ruin_levels": 0,
+    "space_empty_levels": 0,
+    "load_junkyard": 0,
+    "smartlight_preset": "default",
+    "map_module": "Alien",
+    "minetype": null
+}

maps/palette/palette.dmm

@@ -101,7 +101,6 @@
 	icon_state = "spline_fancy"
 	},
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy_corner"
 	},
 /turf/simulated/floor,
@@ -733,7 +732,6 @@
 /area/space)
 "gs" = (
 /obj/effect/decal/turf_decal/wood{
-	dir = 2;
 	icon_state = "spline_fancy"
 	},
 /turf/simulated/floor,
@@ -2024,7 +2022,6 @@
 	icon_state = "siding_line"
 	},
 /obj/effect/decal/turf_decal/blue{
-	dir = 2;
 	icon_state = "siding_corner"
 	},
 /obj/effect/decal/turf_decal/blue{
@@ -2146,12 +2143,6 @@
 	icon_state = "escape"
 	},
 /area/space)
-"sf" = (
-/turf/simulated/floor{
-	dir = 2;
-	icon_state = "bluecorner"
-	},
-/area/space)
 "sg" = (
 /obj/effect/decal/turf_decal/blue{
 	icon_state = "box_white"
@@ -4527,7 +4518,6 @@
 /area/space)
 "KQ" = (
 /obj/effect/decal/turf_decal/purple{
-	dir = 2;
 	icon_state = "siding_line"
 	},
 /turf/simulated/floor,
@@ -4800,7 +4790,6 @@
 /area/space)
 "MS" = (
 /obj/effect/decal/turf_decal/metal{
-	dir = 2;
 	icon_state = "spline_plain"
 	},
 /turf/simulated/floor,
@@ -7226,7 +7215,7 @@ CD
 SE
 CD
 aO
-sf
+Ou
 Ah
 vy
 Sw
@@ -7241,12 +7230,12 @@ Pw
 Fj
 UH
 Vg
-sf
+Ou
 Og
 VM
 Qe
 lu
-sf
+Ou
 gT
 yP
 iT