Merge pull request #30895 from Spookerton/spkrtn/cng/pig-sells

everything pixel scales, humans can have sizes
Project-Wildflower · Jul 3, 2021 · 245217c · 245217c
2 parents eee9da6 + 68e5413
commit 245217c
Show file tree

Hide file tree

Showing 44 changed files with 101 additions and 60 deletions.
diff --git a/code/__defines/_planes+layers.dm b/code/__defines/_planes+layers.dm
@@ -192,8 +192,15 @@ What is the naming convention for planes or layers?
 //This is difference between planes used for atoms and effects
 #define PLANE_DIFFERENCE              3
 
-/atom
-	plane = DEFAULT_PLANE
+
+/atom/plane = DEFAULT_PLANE
+
+#define DEFAULT_APPEARANCE_FLAGS (PIXEL_SCALE)
+
+/atom/appearance_flags = DEFAULT_APPEARANCE_FLAGS
+/image/appearance_flags = DEFAULT_APPEARANCE_FLAGS
+/mutable_appearance/appearance_flags = DEFAULT_APPEARANCE_FLAGS //Inherits /image but re docs, subject to change
+
 
 /image/proc/plating_decal_layerise()
 	plane = DEFAULT_PLANE
@@ -216,7 +223,7 @@ What is the naming convention for planes or layers?
 */
 
 /obj/screen/plane_master
-	appearance_flags = PLANE_MASTER
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | PLANE_MASTER
 	screen_loc = "CENTER,CENTER"
 	globalscreen = 1
 
