TGS Test Merge (#1567)

code/game/turfs/simulated/water.dm

@@ -19,3 +19,25 @@
 /turf/open/water/safe
 	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
 	planetary_atmos = FALSE
+
+/turf/open/water/safe/electric
+	name = "electric water"
+	baseturfs = /turf/open/water/safe/electric
+	initial_gas_mix = OPENTURF_DEFAULT_ATMOS
+	color = COLOR_TEAL
+	light_range = 2
+	light_color = COLOR_TEAL
+
+/turf/open/water/safe/electric/Entered(atom/movable/arrived, atom/old_loc, list/atom/old_locs)
+	. = ..()
+	if(isliving(arrived))
+		var/mob/living/unlucky_mob = arrived
+		unlucky_mob.Stun(1.5 SECONDS)
+		unlucky_mob.Knockdown(10 SECONDS)
+		unlucky_mob.adjustFireLoss(15)
+		var/datum/effect_system/lightning_spread/s = new /datum/effect_system/lightning_spread
+		s.set_up(5, 1, unlucky_mob.loc)
+		s.start()
+		unlucky_mob.visible_message(span_danger("[unlucky_mob.name] is shocked by [src]!"), \
+		span_userdanger("You feel a powerful shock course through your body!"), \
+		span_hear("You hear a heavy electrical crack!"))

code/modules/awaymissions/gateway.dm

@@ -378,6 +378,10 @@ GLOBAL_LIST_EMPTY(gateway_destinations)
 	else
 		deactivate()
 
+
+/obj/machinery/gateway/away/required_key
+	requires_key = TRUE
+
 /* Gateway control computer */
 /obj/machinery/computer/gateway_control
 	name = "Gateway Control"

code/modules/awaymissions/mission_code/ihategordonareas.dm

@@ -0,0 +1,106 @@
+/area/awaymission/ihategordon
+	name = "Main sector H complex"
+	shipambience ='modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/main_complex_ambient_ihategordon.ogg'
+	ambientsounds = list('modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/main_complex_ambient_ihategordon.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/sector_h_ihategordon.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/servers_ihategordon.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/BMAS1.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/BMAS2.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/BMAS3.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/BMAS4.ogg')
+
+/area/awaymission/ihategordon/entrance
+	name = "Facility entrance"
+	icon_state = "awaycontent1"
+
+/area/awaymission/ihategordon/underground_tunnels
+	name = "Facility tunnels"
+	icon_state = "awaycontent4"
+
+/area/awaymission/ihategordon/entrance_hall
+	name = "Facility hall"
+	icon_state = "awaycontent11"
+
+/area/awaymission/ihategordon/hyperlaser_chamber
+	name = "Facility hyperlaser research chamber"
+	icon_state = "awaycontent14"
+
+/area/awaymission/ihategordon/science_tunnel
+	name = "Facility science tunnel"
+	icon_state = "awaycontent15"
+
+/area/awaymission/ihategordon/big_offices
+	name = "Big Facility offices"
+	icon_state = "awaycontent18"
+
+/area/awaymission/ihategordon/cryo_room
+	name = "Facility cryochambers reseach room"
+	icon_state = "awaycontent21"
+
+/area/awaymission/ihategordon/tram_room
+	name = "Facility tram stop"
+	icon_state = "awaycontent23"
+
+/area/awaymission/ihategordon/tram_tunnel
+	name = "tram tunnel"
+	icon_state = "awaycontent25"
+
+/area/awaymission/ihategordon/dorm_offices
+	name = "Facility dorm offices"
+	icon_state = "awaycontent27"
+
+/area/awaymission/ihategordon/sci_medbay
+	name = "Facility medbay"
+	icon_state = "awaycontent3"
+
+/area/awaymission/ihategordon/turret_lockdown_hall
+	name = "Facility lockdown hall"
+	icon_state = "awaycontent5"
+
+/area/awaymission/ihategordon/emitter_chambers
+	name = "Facility emitter testing room"
+	icon_state = "awaycontent7"
+
+/area/awaymission/ihategordon/sec_armory
+	name = "Facility armory"
+	icon_state = "awaycontent8"
+
+/area/awaymission/ihategordon/hecu_camp_hall
+	name = "Facility hecu halls"
+	icon_state = "awaycontent10"
+
+/area/awaymission/ihategordon/hecu_camp_medbay
+	name = "Facility hecu medbay"
+	icon_state = "awaycontent12"
+
+/area/awaymission/ihategordon/hecu_camp_bus_stop
+	name = "Facility hecu bus stop"
+	icon_state = "awaycontent13"
+
+/area/awaymission/ihategordon/hecu_camp
+	name = "Facility hecu main camp"
+	icon_state = "awaycontent15"
+
+/area/awaymission/ihategordon/hecu_abandoned_camp
+	name = "Facility destroyed hecu camps"
+	icon_state = "awaycontent16"
+
+/area/awaymission/ihategordon/server_rooms
+	name = "Facility desroyed servers"
+	icon_state = "awaycontent19"
+
+/area/awaymission/ihategordon/rocks
+	name = "Facility rocks"
+	icon_state = "awaycontent20"
+
+/area/awaymission/ihategordon/dining_room
+	name = "main dining room"
+	icon_state = "awaycontent21"
+
+/area/awaymission/ihategordon/faciluty_hallway
+	name = "facility hallway"
+	icon_state = "awaycontent4"
+
+/area/awaymission/ihategordon/dorm_rooms
+	name = "restrooms"
+	icon_state = "awaycontent6"
+
+/area/awaymission/ihategordon/outside/night
+	name = "Outside of facility"
+	lighting
+	shipambience ='modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/outside of sector h.ogg'
+	ambientsounds = list('modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/outside of sector h.ogg','modular_bluemoon/olgachan/blackmesafromnova/sound/ambience/sector h outside ambience.ogg')

modular_bluemoon/olgachan/blackmesafromnova/code/ghost_spawners.dm

@@ -0,0 +1,212 @@
+/obj/effect/mob_spawn/human/black_mesa
+	name = "Black mesa scientist"
+	icon = 'icons/obj/machines/sleeper.dmi'
+	icon_state = "sleeper_s"
+	density = TRUE
+	roundstart = FALSE
+	death = FALSE
+	outfit = /datum/outfit/science_team
+	short_desc = "Ты являешься одним из немногих выживших после инцидента в чёрной мезе"
+	flavour_text = "Ты старший научный научный сотрудник сектора H. Недавно тебя повысили в должности, перенаправив в этот сектор, но что-то пошло не так. Исходя из оповещений BMAS, По всему сектору начались портальные штормы. По этому вы, засев в одном из кабинетов, ждёте помощи."
+	important_info = "Не пытайся исследовать комплекс до прибытия экспедиционной группы. В случае, когда прошло 20 минут от начала раунда, а исследователи так и не пришли, ты можешь постепенно продвигаться по комплексу."
+/obj/effect/mob_spawn/human/black_mesa/special(mob/living/carbon/human/spawned_human)
+	. = ..()
+	spawned_human.remove_language(/datum/language/common)
+
+/datum/outfit/science_team
+	name = "science team member"
+
+	uniform = /obj/item/clothing/under/rank/rnd/scientist/halflife
+	suit = /obj/item/clothing/suit/toggle/labcoat
+	shoes = /obj/item/clothing/shoes/laceup
+	back = /obj/item/storage/backpack
+	backpack_contents = list(/obj/item/radio, /obj/item/reagent_containers/glass/beaker)
+	id = /obj/item/card/id
+	id_trim = /datum/id_trim/science_team
+
+/datum/id_trim/science_team
+	assignment = "Учёный Чёрной Мезы"
+	trim_state = "trim_scientist"
+
+/obj/effect/mob_spawn/human/black_mesa/guard
+	name = "Black mesa guard"
+	outfit = /datum/outfit/security_guard
+	short_desc = "Ты являешься выжившим охранником чёрной мезы"
+	flavour_text = "Ты один из охранников Чёрной Мезы, а конкретно Сектора H. Твоя работа была размеренной и спокойной, но что-то пошло не так. Теперь ты, оставшись со своим напарником, лежишь без сознания в чудом уцелевшем КПП охраны"
+/obj/effect/mob_spawn/human/black_mesa/guard/special(mob/living/carbon/human/spawned_human)
+	. = ..()
+	spawned_human.remove_language(/datum/language/common)
+
+/datum/outfit/security_guard
+	name = "Black mesa guard"
+	uniform = /obj/item/clothing/under/rank/security/officer/peacekeeper
+	head = /obj/item/clothing/head/helmet/blueshirt
+	gloves = /obj/item/clothing/gloves/color/black
+	suit = /obj/item/clothing/suit/armor/vest/blueshirt
+	shoes = /obj/item/clothing/shoes/jackboots
+	back = /obj/item/storage/backpack
+	backpack_contents = list(/obj/item/radio, /obj/item/gun/ballistic/automatic/pistol/hl9mm, /obj/item/ammo_box/magazine/pistolm9mm, /obj/item/reagent_containers/food/snacks/donut/apple,)
+	id = /obj/item/card/id
+	id_trim = /datum/id_trim/security_guard
+
+/datum/id_trim/security_guard
+	assignment = "Охранник Чёрной Мезы"
+	access = list(ACCESS_BRIG, ACCESS_SECURITY, ACCESS_AWAY_SEC)
+
+/obj/item/clothing/under/rank/rnd/scientist/halflife
+	name = "science team costume"
+	desc = "Самый обычный костюм работника комплекса чёрной мезы"
+	icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/gear/rnd.dmi'
+	mob_overlay_icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/gear/rndmob.dmi'
+	anthro_mob_worn_overlay = 'modular_bluemoon/olgachan/blackmesafromnova/icons/gear/rnd_digi.dmi'
+	icon_state = "hl_scientist"
+	item_state = "hl_scientist"
+	can_adjust = FALSE
+
+
+/obj/effect/mob_spawn/human/black_mesa/hecu
+	name = "HECU grunt"
+	outfit = /datum/outfit/hecu
+	short_desc = "Ты являешься, скорее всего, одним из немногих обычных пехотинцев, оставшихся в секторе H без какой либо поддержки со стороны правительства."
+	flavour_text = "Ваш отряд был направлен в Чёрную Мезу для оказания медицинской, инженерной и боевой помощи основным отрядам HECU. Но, к сожалению, с каждым часом ситуация становилась всё хуже. Ведь правительство, поняв, что посланные пехотинцы не справляются, решили их всех предательски убить. Всё, что вы смутно знаете о миссии, так это только то, что основная задача отрядов, которым вы помогали - устранять всех свидетелей? Но имеет ли это вес, когда вас бросили? Теперь ваша задача сейчас - окопаться в этом клятом лагере и или ждать помощи, или попытаться следовать приказу основных отрядов."
+	important_info = "Не пытайтесь исследовать карту далее основного атриума и небольшого медицинского отдела ( не ломайте стены в комнату, закрытой ключ картой). Вы можете покинуть гейт ТОЛЬКО В ТОМ СЛУЧАЕ, когда договоритесь с исследовательской командой. Если вы решили враждовать с исследователями, то вам после этого запрещено покидать гейт."
+/obj/effect/mob_spawn/human/black_mesa/hecu/special(mob/living/carbon/human/spawned_human)
+	. = ..()
+	spawned_human.remove_language(/datum/language/common)
+
+/obj/effect/mob_spawn/human/black_mesa/hecu/breacher
+	name = "HECU breacher"
+	outfit = /datum/outfit/hecu_breacher
+
+/obj/effect/mob_spawn/human/black_mesa/hecu/medic
+	name = "HECU field medic"
+	outfit = /datum/outfit/hecu_medic
+	short_desc = "Ты являешься профессиональным полевым медиком небольшого отряда поддержки HECU."
+
+/obj/effect/mob_spawn/human/black_mesa/hecu/engineer
+	name = "HECU engineer"
+	outfit = /datum/outfit/hecu_engineer
+	short_desc = "Ты являешься профессиональным инженером небольшого отряда поддержки HECU."
+/obj/effect/mob_spawn/human/black_mesa/hecu/special(mob/living/carbon/human/spawned_human)
+	. = ..()
+	spawned_human.remove_language(/datum/language/common)
+
+/datum/outfit/hecu
+	name = "HECU grunt"
+
+	uniform = /obj/item/clothing/under/rank/security/officer/urban_camo
+	mask = /obj/item/clothing/mask/gas/hecu
+	head = /obj/item/clothing/head/helmet/hecu
+	suit = /obj/item/clothing/suit/armor/hecu
+	gloves = /obj/item/clothing/gloves/combat
+	belt = /obj/item/storage/belt/military/assault/hecu
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/reagent_containers/food/drinks/flask
+	r_pocket = /obj/item/flashlight/flare
+	r_hand = /obj/item/gun/ballistic/automatic/mp5
+	back = /obj/item/storage/backpack/hecu
+	backpack_contents = list(
+		/obj/item/storage/box/survival/radio,
+		/obj/item/storage/firstaid/emergency,
+		/obj/item/kitchen/knife/combat,
+		/obj/item/ammo_box/magazine/mp5,
+	)
+
+/datum/outfit/hecu_engineer
+	name = "HECU engineer"
+
+	uniform = /obj/item/clothing/under/rank/security/officer/urban_camo
+	glasses = /obj/item/clothing/glasses/welding/hecu
+	head = /obj/item/clothing/head/helmet/hecu
+	suit = /obj/item/clothing/suit/armor/hecu
+	gloves = /obj/item/clothing/gloves/combat
+	belt = /obj/item/storage/belt/utility/chief/full
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/reagent_containers/food/drinks/flask
+	r_pocket = /obj/item/flashlight/flare
+	r_hand = /obj/item/gun/ballistic/automatic/mp5
+	back = /obj/item/storage/backpack/hecu
+	backpack_contents = list(
+		/obj/item/storage/box/survival/radio,
+		/obj/item/storage/firstaid/emergency,
+		/obj/item/kitchen/knife/combat,
+		/obj/item/lighter/donator/bm/militaryzippo,
+		/obj/item/storage/fancy/cigarettes/cigpack_robust,
+		/obj/item/gun/ballistic/automatic/pistol/hl9mm,
+		/obj/item/ammo_box/magazine/pistolm9mm,
+		/obj/item/ammo_box/magazine/pistolm9mm,
+		/obj/item/ammo_box/magazine/mp5,
+	)
+
+/datum/outfit/hecu_breacher
+	name = "HECU breacher"
+
+	uniform = /obj/item/clothing/under/rank/security/officer/urban_camo
+	mask = /obj/item/clothing/mask/balaclava
+	glasses = /obj/item/clothing/glasses/hud/security/hecu_ski
+	suit = /obj/item/clothing/suit/armor/hecu
+	gloves = /obj/item/clothing/gloves/combat
+	belt = /obj/item/storage/belt/bandolier
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/reagent_containers/food/drinks/flask
+	r_pocket = /obj/item/flashlight/flare
+	r_hand = /obj/item/gun/ballistic/shotgun/spas
+	back = /obj/item/storage/backpack/hecu
+	backpack_contents = list(
+		/obj/item/storage/box/survival/radio,
+		/obj/item/storage/firstaid/emergency,
+		/obj/item/kitchen/knife/combat,
+		/obj/item/gun/ballistic/automatic/pistol/hl9mm,
+		/obj/item/ammo_box/magazine/pistolm9mm,
+		/obj/item/ammo_box/shotgun/loaded/buckshot,
+	)
+
+/datum/outfit/hecu_medic
+	name = "HECU medic"
+
+	uniform = /obj/item/clothing/under/rank/security/officer/urban_camo
+	glasses = /obj/item/clothing/glasses/hud/health/sunglasses/hecu
+	head = /obj/item/clothing/head/helmet/hecu
+	suit = /obj/item/clothing/suit/armor/hecu
+	gloves = /obj/item/clothing/gloves/combat
+	belt = /obj/item/storage/belt/military/assault/hecu
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/reagent_containers/food/drinks/flask
+	r_pocket = /obj/item/flashlight/flare
+	back = /obj/item/storage/backpack/hecu
+	backpack_contents = list(
+		/obj/item/storage/box/survival/radio,
+		/obj/item/storage/firstaid/emergency,
+		/obj/item/kitchen/knife/combat,
+		/obj/item/storage/firstaid/tactical,
+		/obj/item/gun/ballistic/automatic/pistol/hl9mm,
+		/obj/item/ammo_box/magazine/pistolm9mm,
+		/obj/item/ammo_box/magazine/pistolm9mm,
+	)
+
+/obj/effect/mob_spawn/human/black_mesa/hecu/leader
+	name = "HECU squad leader"
+	outfit = /datum/outfit/hecu_leader
+	short_desc = "Ты являешься лидером неболього отряда поддержки HECU"
+
+/datum/outfit/hecu_leader
+	name = "HECU squad leader"
+
+	uniform = /obj/item/clothing/under/rank/security/officer/urban_camo
+	head = /obj/item/clothing/head/beret/sec
+	suit = /obj/item/clothing/suit/armor/hecu
+	gloves = /obj/item/clothing/gloves/tackler/combat/insulated
+	belt = /obj/item/storage/belt/military/assault/hecu
+	shoes = /obj/item/clothing/shoes/combat
+	l_pocket = /obj/item/grenade/smokebomb
+	r_pocket = /obj/item/binoculars
+	r_hand = /obj/item/gun/ballistic/automatic/mp5
+	back = /obj/item/storage/backpack/hecu
+	backpack_contents = list(
+		/obj/item/storage/box/survival/radio,
+		/obj/item/storage/firstaid/emergency,
+		/obj/item/kitchen/knife/combat,
+		/obj/item/book/granter/martial/cqc,
+		/obj/item/gun/ballistic/automatic/pistol/deagle,
+		/obj/item/ammo_box/magazine/m50,
+	)

modular_bluemoon/olgachan/blackmesafromnova/code/hecuglasses.dm

@@ -0,0 +1,26 @@
+/obj/item/clothing/glasses/welding/hecu
+	name = "welding goggles"
+	desc = "Защищает твои полные инженерным энтузиазмом глаза от слепоты"
+	icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/gear/hecugear.dmi'
+	mob_overlay_icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/mob/hecu_glass.dmi'
+	icon_state = "hecu_engineer"
+	item_state = "hecu_engineer"
+
+/obj/item/clothing/glasses/hud/health/sunglasses/hecu
+	name = "aperture science special medical glasses"
+	desc = "Модифицированные aperture science очки! Они помогают определять текущее состояние пациента.. И они точно не позволяют определить количество занaвесок для душа в секторе"
+	icon_state = "glasses"
+	darkness_view = 1
+	flash_protect = 1
+	tint = 1
+	glass_colour_type = /datum/client_colour/glass_colour/blue
+
+
+/obj/item/clothing/glasses/hud/security/hecu_ski
+	name = "HECU ski glasses"
+	desc = "Урбанистическая горнолыжная маска с обширным функционалом, разработанная специально для операций в городских местностях. Так-же отлично подходят для совершения военных преступлений на территории чёрной мезы"
+	icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/gear/hecugear.dmi'
+	mob_overlay_icon = 'modular_bluemoon/olgachan/blackmesafromnova/icons/mob/hecu_glass.dmi'
+	icon_state = "ski_hecu"
+	item_state = "ski_hecu"
+	alternate_worn_layer = ABOVE_HEAD_LAYER