Merge branch 'master' of https://github.com/Kush1Push1/mymaster

code/__DEFINES/layers_planes.dm

@@ -215,6 +215,8 @@
 /// Plane related to the menu when pressing Escape.
 /// Needed so that we can apply a blur effect to EVERYTHING, and guarantee we are above all UI.
 #define ESCAPE_MENU_PLANE 105
+#define ESCAPE_MENU_DIMMER_LAYER 105.1
+#define ESCAPE_MENU_DEFAULT_LAYER 105.2
 
 #define RENDER_PLANE_MASTER 110
 

code/datums/ert.dm

@@ -85,7 +85,7 @@
 	mission = "Разберитесь с проблемами на станции [station_name()], а также проведите плановую проверку всех Отделов и Командования."
 
 /datum/ert/inquisition
-	roles = list(/datum/antagonist/ert/chaplain/inquisitor, /datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor)
+	roles = list(/datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor)
 	leader_role = /datum/antagonist/ert/commander/inquisitor
 	rename_team = "Inquisition"
 	mission = "Уничтожьте любые следы паранормальной активности на борту Космической Станции Тринадцатого Сектора."

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -62,6 +62,8 @@ Credit where due:
 			return FALSE
 		if(M.mind.unconvertable)
 			return FALSE
+		if (IS_HERETIC(M))
+			return FALSE
 	else
 		return FALSE
 	if(iscultist(M) || isconstruct(M) || ispAI(M))

code/game/gamemodes/cult/cult.dm

@@ -27,6 +27,8 @@
 			return FALSE
 		if(M.mind.unconvertable)
 			return FALSE
+		if(IS_HERETIC(M))
+			return FALSE
 	else
 		return FALSE
 	if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M) || !M.client)

code/game/machinery/dance_machine.dm

@@ -398,6 +398,7 @@
 
 /obj/machinery/jukebox/disco/proc/dance3(var/mob/living/M)
 	var/matrix/initial_matrix = matrix(M.transform)
+	var/matrix/initial_matrix_ = matrix(M.transform)
 	for (var/i in 1 to 75)
 		if (!M)
 			return
@@ -441,7 +442,7 @@
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
 		sleep(1)
-	M.lying_fix()
+	M.lying_fix(initial_matrix_)
 
 
 /obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M)
@@ -459,6 +460,7 @@
 		time--
 
 /obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M)
+	var/matrix/initial_matrix_ = matrix(M.transform)
 	animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0)
 	var/matrix/initial_matrix = matrix(M.transform)
 	for (var/i in 1 to 60)
@@ -491,10 +493,10 @@
 				initial_matrix.Translate(-3,0)
 				animate(M, transform = initial_matrix, time = 1, loop = 0)
 		sleep(1)
-	M.lying_fix()
+	M.lying_fix(initial_matrix_)
 
-/mob/living/proc/lying_fix()
-	animate(src, transform = null, time = 1, loop = 0)
+/mob/living/proc/lying_fix(var/matrix/initial_matrix)
+	animate(src, transform = initial_matrix, time = 1, loop = 0)
 	lying_prev = 0
 
 /obj/machinery/jukebox/proc/dance_over()

code/game/objects/items/implants/implant_deathrattle.dm

@@ -67,8 +67,18 @@
 		if(!group)
 			to_chat(target, "<i>Вы слышите странный механический голос в голове...</i> \"<span class='robot'>Внимание: Не выявлены другие подключенные импланты.</span>\"")
 
-
 /obj/item/implantcase/deathrattle
 	name = "implant case - 'Deathrattle'"
 	desc = "A glass case containing a deathrattle implant."
 	imp_type = /obj/item/implant/deathrattle
+
+GLOBAL_DATUM_INIT(centcom_deathrattle_group, /datum/deathrattle_group, new)
+
+/obj/item/implant/deathrattle/centcom
+	name = "centcom deathrattle implant"
+	desc = "Hope no one else dies, prepare for when they do"
+
+/obj/item/implant/deathrattle/centcom/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE)
+	. = ..()
+	group = GLOB.centcom_deathrattle_group
+	group.register(src)

code/game/objects/items/storage/firstaid.dm

@@ -201,9 +201,9 @@
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/reagent_containers/syringe/piercing(src)
 	new /obj/item/bonesetter(src)
