Yet Another PR To Fix Various CI Failures (#14420)

* Fixed mech CI not working (thanks safeties)

* Fixes consistent jumpsuits not working for the prefs menu

* Oops forgot to commit this

* We lost this from #10050, now they're grey again

* Fixes point-blank ballistic shots, fixing mech CI that way

* Adds the screenshot icons for our antags

* Adds a bunch of screenshots for all of our species (yes they're ugly but we'll fix them later)

* I Love Merge Conflict Markers

_maps/map_files/Deltastation/DeltaStation2.dmm

@@ -31342,25 +31342,6 @@
 /turf/open/floor/iron,
 /area/station/hallway/primary/central/fore)
 "iEV" = (
-/obj/structure/table/wood,
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_x = -3;
-	pixel_y = 15
-	},
-/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
-	pixel_x = -6;
-	pixel_y = 3
-	},
-/obj/item/reagent_containers/food/drinks/bottle/beer{
-	desc = "Whatever it is, it reeks of foul, putrid froth.";
-	list_reagents = list(/datum/reagent/consumable/ethanol/bacchus_blessing = 15);
-	name = "Delta-Down";
-	pixel_x = 5;
-	pixel_y = 5
-	},
-/obj{
-	name = "---Merge conflict marker---"
-	},
 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{
 	pixel_x = -6;
 	pixel_y = 3

code/modules/jobs/job_types/assistant.dm

@@ -43,7 +43,7 @@ Assistant
 	id_trim = /datum/id_trim/job/assistant
 	uniform = /obj/item/clothing/under/color/random
 
-/* SKYRAT EDIT REMOVAL - THIS OVERRIDES CLOTHING LOADOUTS
+
 /datum/outfit/job/assistant/pre_equip(mob/living/carbon/human/target)
 	..()
 	give_jumpsuit(target)
@@ -58,17 +58,22 @@ Assistant
 
 	var/index = (jumpsuit_number % GLOB.colored_assistant.jumpsuits.len) + 1
 
+	// SKYRAT EDIT - Loadouts (we don't want jumpsuits to override the person's loadout item)
+	if(modified_outfit_slots & ITEM_SLOT_ICLOTHING)
+		return
+	// SKYRAT EDIT END
+
 	//We don't cache these, because they can delete on init
 	//Too fragile, better to just eat the cost
 	if (target.jumpsuit_style == PREF_SUIT)
 		uniform = GLOB.colored_assistant.jumpsuits[index]
 	else
 		uniform = GLOB.colored_assistant.jumpskirts[index]
-*/
+
 /datum/outfit/job/assistant/consistent
 	name = "Assistant - Consistent"
 
-/* SKYRAT EDIT REMOVAL
+
 /datum/outfit/job/assistant/consistent/give_jumpsuit(mob/living/carbon/human/target)
 	uniform = /obj/item/clothing/under/color/grey
 
@@ -77,8 +82,9 @@ Assistant
 
 	// This outfit is used by the assets SS, which is ran before the atoms SS
 	if (SSatoms.initialized == INITIALIZATION_INSSATOMS)
+		H.w_uniform?.update_greyscale()
 		H.update_inv_w_uniform()
-*/
+
 
 /proc/get_configured_colored_assistant_type()
 	return CONFIG_GET(flag/grey_assistants) ? /datum/colored_assistant/grey : /datum/colored_assistant/random

code/modules/projectiles/projectile.dm

@@ -683,7 +683,7 @@
 		AddElement(/datum/element/embed, projectile_payload = shrapnel_type)
 	if(!log_override && firer && original)
 		log_combat(firer, original, "fired at", src, "from [get_area_name(src, TRUE)]")
-	if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1)) // point blank shots
+	if(direct_target && (get_dist(direct_target, get_turf(fired_from)) <= 1)) // point blank shots // SKYRAT EDIT - ORIGINAL: if(direct_target && (get_dist(direct_target, get_turf(src)) <= 1))
 		process_hit(get_turf(direct_target), direct_target)
 		if(QDELETED(src))
 			return

code/modules/unit_tests/mecha_damage.dm

@@ -30,6 +30,7 @@
 	// Get a sample laser weapon.
 	// The captain's laser gun here is chosen primarily because it deals more damage than normal lasers.
 	var/obj/item/gun/energy/laser/dummy_laser = allocate(/obj/item/gun/energy/laser/captain)
+	dummy_laser.safety = FALSE // SKYRAT EDIT - Safeties on guns make them impossible to shoot :)
 	var/obj/item/ammo_casing/laser_ammo = dummy_laser.ammo_type[1]
 	var/obj/projectile/beam/laser_fired = initial(laser_ammo.projectile_type)
 	var/expected_laser_damage = round(dummy_laser.projectile_damage_multiplier * initial(laser_fired.damage) * (1 - expected_laser_armor / 100), DAMAGE_PRECISION)
@@ -37,6 +38,7 @@
 	// Get a sample ballistic weapon.
 	// The syndicate .357 here is chosen because it does a lot of damage.
 	var/obj/item/gun/ballistic/dummy_gun = allocate(/obj/item/gun/ballistic/revolver)
+	dummy_gun.safety = FALSE // SKYRAT EDIT - Safeties on guns make them impossible to shoot :)
 	var/obj/item/ammo_casing/ballistic_ammo = dummy_gun.magazine.ammo_type
 	var/obj/projectile/bullet_fired = initial(ballistic_ammo.projectile_type)
 	var/expected_bullet_damage = round(dummy_gun.projectile_damage_multiplier * initial(bullet_fired.damage) * (1 - expected_bullet_armor / 100), DAMAGE_PRECISION)

modular_skyrat/master_files/code/datums/outfits.dm

@@ -0,0 +1,3 @@
+/datum/outfit
+	/// Bitflag-based variable to store which parts of the uniform have been modified by the loadout, to avoid them being overriden again.
+	var/modified_outfit_slots = NONE

modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm

@@ -24,6 +24,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/
 		outfit.uniform = item_path
 	else
 		outfit.uniform = item_path
+	outfit.modified_outfit_slots |= ITEM_SLOT_ICLOTHING
 
 /*
 *	JUMPSUITS

tgstation.dme

@@ -4627,6 +4627,7 @@
 #include "modular_skyrat\master_files\code\datums\ai_laws.dm"
 #include "modular_skyrat\master_files\code\datums\emotes.dm"
 #include "modular_skyrat\master_files\code\datums\ert.dm"
+#include "modular_skyrat\master_files\code\datums\outfits.dm"
 #include "modular_skyrat\master_files\code\datums\components\fullauto.dm"
 #include "modular_skyrat\master_files\code\datums\components\shielded_suit.dm"
 #include "modular_skyrat\master_files\code\datums\id_trim\jobs.dm"