Update: Ganza Pain Elite Edition Deluxe (#861)

* Импорт ПР чинящего красную катану от Ганзы

* Изменены звуки рубки деревьев, и время нужное на их снос. Перемещены звуки

* Порт ПР, где ИПС смогут отхиливаться на половину от ядер, а не на полную

* Перенос ачивок с кор кода в модульную папку специально для дефайнов

* Добавлены ачивки удаленные офами, и новая ачивка от Ганзы "The Inner Hell"

* Вещи которые помогают избежать рантаймов

* Добавлен трейт дл будущих элиток

* Добавлена иконка для новой ачивки "The Inner Hell"

* Добавлены различные атласы для будущего импорта от Ганзы

* Добавлены звуки моли

* Задокументировано добавление ачивки

* Добавлены переменные, которые чинят пустой список. Минус рантайм

* Добавляет дробь для дробовиков новую

* Добавляет скины всем конструктам в зависимости от типа. Культ или Холи

* Меняем звук смерти Моли на другой

* В довесок к конструктам

* Включаем файлик по починке конструктов

* Исправил ID пака по мобам

* Усиливаем элитных и простых мобов

* Что-то с патронами, балансим на 500 металла

* Добавил недостающие файлы для ачивки

* Перебалансирована вся элитка, плюс брим демон. Пандора стала ебанутой

* Добавлены новые типы патронов для дробовиков АНТИФАУНА. Диск выпадает со спавнера. Дробовик стал сильнее немного

* Изменена медицина с реагентами. ИПС починились немного.

* Выпилен странный иструмент добавленый ради рофла офами

* Добавлены новые мобы, визард констракт

* Добавлены пути для всех модов и файлов

* Удален пробел

* Смещена ачивка вниз списка

* Такой ящик уже не нужен, есть аналог за 5к

* Заэкранировал кавычки

* Починил случайно закомментированную переменную

* Вернул на место удаленный путь до кор кода с ачивками

* Откат демона, офы преуспели

* Форс хила с Rod of Asclepius

* Update gun.dm

* Update gun.dm

* Update README.md

* Update _achievements.dm

* Update pandora.dm

code/__DEFINES/achievements.dm

@@ -41,11 +41,6 @@
 #define BOSS_MEDAL_LEGION "Legion Killer"
 #define BOSS_MEDAL_NEST "Nest Exterminator"
 #define BOSS_MEDAL_WENDIGO "Wendigo Killer"
-// [CELADON-ADD] - RETURN_TENDRILS
-#define BOSS_MEDAL_TENDRIL "Tendril Exterminator"
-#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer"
-#define BOSS_MEDAL_KINGGOAT "King Goat Killer"
-// [/CELADON-ADD]
 
 #define BOSS_MEDAL_MINER_CRUSHER "Blood-drunk Miner Crusher"
 #define BOSS_MEDAL_FROSTMINER_CRUSHER "Demonic-frost Miner Crusher"
@@ -55,10 +50,6 @@
 #define BOSS_MEDAL_HIEROPHANT_CRUSHER "Hierophant Crusher"
 #define BOSS_MEDAL_LEGION_CRUSHER "Legion Crusher"
 #define BOSS_MEDAL_WENDIGO_CRUSHER "Wendigo Crusher"
-// [CELADON-ADD] - RETURN_TENDRILS
-#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher"
-#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher"
-// [/CELADON-ADD]
 
 // Medal hub IDs for boss-kill scores
 #define BOSS_SCORE "Bosses Killed"
@@ -71,7 +62,3 @@
 #define LEGION_SCORE "Legion Killed"
 #define WENDIGO_SCORE "Wendigos Killed"
 #define NEST_CLEAR_SCORE "Nests Destroyed"
-// [CELADON-ADD] - RETURN_TENDRILS
-#define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
-#define TENDRIL_CLEAR_SCORE "Tendrils Killed"
-// [/CELADON-ADD]

code/__DEFINES/~mod_celadon/achievements.dm

@@ -0,0 +1,12 @@
+// CELADON_ACHIEVEMENTS
+#define MEDAL_THEINNERHELL "The Inner Hell"
+
+#define BOSS_MEDAL_TENDRIL "Tendril Exterminator"
+#define BOSS_MEDAL_SWARMERS "Swarmer Beacon Killer"
+#define BOSS_MEDAL_KINGGOAT "King Goat Killer"
+
+#define BOSS_MEDAL_SWARMERS_CRUSHER "Swarmer Beacon Crusher"
+#define BOSS_MEDAL_KINGGOAT_CRUSHER "King Goat Crusher"
+
+#define SWARMER_BEACON_SCORE "Swarmer Beacs Killed"
+#define TENDRIL_CLEAR_SCORE "Tendrils Killed"

code/__DEFINES/~mod_celadon/game.dm

@@ -0,0 +1,7 @@
+// Same as before, but returns null if false
+/proc/get_open_turf_in_dir_null(atom/center, dir)
+	var/turf/open/T = get_step(center, dir)
+	if(istype(T))
+		return T
+	else
+		return null

code/__DEFINES/~mod_celadon/helpers.dm

@@ -0,0 +1,4 @@
+#define iselitefauna(A) (istype(A, /mob/living/simple_animal/hostile/asteroid/elite))
+
+#define isminingfauna(A) (istype(A, /mob/living/simple_animal/hostile/asteroid))
+

code/__DEFINES/~mod_celadon/traits.dm

@@ -0,0 +1,2 @@
+/// The user is currently challenging an elite mining mob. Prevents him from challenging another until he's either lost or won.
+#define TRAIT_ELITE_CHALLENGER "elite_challenger"

code/_globalvars/traits.dm

@@ -147,6 +147,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
 		"TRAIT_HOLDABLE" = TRAIT_HOLDABLE,
 		"TRAIT_SCOOPABLE" = TRAIT_SCOOPABLE,
 		"TRAIT_ANXIOUS" = TRAIT_ANXIOUS,
+		// [CELADON-ADD] - CELADON_ACHIEVEMENTS
+		"TRAIT_ELITE_CHALLENGER" = TRAIT_ELITE_CHALLENGER, // CELADON EDIT // Given to elite tumor fighters
+		// [/CELADON-ADD]
 		"TRAIT_KISS_OF_DEATH" = TRAIT_KISS_OF_DEATH
 
 	),

