[TM] ENDLESS

code/__DEFINES/atom_hud.dm

@@ -53,6 +53,8 @@
 
 //data HUD (medhud, sechud) defines
 //Don't forget to update human/New() if you change these!
+// [CELADON-EDIT-FIX] - ФИКС СЕК-ХАДОВ ВРЕМЕННЫЙ
+/*
 #define DATA_HUD_SECURITY_BASIC "sec_basic"
 #define DATA_HUD_SECURITY_ADVANCED "sec_adv"
 #define DATA_HUD_MEDICAL_BASIC "med_basic"
@@ -78,7 +80,35 @@
 #define ANTAG_HUD_FUGITIVE "fugitive"
 #define ANTAG_HUD_GANGSTER "gangster"
 #define ANTAG_HUD_SPACECOP "spacecop"
+*/
+//data HUD (medhud, sechud) defines
+//Don't forget to update human/New() if you change these!
+#define DATA_HUD_SECURITY_BASIC 1
+#define DATA_HUD_SECURITY_ADVANCED 2
+#define DATA_HUD_MEDICAL_BASIC 3
+#define DATA_HUD_MEDICAL_ADVANCED 4
+#define DATA_HUD_DIAGNOSTIC_BASIC 5
+#define DATA_HUD_DIAGNOSTIC_ADVANCED 6
+#define DATA_HUD_ABDUCTOR 7
+#define DATA_HUD_SENTIENT_DISEASE 8
+#define DATA_HUD_AI_DETECT 9
+#define DATA_HUD_FAN 10
 
+//antag HUD defines
+#define ANTAG_HUD_REV 11
+#define ANTAG_HUD_OPS 12
+#define ANTAG_HUD_WIZ 13
+#define ANTAG_HUD_SHADOW 14
+#define ANTAG_HUD_TRAITOR 15
+#define ANTAG_HUD_NINJA 16
+#define ANTAG_HUD_CHANGELING 17
+#define ANTAG_HUD_ABDUCTOR 18
+#define ANTAG_HUD_BROTHER 19
+#define ANTAG_HUD_OBSESSED 20
+#define ANTAG_HUD_FUGITIVE 21
+#define ANTAG_HUD_GANGSTER 22
+#define ANTAG_HUD_SPACECOP 23
+// [/CELADON-EDIT-FIX]
 
 // Notification action types
 #define NOTIFY_JUMP "jump"

code/controllers/subsystem/processing/quirks.dm

