Merge branch 'dev-sierra' into Coat-retexture

SierraBay · Dec 16, 2024 · 299d2e4 · 299d2e4
2 parents aa98187 + 4866e44
commit 299d2e4
Show file tree

Hide file tree

Showing 16 changed files with 268 additions and 186 deletions.
diff --git a/html/changelog.html b/html/changelog.html
@@ -28,6 +28,12 @@ <h2>Sierra SS13</h2>
 		-->
 		<div class="changelog">
 
+			<h2 class="date">15.12 - 2024</h2>
+			<h3 class="author">Обновления Shegar:</h3>
+			<div class="changes bgimages16">
+				<div class="log experiment">Временное отключение всех аномалий</div>
+			</div>
+
 			<h2 class="date">12.12 - 2024</h2>
 			<h3 class="author">Обновления DieSiege:</h3>
 			<div class="changes bgimages16">
@@ -731,20 +737,6 @@ <h3 class="author">Обновления Builder13:</h3>
 			<div class="changes bgimages16">
 				<div class="log rscadd">Возвращены OOC заметки персонажа. Их можно настроить через кнопку Set OOC notes рядом с кнопками флавора. Заполненные OOC заметки можно смотреть через examine персонажа</div>
 			</div>
-
-			<h2 class="date">14.10 - 2024</h2>
-			<h3 class="author">Обновления Lexanx:</h3>
-			<div class="changes bgimages16">
-				<div class="log rscadd">Добавлена возможность сохранять сканы с бодисканнера.</div>
-				<div class="log rscadd">Добавлен новый тип файлов. BSC - bodyscan</div>
-			</div>
-			<h3 class="author">Обновления Neonvolt:</h3>
-			<div class="changes bgimages16">
-				<div class="log bugfix">Исправлен доступ дрона Восхождения</div>
-				<div class="log bugfix">Множественные исправления пропавших спрайтов Восхождения</div>
-				<div class="log rscadd">Добавлены сканеры аномалий для различных ИКСов Восхождения</div>
-				<div class="log experiment">Возвращены авей-корабли Восхождения</div>
-			</div>
 	</div></div>
 	<div class="icons-by">Icons by <a target="_blank" href="https://icons8.com">Icons8</a></div>
 </body></html>
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
@@ -26582,3 +26582,8 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY sierra_genchangelog.p
   - tweak: "\u0426\u044E\u0440\u0438\u0445 \u043D\u0435\u043E\u0431\u044F\u0437\u0430\
       \u0442\u0435\u043B\u0435\u043D \u0434\u043B\u044F \u043F\u043B\u0430\u043D\u0435\
       \u0442 \u0441 \u0438\u043D\u0444\u0438\u043D\u0438\u0442\u0438."
+2024-12-15:
+  Shegar:
+  - experiment: "\u0412\u0440\u0435\u043C\u0435\u043D\u043D\u043E\u0435 \u043E\u0442\
+      \u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u0432\u0441\u0435\u0445 \u0430\
+      \u043D\u043E\u043C\u0430\u043B\u0438\u0439"
diff --git a/html/changelogs/AutoChangeLog-sierra-pr-2914.yml b/html/changelogs/AutoChangeLog-sierra-pr-2914.yml
@@ -0,0 +1,7 @@
+author: Teteshnik
+changes:
+  - {bugfix: Пофиксил вендор сигарет в либерии.}
+  - {imageadd: Добавил новый спрайт для MA21.}
+  - {tweak: Вернул возможность стать ППТ воксом.}
+  - {rscadd: Добавил новые значки в лодаут.}
+delete-after: true
diff --git a/maps/sierra/loadout/loadout_accessories.dm b/maps/sierra/loadout/loadout_accessories.dm
@@ -142,3 +142,32 @@
 	flags = GEAR_HAS_NO_CUSTOMIZATION
 	cost = 0
 
