good suggestions

shiptest-ss13 · Dec 15, 2024 · 226cada · 226cada
1 parent 0cc9a18
commit 226cada
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 16 deletions.
diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm
@@ -1518,3 +1518,11 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	if(dir & WEST)
 		return WEST
 	return 0
+
+/proc/flame_radius(turf/epicenter, radius = 1, power = 5, fire_color = "red")
+	if(!isturf(epicenter))
+		CRASH("flame_radius used without a valid turf parameter")
+	radius = clamp(radius, 1, 50) //Sanitize inputs
+
+	for(var/turf/turf_to_flame as anything in filled_turfs(epicenter, radius, "circle"))
+		turf_to_flame.IgniteTurf(power, fire_color)
diff --git a/code/datums/diseases/advance/presets.dm b/code/datums/diseases/advance/presets.dm
@@ -3,7 +3,7 @@
 	copy_type = /datum/disease/advance
 
 /datum/disease/advance/cold/New()
-	name = BIOME_COLD
+	name = "Cold"
 	symptoms = list(new/datum/symptom/sneeze)
 	..()
 

diff --git a/code/datums/diseases/cold9.dm b/code/datums/diseases/cold9.dm
@@ -28,7 +28,7 @@
 			if(prob(5))
 				to_chat(affected_mob, "<span class='danger'>You feel stiff.</span>")
 		if(3)
-			affected_mob.adjust_bodytemperature(-20)
+			affected_mob.adjust_bodytemperature(-3)
 			if(prob(1))
 				affected_mob.emote("sneeze")
 			if(prob(1))

diff --git a/code/datums/diseases/fluspanish.dm b/code/datums/diseases/fluspanish.dm
@@ -15,7 +15,7 @@
 	..()
 	switch(stage)
 		if(2)
-			affected_mob.adjust_bodytemperature(10)
+			affected_mob.adjust_bodytemperature(5)
 			if(prob(5))
 				affected_mob.emote("sneeze")
 			if(prob(5))
@@ -25,7 +25,7 @@
 				affected_mob.take_bodypart_damage(0,5)
 
 		if(3)
-			affected_mob.adjust_bodytemperature(20)
+			affected_mob.adjust_bodytemperature(10)
 			if(prob(5))
 				affected_mob.emote("sneeze")
 			if(prob(5))

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/antlion.dm
@@ -48,7 +48,7 @@
 	visible_message("<span class='notice'>\The [src] burrows into \the [my_turf]!</span>")
 	burrowed = TRUE
 	invisibility = INVISIBILITY_MAXIMUM
-	AIStatus = AI_OFF
+	toggle_ai(AI_OFF)
 	mob_size = MOB_SIZE_TINY
 	new /obj/effect/temp_visual/burrow_sand_splash(my_turf)
 	addtimer(CALLBACK(src, PROC_REF(diggy)), 2 SECONDS)
@@ -79,7 +79,7 @@
 	visible_message("<span class='danger'>\The [src] erupts from \the [my_turf]!</span>")
 	invisibility = 0
 	burrowed = FALSE
-	AIStatus = AI_ON
+	toggle_ai(AI_ON)
 	mob_size = initial(mob_size)
 	playsound(my_turf, 'sound/effects/bamf.ogg', 50, 0)
 	new /obj/effect/temp_visual/burrow_sand_splash(my_turf)

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm
@@ -158,7 +158,7 @@
 	return ..()
 
 /mob/living/simple_animal/hostile/asteroid/basilisk/whitesands/bullet_act(obj/projectile/P)
-	shell_damage(max(P.force, MAX_BULLET_SHELL_DAMAGE))
+	shell_damage(min(P.force, MAX_BULLET_SHELL_DAMAGE))
 	if(has_shell)
 		playsound(src, pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg'), 85, TRUE)
 		visible_message("<span class='notice'>The [P] is absorbed by the [src]'s shell, dealing minimal damage!</span>") //make it less confusing when bullets do no damage

diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/goldgrub.dm
@@ -189,12 +189,3 @@
 /mob/living/simple_animal/hostile/asteroid/goldgrub/lavagrub/death(gibbed)
 	. = ..()
 	flame_radius(get_turf(src), 2)
-
-
-/proc/flame_radius(turf/epicenter, radius = 1, power = 5, fire_color = "red")
-	if(!isturf(epicenter))
-		CRASH("flame_radius used without a valid turf parameter")
-	radius = clamp(radius, 1, 50) //Sanitize inputs
-
-	for(var/turf/turf_to_flame as anything in filled_turfs(epicenter, radius, "circle"))
-		turf_to_flame.IgniteTurf(power, fire_color)