Merge remote-tracking branch 'upstream/master' into more-fluff-things

code/__DEFINES/layers.dm

@@ -11,6 +11,9 @@
 
 //#define AREA_LAYER 1
 
+#define DISPLACEMENT_PLATE_RENDER_LAYER 1
+#define DISPLACEMENT_PLATE_RENDER_TARGET "*DISPLACEMENT_PLATE_RENDER_TARGET"
+
 #define UNDER_TURF_LAYER 1.99
 
 #define TURF_LAYER 2

code/__DEFINES/sounds.dm

@@ -1,6 +1,6 @@
 #define FALLOFF_SOUNDS 1
 
-#define FREE_CHAN_END 1016
+#define FREE_CHAN_END 1014
 #define INITIAL_SOUNDSCAPE_COOLDOWN 20
 
 #define EAR_DEAF_MUTE 1
@@ -21,6 +21,7 @@
 #define ITEM_EQUIP_VOLUME 50
 
 //Reserved channels
+#define SOUND_CHANNEL_TEST 1015
 #define SOUND_CHANNEL_NOTIFY 1016
 #define SOUND_CHANNEL_VOX    1017
 #define SOUND_CHANNEL_MUSIC 1018

code/__HELPERS/icons.dm

@@ -920,8 +920,9 @@ world
 		// From /datum/preferences/proc/copy_appearance_to
 		body.age = original.age
 		body.gender = original.gender
-		body.ethnicity = original.ethnicity
+		body.skin_color = original.skin_color
 		body.body_type = original.body_type
+		body.body_size = original.body_size
 
 		body.r_eyes = original.r_eyes
 		body.g_eyes = original.g_eyes

code/__HELPERS/mobs.dm

@@ -1,11 +1,14 @@
 #define isdeaf(A) (ismob(A) && ((A?:sdisabilities & DISABILITY_DEAF) || A?:ear_deaf))
 #define xeno_hivenumber(A) (isxeno(A) ? A?:hivenumber : FALSE)
 
-/proc/random_ethnicity()
-	return pick(GLOB.ethnicities_list)
+/proc/random_skin_color()
+	return pick(GLOB.skin_color_list)
 
 /proc/random_body_type()
-	return pick(GLOB.body_types_list)
+	return pick(GLOB.body_type_list)
+
+/proc/random_body_size()
+	return pick(GLOB.body_size_list)
 
 /proc/random_hair_style(gender, species = "Human")
 	var/h_style = "Crewcut"

code/__HELPERS/sanitize_values.dm

@@ -45,18 +45,24 @@
 			else return default
 	return default
 
-/proc/sanitize_ethnicity(ethnicity, default = "Western")
-	if (ethnicity in GLOB.ethnicities_list)
-		return ethnicity
+/proc/sanitize_skin_color(skin_color, default = "Pale 2")
+	if(skin_color in GLOB.skin_color_list)
+		return skin_color
 
 	return default
 
-/proc/sanitize_body_type(body_type, default = "Mesomorphic (Average)")
-	if (body_type in GLOB.body_types_list)
+/proc/sanitize_body_type(body_type, default = "Lean")
+	if(body_type in GLOB.body_type_list)
 		return body_type
 
 	return default
 
+/proc/sanitize_body_size(body_size, default = "Average")
+	if(body_size in GLOB.body_size_list)
+		return body_size
+
+	return default
+
 /proc/sanitize_hexcolor(color, default="#000000")
 	if(!istext(color)) return default
 	var/len = length(color)

code/_globalvars/global_lists.dm

@@ -198,10 +198,11 @@ GLOBAL_LIST_INIT(custom_event_info_list, setup_custom_event_info())
 GLOBAL_LIST_INIT(poster_designs, subtypesof(/datum/poster))
 
 //Preferences stuff
-	// Ethnicities
-GLOBAL_REFERENCE_LIST_INDEXED(ethnicities_list, /datum/ethnicity, name) // Stores /datum/ethnicity indexed by name
-	// Body Types
-GLOBAL_REFERENCE_LIST_INDEXED(body_types_list, /datum/body_type, name) // Stores /datum/body_type indexed by name
+	// Skin colors
+GLOBAL_REFERENCE_LIST_INDEXED(skin_color_list, /datum/skin_color, name) // Stores /datum/skin_color indexed by name
+	// Body
+GLOBAL_REFERENCE_LIST_INDEXED(body_type_list, /datum/body_type, name) // Stores /datum/body_type indexed by name
+GLOBAL_REFERENCE_LIST_INDEXED(body_size_list, /datum/body_size, name) // Stores /datum/body_size indexed by name
 	//Hairstyles
 GLOBAL_REFERENCE_LIST_INDEXED(hair_styles_list, /datum/sprite_accessory/hair, name) //stores /datum/sprite_accessory/hair indexed by name
 GLOBAL_REFERENCE_LIST_INDEXED(facial_hair_styles_list, /datum/sprite_accessory/facial_hair, name) //stores /datum/sprite_accessory/facial_hair indexed by name