+/datum/gear/accessory/cross_blue
+	display_name = "Cross blue"
+	path = /obj/item/clothing/accessory/cross_blue
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+	cost = 2
+
+/datum/gear/accessory/cross_red
+	display_name = "Cross red"
+	path = /obj/item/clothing/accessory/cross_red
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+	cost = 2
+
+/datum/gear/accessory/flower_gold
+	display_name = "Flower gold"
+	path = /obj/item/clothing/accessory/flower_gold
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+	cost = 2
+
+/datum/gear/accessory/flower_silver
+	display_name = "Flower silver"
+	path = /obj/item/clothing/accessory/flower_silver
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+	cost = 2
+
+/datum/gear/accessory/flower_bronze
+	display_name = "Flower bronze"
+	path = /obj/item/clothing/accessory/flower_bronze
+	flags = GEAR_HAS_NO_CUSTOMIZATION
+	cost = 2
diff --git a/mods/_maps/liberia/maps/liberia.dmm b/mods/_maps/liberia/maps/liberia.dmm
@@ -4430,7 +4430,7 @@
 /obj/machinery/vending/cigarette{
 	name = "hacked cigarette machine";
 	prices = list();
-	products = list(/obj/item/storage/fancy/cigarettes=10,/obj/item/storage/box/matches=10,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2)
+	products = list(/obj/item/storage/fancy/smokable/luckystars=5,/obj/item/storage/fancy/smokable/professionals=5,/obj/item/flame/lighter/zippo=4,/obj/item/clothing/mask/smokable/cigarette/cigar/havana=2)
 	},
 /turf/simulated/floor/wood/walnut,
 /area/liberia/bar)

diff --git a/mods/anomaly/code/spawn_anomalies_protocol/spawn_on_planet.dm b/mods/anomaly/code/spawn_anomalies_protocol/spawn_on_planet.dm
@@ -1,12 +1,11 @@
 /datum/map/build_exoplanets()
 	//Игра заспавнит 1 обычную планету и 1 аномальную
 	var/list/anomaly_planets_list = list(
-		/obj/overmap/visitable/sector/exoplanet/ice,
-		/obj/overmap/visitable/sector/exoplanet/volcanic,
-		/obj/overmap/visitable/sector/exoplanet/flying
+		// /obj/overmap/visitable/sector/exoplanet/ice,
+		// /obj/overmap/visitable/sector/exoplanet/volcanic,
+		// /obj/overmap/visitable/sector/exoplanet/flying
 	)
 	var/list/all_planets_list = subtypesof(/obj/overmap/visitable/sector/exoplanet)
-	LAZYREMOVE(all_planets_list, anomaly_planets_list)
 	//Я не придумал как обьяснять игре какая планета обычная, а какая аномальная без
 	//заранее подготовленных списков. Увы.
 	if(!use_overmap)
@@ -16,10 +15,11 @@
 		var/normal_planet_type = pick(all_planets_list)
 		var/obj/overmap/visitable/sector/exoplanet/new_planet = new normal_planet_type(null, world.maxx, world.maxy)
 		new_planet.build_level()
-
-	var/anomaly_planet_type = pick(anomaly_planets_list)
-	var/obj/overmap/visitable/sector/exoplanet/anomaly_new_planet = new anomaly_planet_type(null, world.maxx, world.maxy)
-	anomaly_new_planet.build_level()
+	if(LAZYLEN(anomaly_planets_list))
+		LAZYREMOVE(all_planets_list, anomaly_planets_list)
+		var/anomaly_planet_type = pick(anomaly_planets_list)
+		var/obj/overmap/visitable/sector/exoplanet/anomaly_new_planet = new anomaly_planet_type(null, world.maxx, world.maxy)
+		anomaly_new_planet.build_level()
 
 //Данный код отвечает за размещение аномалий по всей планете.
 /obj/overmap/visitable/sector/exoplanet