code/datums/status_effects/buffs.dm

@@ -369,25 +369,43 @@
 			//Because a servant of medicines stops at nothing to help others, lets keep them on their toes and give them an additional boost.
 			if(itemUser.health < itemUser.maxHealth)
 				new /obj/effect/temp_visual/heal(get_turf(itemUser), "#375637")
-			itemUser.adjustBruteLoss(-1.5)
-			itemUser.adjustFireLoss(-1.5)
+			// [CELADON-EDIT] - CELADON_BALANCE
+			// itemUser.adjustBruteLoss(-1.5)
+			// itemUser.adjustFireLoss(-1.5)
+			// itemUser.adjustToxLoss(-1.5, forced = TRUE) //Because Slime People are people too
+			// itemUser.adjustOxyLoss(-1.5)
+			// itemUser.adjustStaminaLoss(-1.5)
+			// itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.5)
+			// itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health	// CELADON-EDIT - ORIGINAL
+			itemUser.adjustBruteLoss(-1.5, forced = TRUE)
+			itemUser.adjustFireLoss(-1.5, forced = TRUE)
 			itemUser.adjustToxLoss(-1.5, forced = TRUE) //Because Slime People are people too
-			itemUser.adjustOxyLoss(-1.5)
-			itemUser.adjustStaminaLoss(-1.5)
+			itemUser.adjustOxyLoss(-1.5, forced = TRUE)
+			itemUser.adjustStaminaLoss(-1.5, forced = TRUE)
 			itemUser.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1.5)
-			itemUser.adjustCloneLoss(-0.5) //Becasue apparently clone damage is the bastion of all health
+			itemUser.adjustCloneLoss(-0.5, forced = TRUE) //Becasue apparently clone damage is the bastion of all health
+			// [/CELADON-EDIT]
 		//Heal all those around you, unbiased
 		for(var/mob/living/L in view(7, owner))
 			if(L.health < L.maxHealth)
 				new /obj/effect/temp_visual/heal(get_turf(L), "#375637")
 			if(iscarbon(L))