code/_onclick/hud/rendering/plane_master.dm

@@ -175,3 +175,10 @@
 	plane = ESCAPE_MENU_PLANE
 	appearance_flags = PLANE_MASTER|NO_CLIENT_COLOR
 	render_relay_plane = RENDER_PLANE_MASTER
+
+/atom/movable/screen/plane_master/displacement
+	name = "displacement plane"
+	mouse_opacity = MOUSE_OPACITY_TRANSPARENT
+	plane = DISPLACEMENT_PLATE_RENDER_LAYER
+	render_target = DISPLACEMENT_PLATE_RENDER_TARGET
+	render_relay_plane = null

code/_onclick/hud/rendering/render_plate.dm

@@ -39,6 +39,10 @@
 	plane = RENDER_PLANE_GAME
 	render_relay_plane = RENDER_PLANE_MASTER
 
+/atom/movable/screen/plane_master/rendering_plate/game_world/Initialize(mapload, datum/hud/hud_owner)
+	. = ..()
+	add_filter("displacer", 1, displacement_map_filter(render_source = DISPLACEMENT_PLATE_RENDER_TARGET, size = 10))
+
 ///render plate for OOC stuff like ghosts, hud-screen effects, etc
 /atom/movable/screen/plane_master/rendering_plate/non_game
 	name = "non-game rendering plate"

code/datums/autocells/explosion.dm

@@ -282,6 +282,9 @@ as having entered the turf.
 	if(QDELETED(E))
 		return
 
+	if(power >= 150) //shockwave for anything over 150 power
+		new /obj/effect/shockwave(epicenter, power/60)
+
 	E.power = power
 	E.power_falloff = falloff
 	E.falloff_shape = falloff_shape

code/datums/datacore.dm

@@ -355,31 +355,38 @@ GLOBAL_DATUM_INIT(data_core, /datum/datacore, new)
 	var/icon/icobase = H.species.icobase
 	var/icon/temp
 
-	var/datum/ethnicity/ET = GLOB.ethnicities_list[H.ethnicity]
-	var/datum/body_type/B = GLOB.body_types_list[H.body_type]
+	var/datum/skin_color/set_skin_color = GLOB.skin_color_list[H.skin_color]
+	var/datum/body_type/set_body_type = GLOB.body_type_list[H.body_type]
+	var/datum/body_size/set_body_size = GLOB.body_size_list[H.body_size]
 
-	var/e_icon
-	var/b_icon
+	var/skin_color_icon
+	var/body_type_icon
+	var/body_size_icon
 
-	if (!ET)
-		e_icon = "western"
+	if(!set_skin_color)
+		skin_color_icon = "pale2"
 	else
-		e_icon = ET.icon_name
+		skin_color_icon = set_skin_color.icon_name
 
-	if (!B)
-		b_icon = "mesomorphic"
+	if(!set_body_type)
+		body_type_icon = "lean"
 	else
-		b_icon = B.icon_name
+		body_type_icon = set_body_type.icon_name
 
-	preview_icon = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "torso", e_icon))
-	temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "groin", e_icon))
+	if(!set_body_size)
+		body_size_icon = "avg"
+	else
+		body_size_icon = set_body_size.icon_name
+
+	preview_icon = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "torso", skin_color_icon))
+	temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "groin", skin_color_icon))
 	preview_icon.Blend(temp, ICON_OVERLAY)
-	temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, "head", e_icon))
+	temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, "head", skin_color_icon))
 	preview_icon.Blend(temp, ICON_OVERLAY)
 
 	for(var/obj/limb/E in H.limbs)
 		if(E.status & LIMB_DESTROYED) continue
-		temp = new /icon(icobase, get_limb_icon_name(H.species, b_icon, H.gender, E.name, e_icon))
+		temp = new /icon(icobase, get_limb_icon_name(H.species, body_size_icon, body_type_icon, H.gender, E.name, skin_color_icon))
 		if(E.status & LIMB_ROBOT)
 			temp.MapColors(rgb(77,77,77), rgb(150,150,150), rgb(28,28,28), rgb(0,0,0))
 		preview_icon.Blend(temp, ICON_OVERLAY)

code/datums/keybinding/mob.dm

@@ -2,16 +2,6 @@
 	category = CATEGORY_HUMAN
 	weight = WEIGHT_MOB
 
