Merge pull request HearthOfHestia#220 from MarinaGryphon/hearthfixes/…

…prelaunch Pre-launch hotfixes
ss220-space · Feb 3, 2022 · c989516 · c989516
2 parents de6699d + af2ebb0
commit c989516
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/code/_onclick/hud/fullscreen.dm b/code/_onclick/hud/fullscreen.dm
@@ -25,9 +25,9 @@
 	screen.transform = null
 	if(screen && client)
 		if(screen.screen_loc != ui_entire_screen)
-			if(max(client.last_view_x_dim, client.last_view_y_dim) > 7)
+			if(max(client.last_view_x_dim, client.last_view_y_dim) > 15)
 				var/matrix/M = matrix()
-				M.Scale(CEILING(client.last_view_x_dim/7),CEILING(client.last_view_y_dim/7))
+				M.Scale(client.last_view_x_dim/15,client.last_view_y_dim/15)
 				screen.transform = M
 		if(stat != DEAD || screen.allstate)
 			client.screen += screen
@@ -70,9 +70,9 @@
 		for(var/category in screens)
 			var/obj/screen/fullscreen/screen = screens[category]
 			screen.transform = null
-			if(screen.screen_loc != ui_entire_screen && largest_bound > 7)
+			if(screen.screen_loc != ui_entire_screen && largest_bound > 15)
 				var/matrix/M = matrix()
-				M.Scale(CEILING(client.last_view_x_dim/7), CEILING(client.last_view_y_dim/7))
+				M.Scale(client.last_view_x_dim/15, client.last_view_y_dim/15)
 				screen.transform = M
 			client.screen |= screen
 

diff --git a/code/datums/outfits/equipment/survival_box.dm b/code/datums/outfits/equipment/survival_box.dm
@@ -2,7 +2,7 @@ var/global/list/survival_box_choices = list()
 
 /decl/survival_box_option
 	var/name = "survival kit"
-	var/box_type = /obj/item/storage/box
+	var/box_type = /obj/item/storage/box/survival
 
 /decl/survival_box_option/Initialize()
 	. = ..()

diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
@@ -68,7 +68,7 @@
 	..()
 	foldable = null //special form fitted boxes should not be foldable.
 
-/obj/item/storage/box/survival/
+/obj/item/storage/box/survival
 	name = "crew survival kit"
 	desc = "A box decorated in warning colors that contains a limited supply of survival tools. The panel and white stripe indicate this one contains oxygen."
 	icon_state = "survival"

diff --git a/code/modules/organs/pain.dm b/code/modules/organs/pain.dm
@@ -1,9 +1,9 @@
 /mob/proc/flash_pain(var/target)
 	if(pain)
 		var/matrix/M
-		if(client && max(client.last_view_x_dim, client.last_view_y_dim) > 7)
+		if(client && max(client.last_view_x_dim, client.last_view_y_dim) > 15)
 			M = matrix()
-			M.Scale(CEILING(client.last_view_x_dim/7), CEILING(client.last_view_y_dim/7))
+			M.Scale(client.last_view_x_dim/15, client.last_view_y_dim/15)
 		pain.transform = M
 		animate(pain, alpha = target, time = 15, easing = ELASTIC_EASING)
 		animate(pain, alpha = 0, time = 20)