Вливаем старые PR - Часть 2 и чиним модульность (#447)

* Изменен набор плазмодвигателей * Поправил описание модуля * Добавен ИРП набор в заказы карго * Добавлен комментарий забытый * Починка пакетиков кетчупа и майнеза * Мелкое исправление комментария * Ребаланс цен лаваленда * Поправлены цены в соответствии с ценовой политикой 1984 * добавлен раздел ЗВУКИ * Фикс ошибки удушения с пустым баллоном * Поправлены авторы PR * Введен проверочный блок на дабл инклуд * Поправлен воздух * Добавлены пушки в карго новые, Морита * Забалансировано оружие интека и морита. Добавлена Морита и г36 * Закомментирован код оригинала * Внесен проверочный блок * Обновлена иконка билда * Добавлены звуки оружки * Добавлена статуя Копо. Внесена на карту снежного аванпоста * Обвал цен на гандолы! * Попытка ввести облачка для эмоутов... починить * Гандола обвал.. * Относится к попытке ввести облачка... таска -> почините. я устал * Удалены ненужные файлы * Вернул старые значки и внёс новые значки. Поменял строчку кода на новый значок * Поправлено РЕДМИ * Исправлен ошибка в название модпака с дефайнами * Убраны лишние пробелы, лишний код, приведено к виду нормальному * Введен модпак МАСТЕР ФАЙЛС, см руководство что это такое РЕДМИ в папке mod_celadon * Поправлен шаблонный файл, переведен на русский язык * Расскоментирован Оригинальный код, все изменения встроены сразу в кор код. Да, так нужно. Читай РЕДМИ модульности в папке mod_celadon * Поправлены ПРы
CeladonSS13 · Apr 23, 2024 · 04449b5 · 04449b5
1 parent 9b62e9e
commit 04449b5
Show file tree

Hide file tree

Showing 81 changed files with 923 additions and 191 deletions.
diff --git a/_maps/outpost/nanotrasen_ice.dmm b/_maps/outpost/nanotrasen_ice.dmm
@@ -1547,6 +1547,13 @@
 	light_range = 2
 	},
 /area/outpost/exterior)
