Fix: Jetpack module, minor system announce spell. Tweaks: smartfridge…

… for blood. (#1210)

* Minor station roundstart announce fix

* bloodbank in smartfridge can be selected during circuit setting

* jetpack upgrade with icons

* jetpack upgrade with icons - readme and comment fixes

* transfer some changes to modules, deleted blots in icons

* jetpack_upgrade without lights

* merge conflict resolve

* Merge conflict fix, icon path fix

* smartfridge var problem fixed

* merg conf1

* finally no conflicts

* jetpack upgrade1

* jetpack upgrade2

* jetpack upgrade3

code/game/gamemodes/extended/extended.dm

@@ -30,7 +30,7 @@
 /datum/game_mode/extended/announced/send_intercept(report = 0)
 	// [CELADON-EDIT] - CELADON_QOL
 	// priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/ai/commandreport.ogg')		// CELADON-EDIT - ORIGINAL
-	priority_announce("Инициализация системы Griffon завершена. Все последние данные успешно задокументированы. Данные последних секторных карт были загружены в общую сеть. Спасибо за посещение <[station_name()]>. Желаем вам успешных приключений.", "Колониальная сеть объявлений", 'mod_celadon/_storge_sounds/sound/ai/commandreport.ogg')
+	priority_announce("Инициализация системы Griffon завершена. Все последние данные успешно задокументированы. Данные последних секторных карт были загружены в общую сеть. Спасибо за посещение [station_name()]. Желаем вам успешных приключений.", "Колониальная сеть объявлений", 'mod_celadon/_storge_sounds/sound/ai/commandreport.ogg')
 	// [/CELADON-EDIT]
 
 

code/game/objects/items/circuitboards/machine_circuitboards.dm

@@ -567,16 +567,28 @@
 	name = "Smartfridge (Machine Board)"
 	build_path = /obj/machinery/smartfridge
 	req_components = list(/obj/item/stock_parts/matter_bin = 1)
-	var/static/list/fridges_name_paths = list(/obj/machinery/smartfridge = "plant produce",
-		/obj/machinery/smartfridge/food = "food",
+// [CELADON-EDIT] - CELADON_QOL - Bloodbank circuit added
+	var/static/list/fridges_name_paths = list(/obj/machinery/smartfridge/bloodbank = "blood",
+		/obj/machinery/smartfridge/chemistry = "chems",
+		/obj/machinery/smartfridge/disks = "disks",
 		/obj/machinery/smartfridge/drinks = "drinks",
-		/obj/machinery/smartfridge/extract = "slimes",
+		/obj/machinery/smartfridge/food = "food",
 		/obj/machinery/smartfridge/organ = "organs",
-		/obj/machinery/smartfridge/chemistry = "chems",
-		/obj/machinery/smartfridge/chemistry/virology = "viruses",
-		/obj/machinery/smartfridge/disks = "disks")
+		/obj/machinery/smartfridge = "plant produce",
+		/obj/machinery/smartfridge/extract = "slimes",
+		/obj/machinery/smartfridge/chemistry/virology = "viruses")
+// [/CELADON-EDIT]
 	needs_anchored = FALSE
-
+// Original is below because var then becomes not connectede to circutboard and problems appera
+
+/*	var/static/list/fridges_name_paths = list(/obj/machinery/smartfridge = "plant produce", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/food = "food", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/drinks = "drinks", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/extract = "slimes", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/organ = "organs", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/chemistry = "chems", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/chemistry/virology = "viruses", // CELADON-EDIT - ORIGINAL
+		/obj/machinery/smartfridge/disks = "disks")*/ // CELADON-EDIT - ORIGINAL
 /obj/item/circuitboard/machine/smartfridge/Initialize(mapload, new_type)
 	if(new_type)
 		build_path = new_type

mod_celadon/fixes/_fixes.dme

@@ -16,5 +16,6 @@
 #include "code/turf.dm"
 #include "code/coil.dm"
 #include "code/magboots.dm"
+#include "code/jetpack_upgrade.dm"
 
 #endif

mod_celadon/fixes/code/jetpack_upgrade.dm

@@ -0,0 +1,48 @@
+/obj/item/tank/jetpack/suit
+	name = "hardsuit jetpack upgrade"
+	desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
+	icon = 'mod_celadon/fixes/icons/obj/items.dmi' //Changed item icon
+	icon_state = "jetpack_upgrade"
+	item_state = "jetpack-black"
+	w_class = WEIGHT_CLASS_NORMAL
+	actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
+	volume = 1
+	slot_flags = null
+	gas_type = null
+	full_speed = FALSE
+	custom_price = 2000
+
+/obj/item/tank/jetpack/suit
+	name = "hardsuit jetpack upgrade"
+	desc = "A modular, compact set of thrusters designed to integrate with a hardsuit. It is fueled by a tank inserted into the suit's storage compartment."
+	icon = 'mod_celadon/fixes/icons/obj/items.dmi' // Changed item icon
+	icon_state = "jetpack_upgrade"
+	item_state = "jetpack-black"
+	w_class = WEIGHT_CLASS_NORMAL
+	actions_types = list(/datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
+	volume = 1
+	slot_flags = null
+	gas_type = null
+	full_speed = FALSE
+	custom_price = 2000
+
+/obj/item/tank/jetpack/suit/turn_on(mob/user)
+	if(!istype(loc, /obj/item/clothing/suit/space/hardsuit) || !ishuman(loc.loc) || loc.loc != user)
+		return
+	var/mob/living/carbon/human/H = user
+	icon = 'icons/obj/tank.dmi'
+	icon_state = "jetpack_upgrade-on"
+	tank = H.s_store
+	air_contents = tank.air_contents
+	START_PROCESSING(SSobj, src)
+	cur_user = user
+	..()
+
+/obj/item/tank/jetpack/suit/turn_off(mob/user)
+	icon = 'icons/obj/tank.dmi'
+	icon_state = "jetpack_upgrade"
+	tank = null
+	air_contents = temp_air_contents
+	STOP_PROCESSING(SSobj, src)
+	cur_user = null
+	..()

mod_celadon/qol/README.md

@@ -36,6 +36,7 @@ ID мода: CELADON_QOL
 - /stutter теперь не распространяется на русские гласные
 - /slur теперь заменяет символы кириллицы на "пьяный вариант" и пропускает пробел
 - /check_for_custom_say_emote теперь нормально работает с кириллицей
+- добавлен вариант "bloodbank" в список для выбора при настройке платы умного холодильника
 <!--
   Что он делает, что добавляет: что, куда, зачем и почему - всё здесь.
   А также любая полезная информация.
@@ -118,6 +119,9 @@ ID мода: CELADON_QOL
 
 - EDIT `code\__HELPERS\roundend.dm` -> Изменён вывод гринтекста на более правильный для последующего вывода в Discord.
 
+Смартфридж Bloodbank
+- ADD+EDIT `code\game\objects\items\circuitboards\machine_circuitboards.dm` - Добавление платы bloodbank в пул смартфридж плат, сортировка по алфавиту в меню.
+
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.