@@ -39,6 +39,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 
 	species_blacklist = list(
 		"Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE),
+		"Dwarfism" = list(SPECIES_IPC, SPECIES_KEPORI, SPECIES_VOX , SPECIES_RACHNID),
 		"Alcohol Tolerance" = list(SPECIES_IPC, SPECIES_PLASMAMAN),
 		"Light Drinker" = list(SPECIES_IPC, SPECIES_PLASMAMAN),
 		"Smoker" = list(SPECIES_IPC, SPECIES_PLASMAMAN),

code/controllers/subsystem/ticker.dm

@@ -94,6 +94,7 @@ SUBSYSTEM_DEF(ticker)
 				if(L[1] == "exclude")
 					continue
 				music += S
+				login_music_name = S
 
 	var/old_login_music = trim(file2text("data/last_round_lobby_music.txt"))
 	if(music.len > 1)
@@ -110,14 +111,9 @@ SUBSYSTEM_DEF(ticker)
 	if(!length(music))
 		music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
 		login_music = pick(music)
-		login_music_name = login_music	// [CELADON-ADD] - MUSIC_CELADON
 	else
-		// [CELADON-EDIT] - MUSIC_CELADON
-		// login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"	// ORIGINAL
-		var/selected_track = pick(music)
-		login_music = "[global.config.directory]/title_music/sounds/[selected_track]"
-		login_music_name = selected_track
-		// [/CELADON-EDIT]
+		login_music = "[global.config.directory]/title_music/sounds/[pick(music)]"
+
 
 	if(!GLOB.syndicate_code_phrase)
 		GLOB.syndicate_code_phrase	= generate_code_phrase(return_list=TRUE)

code/datums/diseases/asthma_attack.dm

@@ -1,3 +1,4 @@
+/*
 /datum/disease/asthma_attack
 	form = "Bronchitis"
 	name = "Asthma attack"
@@ -250,3 +251,4 @@
 		return
 	to_chat(affected_mob, span_warning("You briefly choke on the mucus piling in your throat!"))
 	affected_mob.losebreath++
+*/

code/datums/elements/directional_attack.dm

@@ -60,6 +60,8 @@
 
 	var/mob/living/target_mob
 	for(target_mob in turf_to_check)
+		if(target_mob == source)
+			continue
 		if(!target_mob || target_mob.stat == DEAD)
 			continue
 		return target_mob

code/datums/status_effects/debuffs/lung_inflammation.dm

@@ -1,3 +1,4 @@
+/*
 /datum/status_effect/lung_inflammation
 	id = "lung_inflammation"
 	tick_interval = 2 SECONDS
@@ -140,3 +141,4 @@
 	var/obj/item/organ/lungs/holder_lungs = owner.getorganslot(ORGAN_SLOT_LUNGS)
 	holder_lungs?.set_received_pressure_mult(holder_lungs::received_pressure_mult)
 	qdel(src)
+*/

code/datums/traits/negative/asthma.dm

@@ -1,3 +1,4 @@
+/*
 /datum/quirk/asthma
 	name = "Asthma"
 	desc = "You suffer from asthma, a inflammatory disorder that causes your airpipe to squeeze shut! Be careful around smoke and irritating gases!"
@@ -136,3 +137,4 @@
 	current_attack = null
 
 	COOLDOWN_START(src, next_attack_cooldown, rand(min_time_between_attacks, max_time_between_attacks))
+*/

code/game/machinery/aug_manipulator.dm

@@ -140,10 +140,8 @@
 		storedpart.static_icon = style_options[augstyle]
 		if(augstyle == "digitigrade")
 			storedpart.bodytype |= BODYTYPE_DIGITIGRADE
-			storedpart.limb_id = "digitigrade"
 		else
 			storedpart.bodytype &= ~(BODYTYPE_DIGITIGRADE)
-			storedpart.limb_id = "robotic"
 // [/CELADON-EDIT]
 		storedpart.should_draw_greyscale = FALSE //Premptive fuck you to greyscale IPCs trying to break something
 		storedpart.update_icon_dropped()

code/game/objects/items/crayons.dm

@@ -646,6 +646,10 @@
 	if(check_empty(user))
 		return
 
+	if(isbodypart(target))
+		if(color_limb(target, user))
+			return
+
 	if(istype(target, /obj/structure/railing/modern))
 		playsound(user.loc, 'sound/effects/spray.ogg', 25, TRUE, 5)
 		return
@@ -712,6 +716,51 @@
 		spray_overlay.color = paint_color
 		. += spray_overlay
 
+/obj/item/toy/crayon/spraycan/proc/color_limb(obj/item/bodypart/limb, mob/living/user)
+	if(!IS_ROBOTIC_LIMB(limb))
+		return FALSE
+
+	var/static/list/type_whitelist = list(/obj/item/bodypart/head/robot, /obj/item/bodypart/r_arm/robot, /obj/item/bodypart/l_arm/robot, /obj/item/bodypart/chest/robot, /obj/item/bodypart/leg/right/robot, /obj/item/bodypart/leg/left/robot)
+	if(!(limb.type in type_whitelist)) //Kepori won't break my system damn it
+		to_chat(user, span_warning("The machine doesn't accept that type of prosthetic!"))
+		return
+
+	var/list/skins = list()
+	var/static/list/style_list_icons = list(
+		"standard" = 'icons/mob/augmentation/augments.dmi',
+		"engineer" = 'icons/mob/augmentation/augments_engineer.dmi',
+		"security" = 'icons/mob/augmentation/augments_security.dmi',
+		"mining" = 'icons/mob/augmentation/augments_mining.dmi',
+		"bishop" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/augments_bishop.dmi',
+		"shellguard" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/augments_shellguard.dmi',
+		"wardtakahashi" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/augments_wardtakahashi.dmi',
+		"xion" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/augments_xion.dmi',
+		"zenghu" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/augments_zenghu.dmi',
+		)
+	var/static/list/digitigrade_style_list = list(
+		"digitigrade" = 'mod_celadon/_storage_icons/icons/mobs/augmentation/digitigrade_legs.dmi',
+		"lizard" = 'icons/mob/augmentation/augments_lizard.dmi',
+		)
+	var/static/list/style_options_list = style_list_icons + digitigrade_style_list
+
+
+	for(var/skin_option in style_options_list)
+		var/image/part_image = image(icon = style_options_list[skin_option], icon_state = "[limb.limb_id]_[limb.body_zone]")
+		if(limb.aux_zone) //Hands
+			part_image.overlays += image(icon = style_options_list[skin_option], icon_state = "[limb.limb_id]_[limb.aux_zone]")
+		skins += list("[skin_option]" = part_image)
+	var/choice = show_radial_menu(user, src, skins, require_near = TRUE)
+	if(choice && (use_charges(user, 5, requires_full = FALSE)))
+		playsound(user.loc, 'sound/effects/spray.ogg', 5, TRUE, 5)
+		limb.static_icon = style_options_list[choice]
+		if(choice in digitigrade_style_list)
+			limb.bodytype |= BODYTYPE_DIGITIGRADE
+		else
+			limb.bodytype &= ~(BODYTYPE_DIGITIGRADE)
+		limb.should_draw_greyscale = TRUE //Premptive fuck you to greyscale IPCs trying to break something
+		limb.update_icon_dropped()
+	return TRUE
+
 /obj/item/toy/crayon/spraycan/borg
 	name = "cyborg spraycan"
 	desc = "A metallic container containing shiny synthesised paint."

code/game/objects/items/food/soup.dm

@@ -302,6 +302,21 @@
 	tastes = list("beet" = 1)
 	foodtypes = VEGETABLES
 
+// [CELADON-ADD]
+/obj/item/food/soup/traditionalredbeet
+	name = "tradition red beet soup"
+	desc = "A simplified form of borscht soup, notably lacking the meat broth."
+	icon = 'mod_celadon/_storage_icons/icons/items/misc/redbeetsoup.dmi'
+	icon_state = "redbeetsoup"
+	food_reagents = list(
+		/datum/reagent/consumable/nutriment = 18,
+		/datum/reagent/water = 5,
+		/datum/reagent/consumable/nutriment/vitamin = 6
+	)
+	tastes = list("nettles" = 1)
+	foodtypes = GRAIN | MEAT | VEGETABLES
+// [/CELADON-ADD]
+
 /obj/item/food/soup/onion
 	name = "french onion soup"
 	desc = "A soup consisting of fried onions that are cooked in a meat stock, then gratineed with bread and cheese at the top."

code/modules/awaymissions/capture_the_flag.dm

@@ -468,11 +468,11 @@
 /obj/item/gun/ballistic/automatic/assault/cm82/ctf
 	desc = "CLIP's standard assault rifle, a relatively new service weapon. This rifle will disintegrate if dropped."
 
-/obj/item/gun/ballistic/automatic/assault/cm82/dropped()
+/obj/item/gun/ballistic/automatic/assault/cm82/ctf/dropped()
 	. = ..()
 	addtimer(CALLBACK(src, PROC_REF(floor_vanish)), 30)
 
-/obj/item/gun/ballistic/automatic/assault/cm82/proc/floor_vanish()
+/obj/item/gun/ballistic/automatic/assault/cm82/ctf/proc/floor_vanish()
 	if(isturf(loc))
 		qdel(src)
 

code/modules/food_and_drinks/recipes/tablecraft/recipes_soup.dm

@@ -47,6 +47,18 @@
 	result = /obj/item/food/soup/nettle
 	subcategory = CAT_SOUP
 
+/datum/crafting_recipe/food/redbeetsoup
+	name = "Redbeet soup"
+	reqs = list(
+		/datum/reagent/water = 10,
+		/obj/item/reagent_containers/glass/bowl = 1,
+		/obj/item/food/meat/rawcutlet = 1,
+		/obj/item/food/grown/redbeet = 1,
+		/obj/item/food/grown/potato = 1,
+	)
+	result = /obj/item/food/soup/nettle
+	subcategory = CAT_SOUP
+
 /datum/crafting_recipe/food/wingfangchu
 	name = "Wingfangchu"
 	reqs = list(

code/modules/missions/outpost/acquire_mission.dm

@@ -17,11 +17,16 @@
 
 /datum/mission/acquire/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc, obj/hangar_crate_spawner/cargo_belt)
 	. = ..()
+// [CELADON-EDIT] - SIMPLED SPAWN DRILL
+/*
 	if(isnull(cargo_belt))
 		container = spawn_bound(container_type, accept_loc, VARSET_CALLBACK(src, container, null))
 		stack_trace("[src] issued by [source_outpost] could not find cargo chute to send items down. Fell back to cargo console.")
 	else
 		container = spawn_bound(container_type, cargo_belt.loc, VARSET_CALLBACK(src, container, null))
+	*/
+	container = spawn_bound(container_type, cargo_belt.loc, VARSET_CALLBACK(src, container, null))
+// [/CELADON-EDIT]
 	container.name += " ([capitalize(objective_type.name)])"
 
 /datum/mission/acquire/Destroy()

code/modules/missions/outpost/drill_mission.dm

@@ -52,11 +52,16 @@
 /datum/mission/drill/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc, obj/hangar_crate_spawner/cargo_belt)
 	. = ..()
 	//you shouldn't be accepting this without an outpost but just in case