+	new /obj/item/pinpointer/crew(src)
+	new /obj/item/sensor_device(src)
 	new /obj/item/reagent_containers/medspray/sterilizine(src)
-	new /obj/item/reagent_containers/medspray/sterilizine(src)
-	new /obj/item/reagent_containers/glass/bottle/morphine(src)
 	new /obj/item/reagent_containers/glass/bottle/morphine(src)
 	new /obj/item/hypospray/mkii/CMO/combat/synthflesh(src)
 
@@ -215,14 +215,13 @@
 	if(empty)
 		return
 	new /obj/item/stack/medical/gauze(src)
-	new /obj/item/stack/medical/gauze(src)
-	new /obj/item/reagent_containers/hypospray/medipen/oxandrolone(src)
-	new /obj/item/reagent_containers/hypospray/medipen/salacid(src)
-	new /obj/item/reagent_containers/hypospray/combat/omnizine(src)
+	new /obj/item/reagent_containers/medspray/sterilizine(src)
+	new /obj/item/reagent_containers/glass/bottle/morphine(src)
+	new /obj/item/reagent_containers/glass/bottle/morphine(src)
 	new /obj/item/reagent_containers/hypospray/combat/omnizine(src)
 	new /obj/item/reagent_containers/hypospray/medipen/penacid(src)
 	new /obj/item/reagent_containers/hypospray/medipen/penacid(src)
-
+	new /obj/item/reagent_containers/hypospray/medipen/penacid(src)
 
 
 /obj/item/storage/firstaid/radbgone

code/game/objects/structures/ghost_role_spawners.dm

@@ -571,7 +571,7 @@
 	gloves = /obj/item/clothing/gloves/tackler/combat/insulated
 	ears = /obj/item/radio/headset/syndicate/alt
 	back = /obj/item/storage/backpack
-	implants = list(/obj/item/implant/weapons_auth, /obj/item/implant/deathrattle, /obj/item/implant/explosive, /obj/item/implant/mindshield)
+	implants = list(/obj/item/implant/weapons_auth, /obj/item/implant/deathrattle/centcom, /obj/item/implant/explosive, /obj/item/implant/mindshield)
 	id = /obj/item/card/id/syndicate
 
 	give_space_cooler_if_synth = TRUE // BLUEMOON ADD
@@ -1207,7 +1207,7 @@
 		/obj/item/storage/firstaid/regular=1,
 		/obj/item/stamp/syndicate=1,
 		)
-	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth)
+	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth)
 	cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant)
 	id = /obj/item/card/id
 
@@ -1260,7 +1260,7 @@
 		/obj/item/storage/firstaid/regular=1,
 		/obj/item/stamp/centcom=1,
 		)
-	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth)
+	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth)
 	cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant)
 	id = /obj/item/card/id
 

code/modules/admin/verbs/one_click_antag.dm

@@ -381,7 +381,7 @@
 		var/datum/antagonist/ert/ert = antag
 		mannequin.equipOutfit(initial(ert.outfit), TRUE)
 	else if (ispath(antag, /datum/antagonist/official))
-		mannequin.equipOutfit(/datum/outfit/centcom_official, TRUE)
+		mannequin.equipOutfit(/datum/outfit/ert/centcom_official, TRUE)
 
 /datum/admins/proc/makeERTPreviewIcon(list/settings)
 	// Set up the dummy for its photoshoot

code/modules/antagonists/eldritch_cult/eldritch_book.dm

@@ -14,11 +14,14 @@
 	///Where we cannot create the rune?
 	var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava))
 
+/obj/item/forbidden_book/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/anti_magic, FALSE, FALSE)
+
 /obj/item/forbidden_book/Destroy()
 	last_user = null
 	. = ..()
 
-
 /obj/item/forbidden_book/examine(mob/user)
 	. = ..()
 	if(!IS_HERETIC(user))

code/modules/antagonists/ert/ert.dm

@@ -131,17 +131,14 @@
 /datum/antagonist/ert/medic/inquisitor
 	outfit = /datum/outfit/ert/medic/inquisitor
 
+/datum/antagonist/ert/medic/inquisitor/on_gain()
+	. = ..()
+	owner.isholy = TRUE
+
 /datum/antagonist/ert/security/inquisitor
 	outfit = /datum/outfit/ert/security/inquisitor
 
