Minor fixes across the board (#1244)

Minor fixes HUGE fix
vlggms · Aug 18, 2023 · 60a1ab1 · 60a1ab1
1 parent fdccb21
commit 60a1ab1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/he/shelter.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/he/shelter.dm
@@ -148,6 +148,7 @@
 	icon_state = "transparent"
 	layer = TURF_LAYER
 	anchored = TRUE
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/effect/shelter_forcefield/Crossed(atom/movable/M)
 	. = ..()

diff --git a/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm b/code/modules/mob/living/simple_animal/abnormality/_tools/zayin/realizer.dm
@@ -30,6 +30,7 @@
 		/obj/item/clothing/suit/armor/ego_gear/waw/lamp 			= /obj/item/clothing/suit/armor/ego_gear/realization/eyes,
 		/obj/item/clothing/suit/armor/ego_gear/waw/oppression 		= /obj/item/clothing/suit/armor/ego_gear/realization/cruelty,
 		/obj/item/clothing/suit/armor/ego_gear/waw/executive 		= /obj/item/clothing/suit/armor/ego_gear/realization/capitalism,
+		/obj/item/clothing/suit/armor/ego_gear/waw/thirteen			= /obj/item/clothing/suit/armor/ego_gear/realization/bell_tolls,
 		// ALEPH
 		/obj/item/clothing/suit/armor/ego_gear/aleph/da_capo 		= /obj/item/clothing/suit/armor/ego_gear/realization/alcoda,
 		/obj/item/clothing/suit/armor/ego_gear/aleph/justitia 		= /obj/item/clothing/suit/armor/ego_gear/realization/head,

diff --git a/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm b/code/modules/mob/living/simple_animal/abnormality/aleph/seasons.dm
@@ -167,6 +167,7 @@
 	var/list/new_work_chances = modular_work_chance[current_season]
 	var/list/new_damage_coeff = modular_damage_coeff[current_season]
 	work_chances = new_work_chances.Copy()
+	datum_reference.available_work = work_chances
 	damage_coeff = new_damage_coeff.Copy()
 	work_damage_type = season_stats[current_season][2]
 	armortype = season_stats[current_season][2]
@@ -423,18 +424,20 @@
 	if(H.stat >= HARD_CRIT || H.health < 0)
 		switch(current_season)
 			if("summer")
+				H.adjustBruteLoss(H.maxHealth)
 				H.Drain()
 				H.adjust_fire_stacks(30)
 				H.IgniteMob()
 			if("fall")
+				H.adjustBruteLoss(H.maxHealth)
 				H.Drain()
 			if("winter") //turn them into an ice cube
 				if(HAS_TRAIT(H, TRAIT_HUSK))
 					return FALSE
-				H.Drain()
 				var/cube = icon('icons/effects/freeze.dmi', "ice_cube")
 				H.add_overlay(cube)
-				return FALSE
+				H.adjustBruteLoss(H.maxHealth)
+				H.Drain()
 		return TRUE
 	return FALSE
 
@@ -692,6 +695,7 @@
 	desc = "Looks like the terrain is being shifted by an abnormality."
 	layer = LYING_MOB_LAYER
 	alpha = 100
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/effect/season_warn/Initialize()
 	. = ..()
@@ -761,6 +765,7 @@
 	icon_state = "vinespike"
 
 /obj/effect/season_effect/breath //subtype of season_effect that spawns turf way less often, for "breath" attacks that cover a lot of ground. also looks different.
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
 
 /obj/effect/season_effect/breath/pop()
 	if(prob(75))

diff --git a/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm b/code/modules/mob/living/simple_animal/abnormality/he/puss_in_boots.dm
@@ -68,7 +68,7 @@
 	if(!IsContained(src))
 		return
 	if(user.stat != DEAD && !blessed_human && istype(user))
-		if(get_user_level(user) > 2)
+		if(get_user_level(user) >= 2)
 			say("I cannot teach you anything, human.")
 			return
 		blessed_human = user
@@ -129,7 +129,7 @@
 	if(!blessed_human)
 		return
 
-	if(get_user_level(blessed_human) > 2) //no buffing to get ahead
+	if(get_user_level(blessed_human) >= 2) //no buffing to get ahead
 		BlessedDeath(blessed_human)
 		return