+// [CELADON-EDIT] - SIMPLED SPAWN DRILL
+	/*
 	if(isnull(cargo_belt))
 		sampler = spawn_bound(drill_type, accept_loc, VARSET_CALLBACK(src, sampler, null))
 		stack_trace("[src] issued by [source_outpost] could not find cargo chute to send items down. Fell back to cargo console.")
 	else
 		sampler = spawn_bound(drill_type, cargo_belt.loc, VARSET_CALLBACK(src, sampler, null))
+	*/
+	sampler = spawn_bound(drill_type, accept_loc, VARSET_CALLBACK(src, sampler, null))
+// [/CELADON-EDIT]
 	sampler.mission_class = class_wanted
 	sampler.num_wanted = num_wanted
 	sampler.orevein_wanted = available_planets[selected_planet]

code/modules/missions/outpost/industrial_drill.dm

@@ -17,11 +17,16 @@
 
 /datum/mission/acquire/industrial_drill/accept(datum/overmap/ship/controlled/acceptor, turf/accept_loc, obj/hangar_crate_spawner/cargo_belt)
 	. = ..()
+// [CELADON-EDIT] - SIMPLED SPAWN DRILL
+/*
 	if(isnull(cargo_belt))
 		mission_drill = spawn_bound(/obj/machinery/drill/sampler_mission, accept_loc, VARSET_CALLBACK(src, mission_drill, null))
 		stack_trace("[src] issued by [source_outpost] could not find cargo chute to send items down. Fell back to cargo console.")
 	else
 		mission_drill = spawn_bound(/obj/machinery/drill/sampler_mission, cargo_belt.loc, VARSET_CALLBACK(src, mission_drill, null))
+*/
+	mission_drill = spawn_bound(/obj/machinery/drill/sampler_mission, cargo_belt.loc, VARSET_CALLBACK(src, mission_drill, null))
+// [/CELADON-EDIT]
 
 /datum/mission/acquire/industrial_drill/turn_in()
 	//You guys gotta bring the expensive drill back.