-/datum/antagonist/ert/chaplain
-	role = "Священник"
-	outfit = /datum/outfit/ert/chaplain
-
-/datum/antagonist/ert/chaplain/inquisitor
-	outfit = /datum/outfit/ert/chaplain/inquisitor
-
-/datum/antagonist/ert/chaplain/on_gain()
+/datum/antagonist/ert/security/inquisitor/on_gain()
 	. = ..()
 	owner.isholy = TRUE
 

code/modules/antagonists/official/official.dm

@@ -18,7 +18,7 @@
 	var/mob/living/carbon/human/H = owner.current
 	if(!istype(H))
 		return
-	H.equipOutfit(/datum/outfit/centcom_official)
+	H.equipOutfit(/datum/outfit/ert/centcom_official)
 
 	if(CONFIG_GET(flag/enforce_human_authority))
 		H.set_species(/datum/species/human)

code/modules/client/preferences.dm

@@ -1106,7 +1106,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							dat += "<b>Toys and Egg Stuffing:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=butt_stuffing'>[features["butt_stuffing"] == TRUE ? "Yes" : "No"]</a>"
 							dat += "<b>Max Size:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=butt_max_size;task=input'>[features["butt_max_size"] ? features["butt_max_size"] : "Disabled"]</a>"
 							dat += "<b>Min Size:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=butt_min_size;task=input'>[features["butt_min_size"] ? features["butt_min_size"] : "Disabled"]</a>"
-							dat += "<b>Butthole Sprite:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=has_anus'>[features["has_anus"] == TRUE ? "Yes" : "No"]</a>"
+							dat += "<b>Has Anus:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=has_anus'>[features["has_anus"] == TRUE ? "Yes" : "No"]</a>"
 							if(features["has_anus"])
 								dat += "<b>Butthole Color:</b></a><BR>"
 								if(pref_species.use_skintones && features["genitals_use_skintone"] == TRUE)

code/modules/clothing/outfits/ert.dm

@@ -13,7 +13,7 @@
 
 	give_space_cooler_if_synth = TRUE // BLUEMOON ADD
 
-	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth)
+	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth)
 	cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant)
 
 
@@ -503,52 +503,12 @@
 	W.access = list(ACCESS_MAINT_TUNNELS,ACCESS_CENT_GENERAL)
 	W.update_label(W.registered_name, W.assignment)
 
-/datum/outfit/centcom_official
-	name = "CentCom Official"
-
-	uniform = /obj/item/clothing/under/rank/centcom/officer
-	shoes = /obj/item/clothing/shoes/laceup
-	gloves = /obj/item/clothing/gloves/color/black
-	ears = /obj/item/radio/headset/headset_cent/alt
-	head = /obj/item/clothing/head/beret/sec/ntr_beret
-	glasses = /obj/item/clothing/glasses/sunglasses
-	belt = /obj/item/gun/energy/e_gun/nuclear/ert
-	back = /obj/item/storage/backpack/satchel
-	l_hand = /obj/item/clipboard
-	id = /obj/item/card/id/ert
-	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
-		/obj/item/pda/heads=1,
-		/obj/item/pen=1)
-
-	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth)
-
-	cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,
-	/obj/item/organ/cyberimp/chest/nutrimentextreme,
-	/obj/item/organ/cyberimp/chest/chem_implant)
-
-/datum/outfit/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
-	if(visualsOnly)
-		return
-
-	var/obj/item/radio/R = H.ears
-	R.set_frequency(FREQ_CENTCOM)
-	R.freqlock = TRUE
-
-	var/obj/item/card/id/W = H.wear_id
-	W.icon_state = "centcom"
-	W.access = get_all_accesses()//They get full station access.
-	W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
-	W.assignment = "CentCom Official"
-	W.registered_name = H.real_name
-	W.update_label(W.registered_name, W.assignment)
-
 /datum/outfit/ert/commander/inquisitor
 	name = "Inquisition Commander"
 
 	mask = /obj/item/clothing/mask/gas/sechailer/swat
 	glasses = /obj/item/clothing/glasses/hud/health/night/syndicate
 	l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted
-	r_hand = /obj/item/nullrod/scythe/talking/chainsword
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal
 	belt = /obj/item/storage/belt/military/ert_max
 	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
@@ -575,7 +535,6 @@
 	glasses = /obj/item/clothing/glasses/hud/health/night/syndicate
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
 	l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted
