Merge branch 'CeladonSS13:beta-dev' into codding

code/datums/weather/weather.dm

@@ -307,7 +307,10 @@
 		set_area_icon_state(N)
 		if(stage == END_STAGE)
 			N.color = null
-			N.icon = 'icons/turf/areas.dmi'
+			// [CELADON-EDIT] - CELADON_AREAS - Иначе никак не подсунуть свои зоны
+			// N.icon = 'icons/turf/areas.dmi' // CELADON-EDIT - ORIGINAL
+			N.icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
+			// [CELADON-EDIT]
 			N.layer = initial(N.layer)
 			N.plane = initial(N.plane)
 			N.set_opacity(FALSE)

code/game/area/areas.dm

@@ -5,7 +5,10 @@
  */
 /area
 	name = "Space"
-	icon = 'icons/turf/areas.dmi'
+	// [CELADON-EDIT] - CELADON_AREAS - Иначе никак не подсунуть свои зоны
+	// icon = 'icons/turf/areas.dmi' // CELADON-EDIT - ORIGINAL
+	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
+	// [CELADON-EDIT]
 	icon_state = "unknown"
 	layer = AREA_LAYER
 	//Keeping this on the default plane, GAME_PLANE, will make area overlays fail to render on FLOOR_PLANE.

code/game/machinery/firealarm.dm

@@ -346,5 +346,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm, 32)
 		return
 	A.party = TRUE
 	if (!party_overlay)
-		party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party")
+		// [CELADON-EDIT] - CELADON_AREAS - Иначе никак не подсунуть свои зоны
+		// party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party") // CELADON-EDIT - ORIGINAL
+		party_overlay = iconstate2appearance('mod_celadon/_storge_icons/icons/areas.dmi', "party")
+		// [CELADON-EDIT]
 	A.add_overlay(party_overlay)

code/modules/admin/verbs/mapping.dm

@@ -62,7 +62,10 @@ GLOBAL_PROTECT(admin_verbs_debug_extra)
 	desc = "I am a mappers mistake."
 
 /obj/effect/debugging/marker
-	icon = 'icons/turf/areas.dmi'
+	// [CELADON-EDIT] - CELADON_AREAS - Иначе никак не подсунуть свои зоны
+	// icon = 'icons/turf/areas.dmi' // CELADON-EDIT - ORIGINAL
+	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
+	// [CELADON-EDIT]
 	icon_state = "yellow"
 
 /obj/effect/debugging/marker/Move()

code/modules/buildmode/submodes/area_edit.dm

@@ -5,7 +5,10 @@
 	var/image/areaimage
 
 /datum/buildmode_mode/area_edit/New()
-	areaimage = image('icons/turf/areas.dmi', null, "yellow")
+	// [CELADON-EDIT] - CELADON_AREAS - Иначе никак не подсунуть свои зоны
+	// areaimage = image('icons/turf/areas.dmi', null, "yellow") // CELADON-EDIT - ORIGINAL
+	areaimage = image('mod_celadon/_storge_icons/icons/areas.dmi', null, "yellow")
+	// [CELADON-EDIT]
 	..()
 
 /datum/buildmode_mode/area_edit/enter_mode(datum/buildmode/BM)

mod_celadon/areas/README.md

@@ -28,7 +28,11 @@ ID мода: CELADON_AREAS
 
 ### Изменения *кор кода*
 
-- Отсутствуют
+- `code/game/area/areas.dm`
+- `code/datums/weather/weather.dm`
+- `code/game/machinery/firealarm.dm`
+- `code/modules/buildmode/submodes/area_edit.dm`
+- `code/modules/admin/verbs/mapping.dm`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.

mod_celadon/areas/_areas.dm

@@ -7,3 +7,21 @@
 	author = "MrCat15352"
 
 ///**********************************************************************///