code/modules/mob/living/carbon/human/species_types/lizardpeople.dm

@@ -87,19 +87,19 @@
 	var/obj/item/lighter/liz/N = new(H)
 	if(H.put_in_hands(N))
 		to_chat(H, span_notice("You ignite a small flame in your mouth."))
-		// H.remove_reagent(/datum/reagent/fuel, 5)	// [CELADON-ADD] - Вносилось Космо как фикс
-		var/obj/item/organ/stomach/belly = owner.getorganslot(ORGAN_SLOT_STOMACH)
-		belly.reagents.remove_reagent(/datum/reagent/fuel,4)
+		//var/obj/item/organ/stomach/belly = owner.getorganslot(ORGAN_SLOT_STOMACH)
+		//belly.reagents.remove_reagent(/datum/reagent/fuel,4)
+		H.reagents.remove_reagent(/datum/reagent/fuel, 5)
 	else
 		qdel(N)
 		to_chat(H, span_warning("You don't have any free hands."))
 
 /datum/action/innate/liz_lighter/IsAvailable()
 	if(..())
-		// var/mob/living/carbon/human/H = owner	// [CELADON-ADD] - Вносилось Космо как фикс
-		// if(H.reagents && H.has_reagent(/datum/reagent/fuel, 5))	// [CELADON-ADD] - Вносилось Космо как фикс
-		var/obj/item/organ/stomach/belly = owner.getorganslot(ORGAN_SLOT_STOMACH)
-		if(belly && belly.reagents.has_reagent(/datum/reagent/fuel, 4))
+		//var/obj/item/organ/stomach/belly = owner.getorganslot(ORGAN_SLOT_STOMACH)
+		//if(belly && belly.reagents.has_reagent(/datum/reagent/fuel, 4))
+		var/mob/living/carbon/human/H = owner
+		if(H.reagents && H.has_reagent(/datum/reagent/fuel, 5))
 			return TRUE
 		return FALSE
 