-	r_hand = /obj/item/nullrod/scythe/talking/chainsword
 	belt = /obj/item/storage/belt/military/ert_max
 	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
 		/obj/item/storage/firstaid/regular=1,
@@ -602,7 +561,6 @@
 	glasses = /obj/item/clothing/glasses/hud/health/night/syndicate
 	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
 	l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted
-	r_hand = /obj/item/nullrod/scythe/talking/chainsword
 	belt = /obj/item/defibrillator/compact/loaded_ert
 	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
 		/obj/item/storage/box/ammo/smgap=1,\
@@ -621,40 +579,52 @@
 		/obj/item/organ/cyberimp/chest/thrusters,
 	)
 
-/datum/outfit/ert/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
-	..()
+//Агенты ЦК
 
-	if(visualsOnly)
-		return
-
-	var/obj/item/radio/R = H.ears
-	R.keyslot = new /obj/item/encryptionkey/heads/hop
-	R.recalculateChannels()
-
-/datum/outfit/ert/chaplain
-	name = "ERT Chaplain"
-
-	mask = /obj/item/clothing/mask/gas/sechailer/swat
-	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor // Chap role always gets this suit
-	id = /obj/item/card/id/ert/chaplain
+/datum/outfit/ert/centcom_official
+	name = "CentCom Official"
+	uniform = /obj/item/clothing/under/syndicate/sniper
+	suit = /obj/item/clothing/suit/armor/vest/agent
+	shoes = /obj/item/clothing/shoes/laceup
+	head = /obj/item/clothing/head/HoS/beret/syndicate
 	glasses = /obj/item/clothing/glasses/hud/health/night/syndicate
-	back = /obj/item/storage/backpack/cultpack
-	belt = /obj/item/storage/belt/soulstone
-	r_hand = /obj/item/gun/ballistic/automatic/laser
+	belt = /obj/item/storage/belt/military/ert_max
+	back = /obj/item/storage/backpack/satchel
+	mask = null
+	id = /obj/item/card/id/ert
+
 	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
-		/obj/item/nullrod=1,
-		/obj/item/storage/firstaid/regular=1,\
-		/obj/item/ammo_box/magazine/recharge=4)
+		/obj/item/pda/heads=1,
+		/obj/item/stamp/centcom=1,
+		/obj/item/stamp/syndicate=1,
+		)
+	implants = list(
+		/obj/item/implant/mindshield,
+		/obj/item/implant/deathrattle/centcom,
+	 	/obj/item/implant/weapons_auth,
+	 	/obj/item/implant/krav_maga,
+	)
 
-/datum/outfit/ert/chaplain/inquisitor
-	name = "Inquisition Chaplain"
+	cybernetic_implants = list(
+		/obj/item/organ/cyberimp/eyes/hud/security,
+		/obj/item/organ/cyberimp/chest/nutrimentextreme,
+		/obj/item/organ/cyberimp/chest/chem_implant/plus,
+		/obj/item/organ/eyes/robotic/thermals,
+		/obj/item/organ/cyberimp/mouth/breathing_tube,
+	)
 
-	mask = /obj/item/clothing/mask/gas/sechailer/swat
-	suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
-	belt = /obj/item/storage/belt/soulstone/full/chappy
-	backpack_contents = list(/obj/item/storage/box/survival/centcom=1,
+/datum/outfit/ert/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source)
+	if(visualsOnly)
+		return
 
-		/obj/item/grenade/chem_grenade/holy=1,
-		/obj/item/nullrod=1,
-		/obj/item/storage/firstaid/regular=1,\
-		/obj/item/ammo_box/magazine/recharge=4)
+	var/obj/item/radio/R = H.ears
+	R.set_frequency(FREQ_CENTCOM)
+	R.freqlock = TRUE
+
+	var/obj/item/card/id/W = H.wear_id
+	W.icon_state = "centcom"
+	W.access = get_all_accesses()//They get full station access.
+	W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access.
+	W.assignment = "CentCom Official"
+	W.registered_name = H.real_name
+	W.update_label(W.registered_name, W.assignment)

code/modules/clothing/outfits/standard.dm

@@ -405,7 +405,7 @@
 		/obj/item/pinpointer/nuke=1,\
 		/obj/item/grenade/plastic/x4=1)
 
-	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth)
+	implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth)
 
 	cybernetic_implants = list(
 		/obj/item/organ/cyberimp/eyes/hud/security,