+"lB" = (
+/obj/structure/statue/bronze/masson_kills,
+/turf/open/floor/plating/asteroid/snow/temperatre{
+	light_color = "#1B1D2E";
+	light_range = 2
+	},
+/area/outpost/external)
 "lF" = (
 /obj/effect/turf_decal/siding/white{
 	dir = 1
@@ -14802,7 +14809,7 @@ Hd
 Hd
 Sf
 Hd
-Hd
+lB
 Hd
 Hd
 Hd

diff --git a/code/modules/cargo/exports/lavaland.dm b/code/modules/cargo/exports/lavaland.dm
@@ -3,7 +3,10 @@
 //no more 999999 currency after one frost world, sorry
 
 /datum/export/lavaland/minor
-	cost = 5000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 5000 // CELADON-EDIT - ORIGINAL
+	cost = 2500
+	// [/CELADON-EDIT]
 	unit_name = "minor lava planet artifact"
 	export_types = list(/obj/item/immortality_talisman,
 						/obj/item/book_of_babel,
@@ -31,7 +34,10 @@
 						/obj/item/clothing/suit/armor/ascetic)
 
 /datum/export/lavaland/major //valuable chest/ruin loot and staff of storms
-	cost = 10000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 10000 // CELADON-EDIT - ORIGINAL
+	cost = 5000
+	// [/CELADON-EDIT]
 	unit_name = "lava planet artifact"
 	export_types = list(/obj/item/guardiancreator,
 						/obj/item/rod_of_asclepius,
@@ -47,7 +53,10 @@
 //Megafauna loot, except for ash drakes and legion
 
 /datum/export/lavaland/megafauna
-	cost = 40000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 40000 // CELADON-EDIT - ORIGINAL
+	cost = 20000
+	// [/CELADON-EDIT]
 	unit_name = "major lava planet artifact"
 	export_types = list(/obj/item/hierophant_club,
 						/obj/item/melee/transforming/cleaving_saw,
@@ -60,7 +69,10 @@
 						)
 
 /datum/export/lavaland/trophycommon
-	cost = 1500
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 1500 // CELADON-EDIT - ORIGINAL
+	cost = 900
+	// [/CELADON-EDIT]
 	unit_name = "common hunting trophy"
 	export_types = list(/obj/item/crusher_trophy/legion_skull,
 						/obj/item/crusher_trophy/wolf_ear,
@@ -81,7 +93,10 @@
 						/obj/item/crusher_trophy/ice_wing)
 
 /datum/export/lavaland/trophymega
-	cost = 10000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 10000 // CELADON-EDIT - ORIGINAL
+	cost = 5000
+	// [/CELADON-EDIT]
 	unit_name = "big game hunting trophy"
 	export_types = list(/obj/item/crusher_trophy/legionnaire_spine,
 						/obj/item/crusher_trophy/ash_spike,
@@ -99,12 +114,18 @@
 		. += " On behalf of the Nanotrasen RnD division: Thank you for your hard work."
 
 /datum/export/lavaland/megafauna/hev/suit
-	cost = 30000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 30000 // CELADON-EDIT - ORIGINAL
+	cost = 15000
+	// [/CELADON-EDIT]
 	unit_name = "H.E.C.K. suit"
 	export_types = list(/obj/item/clothing/suit/space/hostile_environment)
 
 /datum/export/lavaland/megafauna/hev/helmet
-	cost = 10000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 10000 // CELADON-EDIT - ORIGINAL
+	cost = 8000
+	// [/CELADON-EDIT]
 	unit_name = "H.E.C.K. helmet"
 	export_types = list(/obj/item/clothing/head/helmet/space/hostile_environment)
 
@@ -115,26 +136,41 @@
 	export_types = list(/obj/item/gem/rupee)
 
 /datum/export/lavaland/gems/diamond
-	cost = 5500
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 5500 // CELADON-EDIT - ORIGINAL
+	cost = 2500
+	// [/CELADON-EDIT]
 	unit_name = "Frost Diamond Auction"
 	export_types = list(/obj/item/gem/fdiamond)
 
 /datum/export/lavaland/gems/amber
-	cost = 7500
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 7500 // CELADON-EDIT - ORIGINAL
+	cost = 3500
+	// [/CELADON-EDIT]
 	unit_name = "Draconic Amber"
 	export_types = list(/obj/item/gem/amber)
 
 /datum/export/lavaland/gems/plasma
-	cost = 12000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 12000 // CELADON-EDIT - ORIGINAL
+	cost = 6000
+	// [/CELADON-EDIT]
 	unit_name = "Metastable Phoron"
 	export_types = list(/obj/item/gem/phoron)
 
 /datum/export/lavaland/gems/void
-	cost = 23000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 23000 // CELADON-EDIT - ORIGINAL
+	cost = 11000
+	// [/CELADON-EDIT]
 	unit_name = "Null Crystal"
 	export_types = list(/obj/item/gem/void)
 
 /datum/export/lavaland/gems/blood
 	unit_name = "Ichorium Crystal"
-	cost = 13000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 13000 // CELADON-EDIT - ORIGINAL
+	cost = 7000
+	// [/CELADON-EDIT]
 	export_types = list(/obj/item/gem/bloodstone)
diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm
@@ -44,7 +44,10 @@
 	export_types = list(/obj/item/stack/sheet/animalhide/lizard)
 
 /datum/export/stack/skin/gondola
-	cost = 5000
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен
+	// cost = 5000 // CELADON-EDIT - ORIGINAL
+	cost = 250
+	// [/CELADON-EDIT]
 	unit_name = "gondola hide"
 	export_types = list(/obj/item/stack/sheet/animalhide/gondola)
 

diff --git a/code/modules/cargo/packs/gun.dm b/code/modules/cargo/packs/gun.dm
@@ -150,7 +150,7 @@
 /datum/supply_pack/gun/p16
 	name = "P16 Assault Rifle Crate"
 	desc = "Contains a high-powered, automatic rifle chambered in 5.56mm."
-	cost = 5000
+	// cost = 5000		// MOD_CELADON -> mod_celadon\cargo_items\code\ammo.dm
 	contains = list(/obj/item/gun/ballistic/automatic/assault/p16)
 	crate_name = "auto rifle crate"
 

diff --git a/code/modules/cargo/packs/machinery.dm b/code/modules/cargo/packs/machinery.dm
@@ -209,9 +209,16 @@
 /datum/supply_pack/machinery/plasma_thruster
 	name = "Plasma Thruster Crate"
 	desc = "A crate containing a plasma thruster and its heater's electronics. For when you need a lot of extra thrust."
-	cost = 1500
-	contains = list(/obj/item/circuitboard/machine/shuttle/heater,
-					/obj/item/circuitboard/machine/shuttle/engine/plasma)
+	// [CELADON-EDIT] - CARGO_ITEMS - Ребаланс цен и наполнения
+	// cost = 1500 // CELADON-EDIT - ORIGINAL
+	// contains = list(/obj/item/circuitboard/machine/shuttle/heater, // CELADON-EDIT - ORIGINAL
+	//				/obj/item/circuitboard/machine/shuttle/engine/plasma) // CELADON-EDIT - ORIGINAL
+	cost = 5000
+	contains = list(/obj/item/circuitboard/machine/shuttle/engine/plasma,
+					/obj/item/circuitboard/machine/shuttle/heater,
+					/obj/item/circuitboard/machine/pipedispenser,
+					/obj/machinery/portable_atmospherics/canister/toxins)
+	// [/CELADON-EDIT]
 	crate_name = "plasma thruster crate"
 	crate_type = /obj/structure/closet/crate/engineering
 

diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
@@ -221,18 +221,32 @@
 	volume = 10
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list()
+	// [CELADON-EDIT] - FOOD_AND_DRINKS - Починка спрайтов кетчупа и майонеза
+	// possible_states = list( // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."), // CELADON-EDIT - ORIGINAL
+	// 	/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."), // CELADON-EDIT - ORIGINAL
+	// 	)
 	possible_states = list(
-		/datum/reagent/consumable/ketchup = list("condi_ketchup", "Ketchup", "You feel more American already."),
-		/datum/reagent/consumable/capsaicin = list("condi_hotsauce", "Hotsauce", "You can almost TASTE the stomach ulcers now!"),
-		/datum/reagent/consumable/soysauce = list("condi_soysauce", "Soy Sauce", "A salty soy-based flavoring"),
-		/datum/reagent/consumable/frostoil = list("condi_frostoil", "Coldsauce", "Leaves the tongue numb in it's passage"),
-		/datum/reagent/consumable/sodiumchloride = list("condi_salt", "Salt Shaker", "Salt. From space oceans, presumably"),
-		/datum/reagent/consumable/blackpepper = list("condi_pepper", "Pepper Mill", "Often used to flavor food or make people sneeze"),
-		/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
-		/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
-		/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
-		/datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
+		/datum/reagent/consumable/ketchup = list("icon_state" = "condi_ketchup", "item_state" = "", "icon_empty" = "", "name" = "ketchup", "desc" = "You feel more American already."),
+		/datum/reagent/consumable/capsaicin = list("icon_state" = "condi_hotsauce", "item_state" = "", "icon_empty" = "", "name" = "hotsauce", "desc" = "You can almost TASTE the stomach ulcers!"),
+		/datum/reagent/consumable/soysauce = list("icon_state" = "condi_soysauce", "item_state" = "", "icon_empty" = "", "name" = "soy sauce", "desc" = "A salty soy-based flavoring."),
+		/datum/reagent/consumable/frostoil = list("icon_state" = "condi_coldsauce", "item_state" = "", "icon_empty" = "", "name" = "coldsauce", "desc" = "Leaves the tongue numb from its passage."),
+		/datum/reagent/consumable/sodiumchloride = list("icon_state" = "condi_salt", "item_state" = "", "icon_empty" = "", "name" = "salt", "desc" = "Salt. From dead crew, presumably."),
+		/datum/reagent/consumable/blackpepper = list("icon_state" = "condi_pepper", "item_state" = "", "icon_empty" = "", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."),
+		/datum/reagent/consumable/cornoil = list("icon_state" = "condi_cornoil", "item_state" = "", "icon_empty" = "", "name" = "corn oil", "desc" = "A delicious oil used in cooking. Made from corn."),
+		/datum/reagent/consumable/sugar = list("icon_state" = "condi_sugar", "item_state" = "", "icon_empty" = "", "name" = "sugar", "desc" = "Tasty spacey sugar!"),
+		/datum/reagent/consumable/astrotame = list("icon_state" = "condi_astrotame", "item_state" = "", "icon_empty" = "", "name" = "Astrotame", "desc" = "The sweetness of a thousand sugars but none of the calories."),
+		/datum/reagent/consumable/bbqsauce = list("icon_state" = "condi_bbq", "item_state" = "", "icon_empty" = "", "name" = "bbq sauce", "desc" = "Hand wipes not included.")
 		)
+	// [/CELADON-EDIT]
 
 /obj/item/reagent_containers/food/condiment/pack/update_icon()
 	SHOULD_CALL_PARENT(FALSE)
@@ -260,10 +274,19 @@
 /obj/item/reagent_containers/food/condiment/pack/on_reagent_change(changetype)
 	if(reagents.reagent_list.len > 0)
 		var/main_reagent = reagents.get_master_reagent_id()
+		// [CELADON-EDIT] - FOOD_AND_DRINKS - Починка спрайтов кетчупа и майонеза
+		// if(main_reagent in possible_states) // CELADON-EDIT - ORIGINAL
+		// 	var/list/temp_list = possible_states[main_reagent] // CELADON-REMOVE - ORIGINAL
+		// 	icon_state = temp_list[1] // CELADON-EDIT - ORIGINAL
+		// 	desc = temp_list[3] // CELADON-EDIT - ORIGINAL
 		if(main_reagent in possible_states)
-			var/list/temp_list = possible_states[main_reagent]
-			icon_state = temp_list[1]
-			desc = temp_list[3]
+			icon_state = possible_states[main_reagent]["icon_state"]
+			item_state = possible_states[main_reagent]["item_state"] // CELADON-ADD
+			icon_empty = possible_states[main_reagent]["icon_empty"] // CELADON-ADD
+			name = possible_states[main_reagent]["name"] // CELADON-ADD
+			desc = possible_states[main_reagent]["desc"]
+			return ..(TRUE) // Don't fill normally // CELADON-ADD
+		// [/CELADON-EDIT]
 		else
 			icon_state = "condi_mixed"
 			desc = "A small condiment pack. The label says it contains [originalname]"

diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
@@ -145,7 +145,7 @@
 
 
 //Third link in a breath chain, calls handle_breath_temperature()
-/mob/living/carbon/proc/check_breath(datum/gas_mixture/breath)
+/mob/living/carbon/proc/check_breath(datum/gas_mixture/breath)	// MOD_CELADON -> mod_celadon\fixes\code\life.dm
 	if(status_flags & GODMODE)
 		return
 	if(HAS_TRAIT(src, TRAIT_NOBREATH))
@@ -180,7 +180,10 @@
 
 	//OXYGEN
 	if(O2_partialpressure < safe_oxy_min) //Not enough oxygen
-		if(prob(20))
+		// [CELADON-EDIT] - FIXES - Починка удушения
+		// if(prob(20))	// CELADON-EDIT - ORIGINAL
+		if(prob(25))
+		// [/CELADON-EDIT]
 			emote("gasp")
 		if(O2_partialpressure > 0)
 			var/ratio = 1 - O2_partialpressure/safe_oxy_min

diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
@@ -1830,8 +1830,8 @@
 	REMOVE_TRAIT(src, TRAIT_UI_BLOCKED, TRAIT_HANDS_BLOCKED)
 	REMOVE_TRAIT(src, TRAIT_PULL_BLOCKED, TRAIT_HANDS_BLOCKED)
 
-/// Special key down handling of /living mobs, currently only used for typing indicator
-/mob/living/key_down(_key, client/user)
+// Special key down handling of /living mobs, currently only used for typing indicator
+/mob/living/key_down(_key, client/user)		// MOD_CELADON -> mod_celadon\qol\code\talk.dm
 	if(!typing_indicator && stat == CONSCIOUS)
 		for(var/kb_name in user.prefs.key_bindings[_key])
 			switch(kb_name)
@@ -1843,8 +1843,8 @@
 					break
 	return ..()
 
-/// Used for setting typing indicator on/off. Checking the state should be done not on the proc to avoid overhead.
-/mob/living/set_typing_indicator(state)
+// Used for setting typing indicator on/off. Checking the state should be done not on the proc to avoid overhead.
+/mob/living/set_typing_indicator(state)		// MOD_CELADON -> mod_celadon\qol\code\talk.dm
 	typing_indicator = state
 	var/state_of_bubble = bubble_icon? "[bubble_icon]0" : "default0"
 	var/mutable_appearance/bubble_overlay = mutable_appearance('icons/mob/talk.dmi', state_of_bubble, plane = RUNECHAT_PLANE)

diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
@@ -1,4 +1,4 @@
-/mob/living
+/mob/living		// MOD_CELADON -> mod_celadon\qol\code\talk.dm
 	see_invisible = SEE_INVISIBLE_LIVING
 	sight = 0
 	see_in_dark = 2

diff --git a/code/modules/mob/living/living_say.dm b/code/modules/mob/living/living_say.dm
@@ -260,7 +260,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
 	show_message(message, MSG_AUDIBLE, deaf_message, deaf_type)
 	return message
 
-/mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, list/message_mods = list())
+/mob/living/send_speech(message, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, list/message_mods = list())		// MOD_CELADON -> mod_celadon\qol\code\talk.dm
 	var/eavesdrop_range = 0
 	if(message_mods[WHISPER_MODE]) //If we're whispering
 		eavesdrop_range = EAVESDROP_EXTRA_RANGE

diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm
@@ -362,7 +362,7 @@
 
 /obj/item/ammo_box/a308
 	name = "ammo box (.308)"
-	icon_state = "a308box"
+	// icon_state = "a308box"		// MOD_CELADON -> mod_celadon\balance\code\projectiles\boxes_magazines\external\ammo_boxes.dm
 	ammo_type = /obj/item/ammo_casing/a308
 	max_ammo = 30
 

diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm
@@ -69,8 +69,8 @@
 /obj/projectile/bullet/a858
 	name = "8x58mm caseless bullet"
 	speed = 0.3
-	damage = 35
-	armour_penetration = 40
+	// damage = 35		// MOD_CELADON -> mod_celadon\balance\code\projectiles\projectile\bullets\rifle.dm
+	// armour_penetration = 40
 
 
 // .299 Eoehoma Caseless (E-40)

diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm
@@ -722,8 +722,8 @@
 	display_name = "Advanced Ballistics"
 	description = "Refined ballistic ammunition for extra combat trauma."
 	prereq_ids = list("ballistic_weapons", "adv_engi")
-	design_ids = list("ap9mm", "ap10mm", "ap45", "hp9mm", "hp10mm", "hp45", "ap556mmHITP", "hp556mmHITP")
-	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
+	// design_ids = list("ap9mm", "ap10mm", "ap45", "hp9mm", "hp10mm", "hp45", "ap556mmHITP", "hp556mmHITP")		// MOD_CELADON -> mod_celadon\balance\code\research\weapon_designs.dm
+	// research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 
 /datum/techweb_node/exotic_ammo
 	id = "exotic_ammo"