code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/goliath_broodmother.dm

@@ -216,6 +216,14 @@
 		visible_message(span_warning("[src] digs one of its tentacles under [target]!"))
 		new /obj/effect/temp_visual/goliath_tentacle/broodmother(tturf, src)
 
+// [CELADON-ADD] - Оффы казуалы
+/mob/living/simple_animal/hostile/asteroid/elite/broodmother_child/death()
+	. = ..()
+	visible_message(span_warning("[src] explodes!"))
+	explosion(get_turf(loc),0,0,0,flame_range = 3, adminlog = FALSE)
+	gib()
+// [CELADON-ADD]
+
 //Tentacles have less stun time compared to regular variant, to balance being able to use them much more often.  Also, 10 more damage.
 /obj/effect/temp_visual/goliath_tentacle/broodmother/trip()
 	var/latched = FALSE

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

@@ -451,7 +451,7 @@
 	if(prob(75))
 		r_pocket = pick(/obj/item/flashlight/seclite, /obj/item/assembly/flash/handheld, /obj/item/restraints/handcuffs)
 	if(prob(50))
-		suit_store = pick(/obj/item/gun/energy/sharplite/x12, /obj/item/gun/energy/sharplite/l305)
+		suit_store = pick(/obj/item/gun/energy/e_gun/e_old, /obj/item/gun/energy/e_gun/e_old/smg) //suit_store = pick(/obj/item/gun/energy/sharplite/x12, /obj/item/gun/energy/sharplite/l305)	// [CELADON-EDIT]
 	for(var/i = 1 to 3)
 		if(prob(75))
 			backpack_contents += pick_weight(list(

code/modules/mob/living/status_procs.dm

@@ -661,6 +661,7 @@
 		return inebriation?.drunk_value
 	return 0
 
+/*
 /mob/living/proc/adjust_lung_inflammation(amount)
 	if(!isnum(amount))
 		CRASH("adjust_lung_inflammation: called with an invalid amount. (Got: [amount])")
@@ -687,3 +688,4 @@
 	if(inflammation)
 		return inflammation?.inflammation
 	return 0
+*/

code/modules/projectiles/guns/ballistic/assault.dm

@@ -121,6 +121,11 @@
 	item_state = "skm_inteq"
 	manufacturer = MANUFACTURER_INTEQ
 
+// [CELADON-ADD] - Рескинов нету - невидимая СКМ
+	unique_reskin = null
+	unique_reskin_changes_inhand = FALSE
+// [/CELADON-ADD]
+
 /obj/item/gun/ballistic/automatic/assault/cm82
 	name = "\improper CM-16"
 	desc = "The standard-issue rifle of CLIP and an extensively modified reproduction of the P-16. Chambered in 5.56mm."

code/modules/reagents/chemistry/holder.dm

@@ -259,8 +259,8 @@
 	var/transfer_log = list()
 	var/r_to_send = list()	// Validated list of reagents to be exposed
 	var/reagents_to_remove = list()
+	var/part = amount / src.total_volume	// [/CELADON-EDIT]
 	if(!round_robin)
-		var/part = amount / src.total_volume
 		for(var/datum/reagent/reagent as anything in cached_reagents)
 			if(remove_blacklisted && !(reagent.can_synth))
 				continue
@@ -301,9 +301,9 @@
 			to_transfer = max(to_transfer - transfer_amount , 0)
 			if(methods)
 				if(istype(target_atom, /obj/item/organ))
-					R.expose_single(reagent, target, methods, transfer_amount, show_message)
+					R.expose_single(reagent, target, methods, part, show_message)	//	[CELADON-EDIT]
 				else
-					R.expose_single(reagent, target_atom, methods, transfer_amount, show_message)
+					R.expose_single(reagent, target_atom, methods, part, show_message)	//	[CELADON-EDIT]
 				reagent.on_transfer(target_atom, methods, transfer_amount * multiplier)
 			remove_reagent(reagent.type, transfer_amount)
 			var/list/reagent_qualities = list(REAGENT_TRANSFER_AMOUNT = transfer_amount)