-				L.adjustBruteLoss(-3.5)
-				L.adjustFireLoss(-3.5)
+				// [CELADON-EDIT] - CELADON_BALANCE
+				// L.adjustBruteLoss(-3.5)
+				// L.adjustFireLoss(-3.5)
+				// L.adjustToxLoss(-3.5, forced = TRUE) //Because Slime People are people too
+				// L.adjustOxyLoss(-3.5)
+				// L.adjustStaminaLoss(-3.5)
+				// L.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3.5)
+				// L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health	// CELADON-EDIT - ORIGINAL
+				L.adjustBruteLoss(-3.5, forced = TRUE)
+				L.adjustFireLoss(-3.5, forced = TRUE)
 				L.adjustToxLoss(-3.5, forced = TRUE) //Because Slime People are people too
-				L.adjustOxyLoss(-3.5)
-				L.adjustStaminaLoss(-3.5)
+				L.adjustOxyLoss(-3.5, forced = TRUE)
+				L.adjustStaminaLoss(-3.5, forced = TRUE)
 				L.adjustOrganLoss(ORGAN_SLOT_BRAIN, -3.5)
-				L.adjustCloneLoss(-1) //Becasue apparently clone damage is the bastion of all health
+				L.adjustCloneLoss(-1, forced = TRUE) //Becasue apparently clone damage is the bastion of all health
+				// [/CELADON-EDIT]
 			else if(issilicon(L))
 				L.adjustBruteLoss(-3.5)
 				L.adjustFireLoss(-3.5)

code/game/objects/items/melee/misc.dm

@@ -743,6 +743,10 @@
 /obj/item/melee/weebstick/on_exit_storage(datum/component/storage/concrete/S)
 	var/obj/item/storage/belt/weebstick/B = S.real_location()
 	if(istype(B))
+		// [CELADON-ADD] - CELADON_REPAIR_WEEBSTICK
+		if(B.primed == TRUE) // So we dont break our anime stick if we pull stick when primed
+			B.unprime_unlock()
+		// [/CELADON-ADD]
 		playsound(B, 'sound/items/unsheath.ogg', 25, TRUE)
 
 /obj/item/melee/weebstick/on_enter_storage(datum/component/storage/concrete/S)
@@ -783,7 +787,10 @@
 		. += "<span class='info'>Alt-click it to quickly draw the blade.</span>"
 
 /obj/item/storage/belt/weebstick/AltClick(mob/user)
-	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || primed)
+	// [CELADON-EDIT] - CELADON_REPAIR_WEEBSTICK
+	// if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)) || primed)	// CELADON-EDIT - ORIGINAL
+	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ishuman(user)) || primed)
+	// [/CELADON-EDIT]
 		return
 	if(length(contents))
 		var/obj/item/I = contents[1]
@@ -795,7 +802,10 @@
 		to_chat(user, "<span class='warning'>[src] is empty!</span>")
 
 /obj/item/storage/belt/weebstick/attack_self(mob/user)
-	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
+	// [CELADON-EDIT] - CELADON_REPAIR_WEEBSTICK
+	// if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) || primed)	// CELADON-EDIT - ORIGINAL
+	if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ishuman(user)))
+	// [/CELADON-EDIT]
 		return
 	if(length(contents))
 		var/datum/component/storage/CP = GetComponent(/datum/component/storage)
@@ -839,10 +849,16 @@
 	var/halt = FALSE
 	// Stolen dash code
 	for(var/T in getline(start, get_turf(target)))
+		// [CELADON-ADD] - CELADON_REPAIR_WEEBSTICK
+		playsound(T, dash_sound, 15, TRUE)
+		// [/CELADON-ADD]
 		var/turf/tile = T
 		for(var/mob/living/victim in tile)
 			if(victim != user)