-/datum/keybinding/mob/down(client/user)
-	. = ..()
-	if(isobserver(user.mob))
-		return TRUE
-
-/datum/keybinding/mob/up(client/user)
-	. = ..()
-	if(isobserver(user.mob))
-		return TRUE
-
 /datum/keybinding/mob/stop_pulling
 	hotkey_keys = list("H", "Delete")
 	classic_keys = list("Delete")

code/datums/skills/uscm.dm

@@ -8,6 +8,10 @@ United States Colonial Marines
 	name = "Private"
 	//same as default
 
+/datum/skills/pfc/recon
+	name = "Recon Private"
+	skills = list(SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED)
+
 /datum/skills/combat_medic
 	name = "Combat Medic"
 	skills = list(
@@ -16,6 +20,15 @@ United States Colonial Marines
 		SKILL_JTAC = SKILL_JTAC_BEGINNER,
 	)
 
+/datum/skills/combat_medic/recon
+	name = "Recon Medic"
+	skills = list(
+		SKILL_MEDICAL = SKILL_MEDICAL_MEDIC,
+		SKILL_SURGERY = SKILL_SURGERY_NOVICE,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+	)
+
 /datum/skills/combat_engineer
 	name = "Combat Engineer"
 	skills = list(
@@ -32,6 +45,16 @@ United States Colonial Marines
 		SKILL_JTAC = SKILL_JTAC_BEGINNER,
 	)
 
+/datum/skills/smartgunner/recon
+	name = "Recon Smartgunner"
+	skills = list(
+		SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN,
+		SKILL_JTAC = SKILL_JTAC_BEGINNER,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+	)
+
+
+
 /datum/skills/specialist
 	name = "Squad Weapons Specialist"
 	skills = list(
@@ -51,6 +74,15 @@ United States Colonial Marines
 		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
 	)
 
