Merge pull request #199 from Kolergo/dev

Адаптация шторма
Proxima-Project · Jul 6, 2023 · d05ebe3 · d05ebe3
2 parents 8caa3e2 + f97f33e
commit d05ebe3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/code/bos/modules/mob/cat.dm b/code/bos/modules/mob/cat.dm
@@ -43,7 +43,7 @@
 	icon_living = "floppa_newyear"
 	mob_size = MOB_LARGE
 
-mob/living/simple_animal/passive/cat/bolgarin
+/mob/living/simple_animal/passive/cat/bolgarin
 	name = "Major Bolgarin"
 	desc = "A domesticated, upolnomochenniy ICCG officer. Has a tendency to kiss crewmembers."
 	icon = 'icons/bos/mob/cat.dmi'

diff --git a/code/bos/modules/overmap/disperser/disperser_charge.dm b/code/bos/modules/overmap/disperser/disperser_charge.dm
@@ -94,7 +94,7 @@
 	var/chargedesc = "ODST"
 
 /obj/structure/ship_munition/disperser_charge/s2s/fire(turf/target, strength, range)
-	explosion(target, strength * range / 1)
+	explosion(target, 0, strength * range / 1, 2)
 
 /obj/structure/ship_munition/disperser_charge/vox
 	name = "Vox charge"
@@ -105,4 +105,4 @@
 
 /obj/structure/ship_munition/disperser_charge/vox/fire(turf/target, strength, range)
 	explosion(target,max(2,strength * range / 10),strength * range / 8,strength * range / 5)
-	empulse(target, strength * range / 5, strength * range)
+	empulse(target, strength * range / 5, strength * range)
diff --git a/maps/away/cadaab/icons/turfs.dmi b/maps/away/cadaab/icons/turfs.dmi
diff --git a/maps/castelnau/code/modules/sandstorm.dm b/maps/castelnau/code/modules/sandstorm.dm
@@ -13,7 +13,7 @@
 	var/checking_area = get_area(unlucky)
 	if(is_type_in_list(checking_area, storm_areas))
 		return CADAAB_OUTSIDE
-	else if(istype(checking_area, /area/cadaab))
+	else if((unlucky.z << 4) && (!istype(checking_area, /area/cadaab/sputnik)))
 		return CADAAB_INDOORS
 	else
 		return FALSE
@@ -69,7 +69,7 @@
 	for(var/turf/simulated/floor/inaks/target_turf in world)
 		target_turf.set_light(0, 0, 0)
 
-	for(var/turf/simulated/floor/grass/cadaab/target_turf in world)
+	for(var/turf/simulated/floor/shuttle_ceiling/cadaab/target_turf in world)
 		target_turf.set_light(0, 0, 0)
 
 	sleep(10 SECONDS)
@@ -88,6 +88,14 @@
 			areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg')
 			areas.ambience = list('sound/effects/bos/lighting.ogg')
 
+	for(var/area/castelnau/areas in world)
+		areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg')
+		areas.ambience = list('sound/effects/bos/lighting.ogg')
+
+	for(var/area/shuttle/castelnau/areas in world)
+		areas.forced_ambience = list('sound/ambience/bos/super_sandstorm_indoor.ogg')
+		areas.ambience = list('sound/effects/bos/lighting.ogg')
+
 	for(var/obj/machinery/noisetv/broadcast in world)
 		broadcast.endnoise()