-				playsound(victim, 'sound/weapons/anime_slash.ogg', 10, TRUE)
+				// [CELADON-EDIT] - CELADON_REPAIR_WEEBSTICK
+				// playsound(victim, 'sound/weapons/anime_slash.ogg', 10, TRUE)		// CELADON-EDIT - ORIGINAL
+				playsound(tile, 'sound/weapons/anime_slash.ogg', 10, TRUE)
+				// [/CELADON-EDIT] 
 				victim.take_bodypart_damage(15)
 		// Unlike actual ninjas, we stop noclip-dashing here.
 		if(isclosedturf(T))
@@ -856,7 +872,9 @@
 		else
 			end = T
 	user.forceMove(end) // YEET
-	playsound(start, dash_sound, 35, TRUE)
+	// [CELADON-REMOVE] - CELADON_REPAIR_WEEBSTICK
+	// playsound(start, dash_sound, 35, TRUE)
+	// [/CELADON-REMOVE]
 	var/obj/spot2 = new phasein(end, user.dir)
 	spot1.Beam(spot2, beam_effect, time=20)
 	user.visible_message("<span class='warning'>In a flash of red, [user] draws [user.p_their()] blade!</span>", "<span class='notice'>You dash forward while drawing your weapon!</span>", "<span class='warning'>You hear a blade slice through the air at impossible speeds!</span>")

code/game/objects/structures/flora.dm

@@ -34,13 +34,21 @@
 	if(log_amount && (!(flags_1 & NODECONSTRUCT_1)))
 		if(W.get_sharpness() && W.force > 0)
 			if(W.hitsound)
-				playsound(get_turf(src), W.hitsound, 100, FALSE, FALSE)
+				// [CELADON-EDIT] - CELADON_QOL
+				// playsound(get_turf(src), W.hitsound, 100, FALSE, FALSE)		// CELADON-EDIT - ORIGINAL
+				playsound(get_turf(src), pick('mod_celadon/_storge_sounds/sound/trees/treechop1.ogg',
+											'mod_celadon/_storge_sounds/sound/trees/treechop2.ogg',
+											'mod_celadon/_storge_sounds/sound/trees/treechop3.ogg'), 100, FALSE, FALSE)
+				// [/CELADON-EDIT]
 			user.visible_message("<span class='notice'>[user] begins to cut down [src] with [W].</span>","<span class='notice'>You begin to cut down [src] with [W].</span>", "<span class='hear'>You hear the sound of sawing.</span>")
-			if(do_after(user, 1000/W.force, target = src)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard.
+			// [CELADON-EDIT] - CELADON_QOL
+			// if(do_after(user, 1000/W.force, target = src)) //5 seconds with 20 force, 8 seconds with a hatchet, 20 seconds with a shard.		// CELADON-EDIT - ORIGINAL
+			if(do_after(user, 2000/W.force, target = src)) //10 seconds with 20 force, 16 seconds with a hatchet, 40 seconds with a shard.
+			// [/CELADON-EDIT]
 				user.visible_message("<span class='notice'>[user] fells [src] with the [W].</span>","<span class='notice'>You fell [src] with the [W].</span>", "<span class='hear'>You hear the sound of a tree falling.</span>")
 				// [CELADON-EDIT] - CELADON_QOL
 				// playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , FALSE, FALSE) // CELADON-EDIT - ORIGINAL
-				playsound(get_turf(src), 'mod_celadon/_storge_sounds/sound/zvuk-padayuschego-dereva.ogg', 100 , FALSE, FALSE)
+				playsound(get_turf(src), 'mod_celadon/_storge_sounds/sound/trees/zvuk-padayuschego-dereva.ogg', 100 , FALSE, FALSE)
 				// [/CELADON-EDIT]
 				user.log_message("cut down [src] at [AREACOORD(src)]", LOG_ATTACK)
 				for(var/i=1 to log_amount)

code/modules/asset_cache/asset_list_items.dm

@@ -260,6 +260,9 @@
 		"rule8" = 'icons/UI_Icons/Achievements/Misc/rule8.png',
 		"snail" = 'icons/UI_Icons/Achievements/Misc/snail.png',
 		"mining" = 'icons/UI_Icons/Achievements/Skills/mining.png',
+		// [CELADON-ADD] - CELADON_ACHIEVEMENTS
+		"theinnerhell" = 'mod_celadon/_storge_icons/icons/png/theinnerhell.png'
+		// [/CELADON-ADD]
 	)
 
 /datum/asset/spritesheet/simple/pills