+/// Эти проки нужны, для того чтобы инициализировать датумы в определенный момент времени
+/// сборки билда. Инициализация обновляет данные в билде повторно, перезаписывая новыми значениями
+/// из модпака. Но иногда, сама инциализация есть и вызывается в кор коде в определенный момент, и
+/// тогда такие проки не нужны и вовсе. Также проки не нужны если в модпаке только объекты находятся.
+/// Если эти конструкции не нужны, просто закоментируй их!
+/// (можешь использовать все три, но запуск билда увеличится на 0.1 сек, за каждый датум в модпаке)
+
+// Инициализация ДО
+// /datum/modpack/donaters/pre_initialize()
+// 	. = ..()
+
+// Инициализация ВОВРЕМЯ
+// /datum/modpack/areas/initialize()
+// 	. = ..()
+
+// Инициализация ПОСЛЕ
+// /datum/modpack/donaters/post_initialize()
+// 	. = ..()

mod_celadon/areas/code/outpost.dm

@@ -14,123 +14,102 @@
 
 /area/outpost/medical/reseption
 	name = "Reseption"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "reseption"
 
 /area/outpost/medical/morgue
 	name = "Morg"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "morg"
 
 /area/outpost/medical/hall_1
 	name = "Hall 1"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "hall_1"
 
 /area/outpost/medical/hall_2
 	name = "Hall 2"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "hall_2"
 
 /area/outpost/medical/storage
 	name = "Storge"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "storge"
 
 /area/outpost/medical/surgery_1
 	name = "Surgery 1"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "surgery_1"
 
 /area/outpost/medical/surgery_2
 	name = "Surgery 2"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "surgery_2"
 
 /area/outpost/medical/palata_1
 	name = "Palata 1"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "palata_1"
 
 /area/outpost/medical/palata_2
 	name = "Palata 2"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "palata_2"
 
 /area/outpost/medical/relax_room
 	name = "Relax Room"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "relax"
 
 /area/outpost/medical/genetic
 	name = "Genetica"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "genetic"
 
 /area/outpost/medical/chemestry
 	name = "Chemestry"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "chemestry"
 
 /area/outpost/medical/cmo
 	name = "CMO"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "cmo"
 
 /// LONGUE
 
 /area/outpost/crew/lounge/cab_1
 	name = "Cabinka 1"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "lounge_cab_1"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/outpost/crew/lounge/cab_2
 	name = "Cabinka 2"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "lounge_cab_2"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/outpost/crew/lounge/cab_3
 	name = "Cabinka 3"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "lounge_cab_3"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /area/outpost/crew/lounge/cab_4
 	name = "Cabinka 4"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "lounge_cab_4"
 	sound_environment = SOUND_AREA_WOODFLOOR
 
 /// BAR
 
 /area/outpost/crew/bar/vip_elysium_zone
 	name = "VIP Elysium Zone"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "vip_elysium"
 	lighting_colour_tube = "#e5ffd6"
 	lighting_colour_bulb = "#c1ffc7"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/outpost/crew/bar/vip_zone
 	name = "VIP Zone"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "vip"
 	lighting_colour_tube = "#f3d6ff"
 	lighting_colour_bulb = "#f0c1ff"
 	sound_environment = SOUND_AREA_SMALL_SOFTFLOOR
 
 /area/outpost/crew/bar/theatre
 	name = "Theatre"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "theatre"
 	lighting_colour_tube = "#ffd6d6"
 	lighting_colour_bulb = "#ffc1c1"
 
 /area/outpost/crew/bar/central_bar
 	name = "Central Bar"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "central_bar"
 	lighting_colour_tube = "#d6feff"
 	lighting_colour_bulb = "#c1ffff"
@@ -139,7 +118,6 @@
 
 /area/outpost/fraction
 	name = "Fraction"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 	icon_state = "fraction"
 	sound_environment = SOUND_AREA_MEDIUM_SOFTFLOOR
 

mod_celadon/areas/code/ship_areas.dm

@@ -2,7 +2,6 @@
 /area/ship/general
 	name = "General"
 	icon_state = "general"
-	icon = 'mod_celadon/_storge_icons/icons/areas.dmi'
 
 /// COMMAND CREW
 /area/ship/general/command_crew