@@ -226,7 +233,7 @@ What is the naming convention for planes or layers?
 /obj/screen/plane_master/ghost_dummy
 	// this avoids a bug which means plane masters which have nothing to control get angry and mess with the other plane masters out of spite
 	alpha = 0
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	plane = OBSERVER_PLANE
 
 GLOBAL_LIST_INIT(ghost_master, list(

diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm
@@ -11,7 +11,7 @@
 	icon = 'icons/mob/screen1.dmi'
 	plane = HUD_PLANE
 	layer = HUD_BASE_LAYER
-	appearance_flags = NO_CLIENT_COLOR
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | NO_CLIENT_COLOR
 	unacidable = TRUE
 	var/obj/master = null    //A reference to the object in the slot. Grabs or items, generally.
 	var/globalscreen = FALSE //Global screens are not qdeled when the holding mob is destroyed.

diff --git a/code/controllers/subsystems/skybox.dm b/code/controllers/subsystems/skybox.dm
@@ -50,7 +50,6 @@ SUBSYSTEM_DEF(skybox)
 
 /datum/controller/subsystem/skybox/proc/generate_skybox(z)
 	var/image/res = image(skybox_icon)
-	res.appearance_flags = KEEP_TOGETHER
 
 	var/image/base = overlay_image(skybox_icon, background_icon, background_color)
 
@@ -68,7 +67,7 @@ SUBSYSTEM_DEF(skybox)
 			for(var/obj/effect/overmap/visitable/other in O.loc)
 				if(other != O)
 					overmap.overlays += other.get_skybox_representation()
-			overmap.appearance_flags = RESET_COLOR
+			overmap.appearance_flags |= RESET_COLOR
 			res.overlays += overmap
 
 	for(var/datum/event/E in SSevent.active_events)

diff --git a/code/datums/mutable_appearance.dm b/code/datums/mutable_appearance.dm
@@ -5,7 +5,7 @@
 // Mutable appearances are children of images, just so you know.
 
 // Helper similar to image()
-/proc/mutable_appearance(icon, icon_state, color, flags = RESET_COLOR | RESET_ALPHA, plane = FLOAT_PLANE, layer = FLOAT_LAYER)
+/proc/mutable_appearance(icon, icon_state, color, flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR | RESET_ALPHA, plane = FLOAT_PLANE, layer = FLOAT_LAYER)
 	var/mutable_appearance/MA = new()
 	MA.icon = icon
 	MA.icon_state = icon_state

diff --git a/code/datums/progressbar.dm b/code/datums/progressbar.dm
@@ -29,7 +29,7 @@
 	if (!visible)
 		return
 	bar = image('icons/effects/progessbar.dmi', actee, "prog_bar_0", HUD_ABOVE_ITEM_LAYER)
-	bar.appearance_flags = APPEARANCE_UI_IGNORE_ALPHA
+	bar.appearance_flags = DEFAULT_APPEARANCE_FLAGS | APPEARANCE_UI_IGNORE_ALPHA
 	bar.pixel_y = WORLD_ICON_SIZE
 	bar.plane = HUD_PLANE
 

diff --git a/code/datums/repositories/images.dm b/code/datums/repositories/images.dm
@@ -50,7 +50,7 @@
 		if(!isnull(alpha))
 			I.alpha = alpha
 		if(!isnull(appearance_flags))
-			I.appearance_flags = appearance_flags
+			I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | appearance_flags
 		if(!isnull(plane))
 			I.plane = plane
 		if(!isnull(layer))

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
@@ -1,7 +1,7 @@
 /atom/movable
 	layer = OBJ_LAYER
 
-	appearance_flags = TILE_BOUND
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | TILE_BOUND
 	glide_size = 8
 
 	var/waterproof = TRUE

diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -16,7 +16,7 @@
 	welded_file = 'icons/obj/doors/double/welded.dmi'
 	emag_file = 'icons/obj/doors/double/emag.dmi'
 	width = 2
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	opacity = 1
 	assembly_type = /obj/structure/door_assembly/multi_tile
 

diff --git a/code/game/machinery/kitchen/cookers.dm b/code/game/machinery/kitchen/cookers.dm
@@ -217,7 +217,7 @@
 	result.filling_color = BlendRGB(source.color || "#ffffff", result.color || "#ffffff", 0.5)
 	if (result.type != /obj/item/reagent_containers/food/snacks/variable && istype(result, /obj/item/reagent_containers/food/snacks/variable))
 		var/image/I = image(result.icon, result, "[result.icon_state]_filling")
-		I.appearance_flags = RESET_COLOR
+		I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 		I.color = result.filling_color
 		result.overlays += I
 

diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -16,7 +16,7 @@ var/global/list/image/splatter_cache=list()
 	blood_DNA = list()
 	generic_filth = TRUE
 	persistent = TRUE
-	appearance_flags = NO_CLIENT_COLOR
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | NO_CLIENT_COLOR
 	cleanable_scent = "blood"
 	scent_descriptor = SCENT_DESC_ODOR
 

diff --git a/code/game/objects/items/cryobag.dm b/code/game/objects/items/cryobag.dm
@@ -56,7 +56,7 @@
 	..()
 	overlays.Cut()
 	var/image/I = image(icon, "indicator[opened]")
-	I.appearance_flags = RESET_COLOR
+	I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 	var/maxstasis = initial(stasis_power)
 	if(stasis_power > 0.5 * maxstasis)
 		I.color = COLOR_LIME

diff --git a/code/game/objects/items/devices/slide_projector.dm b/code/game/objects/items/devices/slide_projector.dm
@@ -170,7 +170,7 @@
 	var/mutable_appearance/MA = new(I)
 	MA.plane = FLOAT_PLANE
 	MA.layer = FLOAT_LAYER
-	MA.appearance_flags = RESET_ALPHA
+	MA.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_ALPHA
 	MA.alpha = 170
 	MA.pixel_x = 0
 	MA.pixel_y = 0

diff --git a/code/game/objects/items/devices/t_scanner.dm b/code/game/objects/items/devices/t_scanner.dm
@@ -89,7 +89,7 @@
 		var/image/I = image(loc = scanned, icon = scanned.icon, icon_state = scanned.icon_state)
 		I.plane = HUD_PLANE
 		I.layer = UNDER_HUD_LAYER
-		I.appearance_flags = RESET_ALPHA
+		I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_ALPHA
 
 		//Pipes are special
 		if(istype(scanned, /obj/machinery/atmospherics/pipe))

diff --git a/code/game/objects/items/weapons/material/material_weapons.dm b/code/game/objects/items/weapons/material/material_weapons.dm
@@ -86,7 +86,7 @@
 		alpha = 100 + material.opacity * 255
 	if(furniture_icon)
 		var/image/I = image(icon, icon_state = furniture_icon)
-		I.appearance_flags = RESET_COLOR
+		I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 		overlays += I
 
 /obj/item/material/Destroy()

diff --git a/code/game/objects/items/weapons/policetape.dm b/code/game/objects/items/weapons/policetape.dm
@@ -151,7 +151,7 @@ var/list/tape_roll_applications = list()
 /obj/item/taperoll/on_update_icon()
 	overlays.Cut()
 	var/image/overlay = image(icon = src.icon)
-	overlay.appearance_flags = RESET_COLOR
+	overlay.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 	if(ismob(loc))
 		if(!start)
 			overlay.icon_state = "start"

diff --git a/code/game/objects/items/weapons/storage/med_pouch.dm b/code/game/objects/items/weapons/storage/med_pouch.dm
@@ -40,7 +40,7 @@ Single Use Emergency Pouches
 	overlays.Cut()
 	if(!cross_overlay)
 		cross_overlay = image(icon, "cross")
-		cross_overlay.appearance_flags = RESET_COLOR
+		cross_overlay.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 	overlays += cross_overlay
 	icon_state = "pack[opened]"
 

diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
@@ -78,7 +78,7 @@
 		if(("id-"+front_id.icon_state) in icon_states(icon))
 			tiny_state = "id-"+front_id.icon_state
 		var/image/tiny_image = new/image(icon, icon_state = tiny_state)
-		tiny_image.appearance_flags = RESET_COLOR
+		tiny_image.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 		overlays += tiny_image
 
 /obj/item/storage/wallet/GetIdCard()

diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
@@ -2,7 +2,7 @@
 	desc = "A jumbo-sized LED sign. This one seems to be showing its age."
 	icon = 'icons/obj/barsigns.dmi'
 	icon_state = "empty"
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 	anchored = TRUE
 	var/cult = 0
 

diff --git a/code/game/objects/structures/rubble.dm b/code/game/objects/structures/rubble.dm
@@ -3,7 +3,7 @@
 	desc = "One man's garbage is another man's treasure."
 	icon = 'icons/obj/rubble.dmi'
 	icon_state = "base"
-	appearance_flags = PIXEL_SCALE
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | PIXEL_SCALE
 	opacity = 1
 	density = TRUE
 	anchored = TRUE
@@ -36,7 +36,7 @@
 				I.color = initial(A.color)
 			if(!lootleft)
 				I.color = "#54362e"
-		I.appearance_flags = PIXEL_SCALE
+		I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | PIXEL_SCALE
 		I.pixel_x = rand(-16,16)
 		I.pixel_y = rand(-16,16)
 		var/matrix/M = matrix()

diff --git a/code/game/turfs/flooring/flooring_decals.dm b/code/game/turfs/flooring/flooring_decals.dm
@@ -7,7 +7,7 @@ var/list/floor_decals = list()
 	name = "floor decal"
 	icon = 'icons/turf/flooring/decals.dmi'
 	layer = DECAL_LAYER
-	appearance_flags = RESET_COLOR
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 	var/supplied_dir
 	var/detail_overlay
 	var/detail_color
@@ -28,7 +28,7 @@ var/list/floor_decals = list()
 		if(!floor_decals[cache_key])
 			var/image/I = image(icon = src.icon, icon_state = src.icon_state, dir = src.dir)
 			I.layer = layer
-			I.appearance_flags = appearance_flags
+			I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | appearance_flags
 			I.color = src.color
 			I.alpha = src.alpha
 			if(detail_overlay)
@@ -1149,7 +1149,7 @@ var/list/floor_decals = list()
 	layer = TURF_DETAIL_LAYER
 	color = COLOR_GUNMETAL
 	icon_state = "manydot"
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 
 /obj/effect/floor_decal/floordetail/New(var/newloc, var/newdir, var/newcolour)
 	color = null //color is here just for map preview, if left it applies both our and tile colors.
@@ -1345,4 +1345,4 @@ var/list/floor_decals = list()
 	icon_state = "stoneborder"
 
 /obj/effect/floor_decal/stoneborder/corner
-	icon_state = "stoneborder_c"
+	icon_state = "stoneborder_c"
diff --git a/code/game/turfs/turf_ao.dm b/code/game/turfs/turf_ao.dm
@@ -35,7 +35,7 @@
 	var/image/I = image('icons/turf/flooring/shadows.dmi', cstr, dir = 1 << (i-1))
 	I.alpha = WALL_AO_ALPHA
 	I.blend_mode = BLEND_OVERLAY
-	I.appearance_flags = RESET_ALPHA|RESET_COLOR|TILE_BOUND
+	I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_ALPHA|RESET_COLOR|TILE_BOUND
 	I.layer = AO_LAYER
 	// If there's an offset, counteract it.
 	if (px || py || pz || pw)

diff --git a/code/modules/admin/buildmode/_overlay.dm b/code/modules/admin/buildmode/_overlay.dm
@@ -18,7 +18,7 @@
 			M.icon = 'icons/turf/overlays.dmi'
 			M.icon_state = icon_state
 			M.screen_loc = "CENTER[x < 0 ? "-" : "+"][abs(x)],CENTER[y < 0 ? "-" : "+"][abs(y)]"
-			M.appearance_flags = KEEP_APART|RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM|NO_CLIENT_COLOR|TILE_BOUND
+			M.appearance_flags = DEFAULT_APPEARANCE_FLAGS | KEEP_APART|RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM|NO_CLIENT_COLOR|TILE_BOUND
 			display_atoms += M
 	. = ..()
 

diff --git a/code/modules/admin/holoverbs.dm b/code/modules/admin/holoverbs.dm
@@ -38,7 +38,7 @@
 	var/image/I2 = image(null)
 	I2.underlays += I
 	I2.overlays += scan
-	I2.appearance_flags = KEEP_TOGETHER
+	I2.appearance_flags = DEFAULT_APPEARANCE_FLAGS | KEEP_TOGETHER
 	I2.color = rgb(125, 180, 225) // make it blue!
 	AI.holo_icon = I2
 

diff --git a/code/modules/client/preference_setup/general/02_body.dm b/code/modules/client/preference_setup/general/02_body.dm
@@ -323,7 +323,7 @@ var/global/list/valid_bloodtypes = list("A+", "A-", "B+", "B-", "AB+", "AB-", "O
 				var/choice = input("Please select a descriptor.", "Descriptor") as null|anything in descriptor.chargen_value_descriptors
 				if(choice && mob_species.descriptors[desc_id]) // Check in case they sneakily changed species.
 					pref.body_descriptors[desc_id] = descriptor.chargen_value_descriptors[choice]
-					return TOPIC_REFRESH
+					return TOPIC_REFRESH_UPDATE_PREVIEW
 
 	else if(href_list["blood_type"])
 		var/new_b_type = input(user, "Choose your character's blood-type:", CHARACTER_PREFERENCE_INPUT_TITLE) as null|anything in valid_bloodtypes

diff --git a/code/modules/hydroponics/seed.dm b/code/modules/hydroponics/seed.dm
@@ -858,7 +858,7 @@
 	if(leaves)
 		var/image/I = image(res.icon, "[plant_icon]-[growth_stage]-leaves")
 		I.color = leaves
-		I.appearance_flags = RESET_COLOR
+		I.appearance_flags = DEFAULT_APPEARANCE_FLAGS | RESET_COLOR
 		res.overlays += I
 
 	return res
diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm
@@ -12,7 +12,7 @@
 	icon_state = "light1"
 	blend_mode = BLEND_OVERLAY
 
-	appearance_flags = 0
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS
 
 	var/lum_r = 0
 	var/lum_g = 0

diff --git a/code/modules/lighting/lighting_planemaster.dm b/code/modules/lighting/lighting_planemaster.dm
@@ -3,7 +3,7 @@
 	plane = LIGHTING_PLANE
 
 	blend_mode = BLEND_MULTIPLY
-	appearance_flags = PLANE_MASTER | NO_CLIENT_COLOR
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | PLANE_MASTER | NO_CLIENT_COLOR
 	// use 20% ambient lighting; be sure to add full alpha
 
 	color = list(

diff --git a/code/modules/mob/living/carbon/alien/diona/gestalt/_gestalt.dm b/code/modules/mob/living/carbon/alien/diona/gestalt/_gestalt.dm
@@ -7,7 +7,7 @@
 	opacity = FALSE
 	anchored = FALSE
 	movement_handlers = list(/datum/movement_handler/deny_multiz, /datum/movement_handler/delay = list(5))
-	appearance_flags = PIXEL_SCALE
+	appearance_flags = DEFAULT_APPEARANCE_FLAGS | PIXEL_SCALE
 
 	var/list/nymphs                  = list()
 	var/list/valid_things_to_roll_up = list(/mob/living/carbon/alien/diona = TRUE, /mob/living/carbon/alien/diona/sterile = TRUE)

diff --git a/code/modules/mob/living/carbon/human/descriptors/descriptors_generic.dm b/code/modules/mob/living/carbon/human/descriptors/descriptors_generic.dm
@@ -20,6 +20,9 @@
 		"much taller than you",
 		"towering over you"
 		)
+	var/list/scale_effect = list(
+		SPECIES_HUMAN = list(-7, -4, 0, 4, 7)
+	)
 
 /datum/mob_descriptor/build
 	name = "build"
@@ -43,3 +46,6 @@
 		"built much larger than you",
 		"dwarfing you"
 		)
+	var/list/scale_effect = list(
+		SPECIES_HUMAN = list(-7.5, 0, 0, 0, 7.5)
+	)