diff --git a/mods/failu_skrell_clothes/_failu_skrell_clothes.dm b/mods/failu_skrell_clothes/_failu_skrell_clothes.dm
@@ -1,4 +1,4 @@
-/singleton/modpack/failu_skrell_clothes
-	name = "Skrell Clothes by Failu"
-	desc = "Мод добавляет одежду для скреллов всех каст."
-	author = "KOJIECO"
+/singleton/modpack/failu_skrell_clothes
+	name = "Skrell Clothes by Failu"
+	desc = "Мод добавляет одежду для скреллов всех каст."
+	author = "KOJIECO"
diff --git a/mods/failu_skrell_clothes/code/lists/xenowear.dm b/mods/failu_skrell_clothes/code/lists/xenowear.dm
@@ -1,36 +1,36 @@
-// Alien clothing
-
-// Skrell clothing
-
-// Коммент от Колеса: если по какой-то причине у вас не отображается вещь в нужной вкладке лодаута, почекайте
-// её в других вкладках. Если отображается не там, где нужно, поищите в коркоде определенные флаги сортировки.
-// У меня например пришлось брать из коркода sort_category = "Xenowear"
-/datum/gear/suit/skrell_robe
-	display_name = "(Skrell) Skrellian robe"
-	path = /obj/item/clothing/suit/skrell_robe
-	sort_category = "Xenowear"
-	cost = 1
-	slot = slot_wear_suit
-
-/datum/gear/suit/skrell_clothes
-	display_name = "(Skrell) Skrell clothes selection"
-	path = /obj/item/clothing/under/
-	sort_category = "Xenowear"
-
-/datum/gear/suit/skrell_clothes/New()
-	..()
-	var/skrell_clothes = list()
-	skrell_clothes["Talum-Katish blue dress"] = /obj/item/clothing/under/uniform/skrell_talum_bluedress
-	skrell_clothes["Talum-Katish green waist cloak"] = /obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak
-	skrell_clothes["Raskinta-Katish navy clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_navyclothes
-	skrell_clothes["Malish-Katish blue office suit"] = /obj/item/clothing/under/uniform/skrell_malish_officesuit
-	skrell_clothes["Talum-Katish white and red dress"] = /obj/item/clothing/under/uniform/skrell_talum_whitereddress
-	skrell_clothes["Malish-Katish office suit with tie"] = /obj/item/clothing/under/uniform/skrell_malish_greentiedsuit
-	skrell_clothes["Kanin-Katish sand-blue turtleneck"] = /obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck
-	skrell_clothes["Kanin-Katish orange-cyan uniform"] = /obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform
-	skrell_clothes["Kanin-Katish yellow-black costume"] = /obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume
-	skrell_clothes["Malish-Katish green office suit with suspenders"] = /obj/item/clothing/under/uniform/skrell_malish_greenofficesuit
-	skrell_clothes["Raskinta-Katish red clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_redclothes
-	skrell_clothes["Skrellian diving suit"] = /obj/item/clothing/under/uniform/skrell_skrellian_divingsuit
-	gear_tweaks += new/datum/gear_tweak/path(skrell_clothes)
-
+// Alien clothing
+
+// Skrell clothing
+
+// Коммент от Колеса: если по какой-то причине у вас не отображается вещь в нужной вкладке лодаута, почекайте
+// её в других вкладках. Если отображается не там, где нужно, поищите в коркоде определенные флаги сортировки.
+// У меня например пришлось брать из коркода sort_category = "Xenowear"
+/datum/gear/suit/skrell_robe
+	display_name = "(Skrell) Skrellian robe"
+	path = /obj/item/clothing/suit/skrell_robe
+	sort_category = "Xenowear"
+	cost = 1
+	slot = slot_wear_suit
+
+/datum/gear/suit/skrell_clothes
+	display_name = "(Skrell) Skrell clothes selection"
+	path = /obj/item/clothing/under/
+	sort_category = "Xenowear"
+
+/datum/gear/suit/skrell_clothes/New()
+	..()
+	var/skrell_clothes = list()
+	skrell_clothes["Talum-Katish blue dress"] = /obj/item/clothing/under/uniform/skrell_talum_bluedress
+	skrell_clothes["Talum-Katish green waist cloak"] = /obj/item/clothing/under/uniform/skrell_talum_greenwaistcloak
+	skrell_clothes["Raskinta-Katish navy clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_navyclothes
+	skrell_clothes["Malish-Katish blue office suit"] = /obj/item/clothing/under/uniform/skrell_malish_officesuit
+	skrell_clothes["Talum-Katish white and red dress"] = /obj/item/clothing/under/uniform/skrell_talum_whitereddress
+	skrell_clothes["Malish-Katish office suit with tie"] = /obj/item/clothing/under/uniform/skrell_malish_greentiedsuit
+	skrell_clothes["Kanin-Katish sand-blue turtleneck"] = /obj/item/clothing/under/uniform/skrell_kanin_sandblueturtleneck
+	skrell_clothes["Kanin-Katish orange-cyan uniform"] = /obj/item/clothing/under/uniform/skrell_kanin_orangecyanuniform
+	skrell_clothes["Kanin-Katish yellow-black costume"] = /obj/item/clothing/under/uniform/skrell_kanin_yellowblackcostume
+	skrell_clothes["Malish-Katish green office suit with suspenders"] = /obj/item/clothing/under/uniform/skrell_malish_greenofficesuit
+	skrell_clothes["Raskinta-Katish red clothes"] = /obj/item/clothing/under/uniform/skrell_raskinta_redclothes
+	skrell_clothes["Skrellian diving suit"] = /obj/item/clothing/under/uniform/skrell_skrellian_divingsuit
+	gear_tweaks += new/datum/gear_tweak/path(skrell_clothes)
+