+/datum/skills/tl/recon
+	name = "Recon Fireteam Leader"
+	skills = list(
+		SKILL_JTAC = SKILL_JTAC_TRAINED,
+		SKILL_LEADERSHIP = SKILL_LEAD_TRAINED,
+		SKILL_ENDURANCE = SKILL_ENDURANCE_TRAINED,
+	)
+
+
 /datum/skills/SL
 	name = "Squad Leader"
 	skills = list(

code/datums/soundOutput.dm

@@ -13,14 +13,16 @@
 	. = ..()
 
 /datum/soundOutput/proc/process_sound(datum/sound_template/T)
-	var/sound/S = sound(T.file, T.wait, T.repeat)
+	var/sound/S = sound(T.file, T.repeat, T.wait)
 	S.volume = owner.volume_preferences[T.volume_cat] * T.volume
 	if(T.channel == 0)
 		S.channel = get_free_channel()
 	else
 		S.channel = T.channel
 	S.frequency = T.frequency
 	S.falloff = T.falloff
+	S.offset = T.offset
+	S.pitch = T.pitch
 	S.status = T.status
 	S.echo = T.echo
 	if(T.x && T.y && T.z)

code/datums/vehicles.dm

@@ -42,6 +42,10 @@
 	name = "Tank"
 	interior_id = "tank"
 
+/datum/map_template/interior/aev
+	name = "AEV"
+	interior_id = "aev"
+
 /datum/map_template/interior/van
 	name = "Van"
 	interior_id = "van"

code/defines/procs/records.dm

@@ -6,7 +6,7 @@
 	G.fields["real_rank"] = "Unassigned"
 	G.fields["sex"] = "Male"
 	G.fields["age"] = "Unknown"
-	G.fields["ethnicity"] = "Unknown"
+	G.fields["skin_color"] = "Unknown"
 	G.fields["p_stat"] = "Active"
 	G.fields["m_stat"] = "Stable"
 	G.fields["species"] = "Human"

code/game/machinery/vending/vendor_types/medical.dm

@@ -165,6 +165,7 @@
 		list("Pill Bottle (Kelotane)", round(scale * 3), /obj/item/storage/pill_bottle/kelotane, VENDOR_ITEM_REGULAR),
 		list("Pill Bottle (Peridaxon)", round(scale * 2), /obj/item/storage/pill_bottle/peridaxon, VENDOR_ITEM_REGULAR),
 		list("Pill Bottle (Tramadol)", round(scale * 3), /obj/item/storage/pill_bottle/tramadol, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Tricordazine)", round(scale * 3), /obj/item/storage/pill_bottle/tricord, VENDOR_ITEM_REGULAR),
 
 		list("MEDICAL UTILITIES", -1, null, null),
 		list("Surgical Line", round(scale * 2), /obj/item/tool/surgery/surgical_line, VENDOR_ITEM_REGULAR),

code/game/machinery/vending/vendor_types/squad_prep/squad_medic.dm

@@ -157,7 +157,6 @@ GLOBAL_LIST_INIT(cm_vending_clothing_medic, list(
 		list("Pressurized Reagent Canister Pouch (Bicaridine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/bicaridine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pressurized Reagent Canister Pouch (Kelotane)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/kelotane, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pressurized Reagent Canister Pouch (Tricordrazine)", 0, /obj/item/storage/pouch/pressurized_reagent_canister/tricordrazine, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
-		list("Pressurized Reagent Canister Pouch (EMPTY)", 0, /obj/item/storage/pouch/pressurized_reagent_canister, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_RECOMMENDED),
 		list("Pistol Pouch", 0, /obj/item/storage/pouch/pistol, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
 		list("Vial Pouch (Full)", 0, /obj/item/storage/pouch/vials/full, MARINE_CAN_BUY_POUCH, VENDOR_ITEM_REGULAR),
 
@@ -336,3 +335,33 @@ GLOBAL_LIST_INIT(cm_vending_clothing_forecon_medic, list(
 
 /obj/structure/machinery/cm_vending/clothing/medic/forecon/get_listed_products(mob/user)
 	return GLOB.cm_vending_clothing_forecon_medic
+
+
+// Chemical vendor
+
+GLOBAL_LIST_INIT(cm_vending_chemical_medic, list(
+		list("PILL BOTTLES", 0, null, null, null),
+		list("Pill Bottle (Imidazoline-Alkysine)", 40, /obj/item/storage/pill_bottle/imialk, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Meralyne-Bicardine)", 40, /obj/item/storage/pill_bottle/merabica, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Kelotane-Dermaline)", 40, /obj/item/storage/pill_bottle/keloderm, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Nitrogen-Water)", 40, /obj/item/storage/pill_bottle/nitrogenwater, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Dexalin+)", 40, /obj/item/storage/pill_bottle/dexalinplus, null, VENDOR_ITEM_REGULAR),
+		list("Pill Bottle (Iron)", 40, /obj/item/storage/pill_bottle/iron, null, VENDOR_ITEM_REGULAR),
+	))
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical
+	name = "\improper ColMarTech Squad Medical Chemical Rack"
+	desc = "An automated gear rack for specialized chemicals for the hospital corpsman."
+	icon_state = "med_chem"
+	show_points = TRUE
+	use_snowflake_points = TRUE
+	vendor_role = list(JOB_SQUAD_MEDIC)
+	req_access = list(ACCESS_MARINE_MEDPREP)
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical/get_listed_products(mob/user)
+	return GLOB.cm_vending_chemical_medic
+
+/obj/structure/machinery/cm_vending/gear/medic_chemical/upp
+	name = "\improper UnTech Squad Medical Equipment Rack"
+	req_access = list(ACCESS_UPP_MEDPREP)
+	vendor_theme = VENDOR_THEME_UPP

code/game/objects/effects/temporary_visuals.dm

@@ -96,3 +96,25 @@
 	splatter_type = "csplatter"
 	color = BLOOD_COLOR_SYNTHETIC
 
+//------------------------------------------
+//Shockwaves
+//------------------------------------------
+
+/obj/effect/shockwave
+	icon = 'icons/effects/light_overlays/shockwave.dmi'
+	icon_state = "shockwave"
+	plane = DISPLACEMENT_PLATE_RENDER_LAYER
+	pixel_x = -496
+	pixel_y = -496
+
+/obj/effect/shockwave/Initialize(mapload, radius, speed, easing_type = LINEAR_EASING, y_offset, x_offset)
+	. = ..()
+	if(!speed)
+		speed = 1
+	if(y_offset)
+		pixel_y += y_offset
+	if(x_offset)
+		pixel_x += x_offset
+	QDEL_IN(src, 0.5 * radius * speed)
+	transform = matrix().Scale(32 / 1024, 32 / 1024)
+	animate(src, time = 0.5 * radius * speed, transform=matrix().Scale((32 / 1024) * radius * 1.5, (32 / 1024) * radius * 1.5), easing = easing_type)

code/game/objects/items/pamphlets.dm

@@ -200,7 +200,7 @@
 		to_chat(user, SPAN_WARNING("You know this already!"))
 		return FALSE
 
-	if(user.job != JOB_SQUAD_MARINE)
+	if(!(user.job in JOB_SQUAD_ROLES_LIST))
 		to_chat(user, SPAN_WARNING("Only squad riflemen can use this."))
 		return FALSE