code/modules/mining/equipment/regenerative_core.dm

@@ -62,12 +62,30 @@
 	if(inert)
 		to_chat(owner, "<span class='notice'>[src] breaks down as it tries to activate.</span>")
 	else
-		owner.adjustBruteLoss(-100) //previously heal proc
-		owner.adjustFireLoss(-100)
-		owner.adjustOxyLoss(-50)
-		owner.adjustToxLoss(-50)
+		// [CELADON-REMOVE] - CELADON_BALANCE - Перемещено вниз в Иф блок
+		// owner.adjustBruteLoss(-100) //previously heal proc
+		// owner.adjustFireLoss(-100)
+		// owner.adjustOxyLoss(-50)
+		// owner.adjustToxLoss(-50)
+		// [/CELADON-REMOVE]
 		if(owner.dna.species.id != SPECIES_IPC)
+			// [CELADON-ADD] - CELADON_BALANCE
+			owner.adjustBruteLoss(-100, TRUE, TRUE) //previously heal proc
+			owner.adjustFireLoss(-100, TRUE, TRUE)
+			owner.adjustOxyLoss(-50, TRUE, TRUE)
+			owner.adjustToxLoss(-50, TRUE, TRUE) //"forced" to cover mechanical parts
+			// [/CELADON-ADD]
 			owner.adjustCloneLoss(10) //dont abuse it or take cloneloss (organic only)
+			// [CELADON-ADD] - CELADON_BALANCE
+			new /obj/effect/temp_visual/heal(get_turf(owner), "#d33131")
+		else // Half the efficiency for IPCs
+			owner.adjustBruteLoss(-50, TRUE, TRUE)
+			owner.adjustFireLoss(-50, TRUE, TRUE)
+			owner.adjustOxyLoss(-25, TRUE, TRUE)
+			owner.adjustToxLoss(-25, TRUE, TRUE)
+			owner.adjustOrganLoss(ORGAN_SLOT_BRAIN, 30) //instead cloneloss receive brain dmg
+			new /obj/effect/temp_visual/heal(get_turf(owner), "#af9191")
+			// [/CELADON-ADD]
 	qdel(src)
 
 /obj/item/organ/regenerative_core/on_life()

code/modules/mob/living/simple_animal/constructs.dm

@@ -66,7 +66,11 @@
 		var/pos = 2+spellnum*31
 		our_rune.button.screen_loc = "6:[pos],4:-2"
 		our_rune.button.moved = "6:[pos],4:-2"
-	add_overlay("glow_[icon_state][holy]")
+	// [CELADON-EDIT] - CELADON_MOBS
+	// add_overlay("glow_[icon_state][holy]")	// CELADON-EDIT - ORIGINAL
+	add_overlay("glow_[icon_state]_[glowtheme]")
+	flick("make_[icon_state]_[glowtheme]", src)
+	// [/CELADON-EDIT]
 
 /mob/living/simple_animal/hostile/construct/Destroy()
 	QDEL_NULL(our_rune)

code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm

@@ -128,7 +128,11 @@
 		shell_health -= dam_amount
 		if(shell_health <= 0)
 			has_shell = FALSE
-			armor = null		// Armor comes from the shell
+			// [CELADON-EDIT] - CELADON_BALANCE_MOBS
+			// armor = null		// Armor comes from the shell	// CELADON-EDIT - ORIGINAL
+			armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 30, "bomb" = 40, "bio" = 20, "rad" = 20, "fire" = 20, "acid" = 20)		// Full armor comes from the shell
+			armor = getArmor(arglist(armor))
+			// [/CELADON-EDIT]
 			for(var/l in shell_loot)
 				new l(loc)
 			if(!shell_snap_message)
@@ -138,7 +142,9 @@
 				shell_snap_message = TRUE //so it doesnt repeat
 		update_appearance()
 		return TRUE
-	update_appearance()
+	// [CELADON-REMOVE] - CELADON_BALANCE_MOBS
+	// update_appearance()
+	// [/CELADON-REMOVE]
 	return FALSE
 
 /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands/CanAttack(atom/the_target)