diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 21f8936dcad..1f99230ddaf 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_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 diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index 178599c748b..3f2aba7a3e5 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/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 diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm index a59f350c938..61158fe042e 100644 --- a/code/modules/projectiles/projectile.dm +++ b/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 diff --git a/code/modules/unit_tests/mecha_damage.dm b/code/modules/unit_tests/mecha_damage.dm index 6bc5e37069f..e0a88cc2fb1 100644 --- a/code/modules/unit_tests/mecha_damage.dm +++ b/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) diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png new file mode 100644 index 00000000000..5e9e75b9c38 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_assaultoperative.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_borer.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_borer.png new file mode 100644 index 00000000000..35899cffa63 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_borer.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_driftingcontractor.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_driftingcontractor.png new file mode 100644 index 00000000000..56e3d669fd5 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_driftingcontractor.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png b/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png new file mode 100644 index 00000000000..62e23dad5c7 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_antag_icons_loneinfiltrator.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_akula.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_akula.png new file mode 100644 index 00000000000..98cf373723d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_akula.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png new file mode 100644 index 00000000000..98cf373723d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_aquatic.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dwarf.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dwarf.png new file mode 100644 index 00000000000..767a2ec704d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_dwarf.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ghoul.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ghoul.png new file mode 100644 index 00000000000..7df3942298d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_ghoul.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png new file mode 100644 index 00000000000..767a2ec704d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_hemophage.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png new file mode 100644 index 00000000000..567b813a297 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_humanoid.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insect.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insect.png new file mode 100644 index 00000000000..7f43dde9cdd Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_insect.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png new file mode 100644 index 00000000000..ad26e2827dd Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_jelly_roundstartslime.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal.png new file mode 100644 index 00000000000..ca170deb400 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mammal.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant.png new file mode 100644 index 00000000000..b0d73cb8b41 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious.png new file mode 100644 index 00000000000..5b9c3141743 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_fast.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_fast.png new file mode 100644 index 00000000000..5b9c3141743 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_fast.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_slow.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_slow.png new file mode 100644 index 00000000000..5b9c3141743 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_mutant_infectious_slow.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png new file mode 100644 index 00000000000..6bf2830f54d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_pod_podweak.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic.png new file mode 100644 index 00000000000..27bd5354dec Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_ipc.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_ipc.png new file mode 100644 index 00000000000..00f8cc570ee Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_ipc.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_human.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_human.png new file mode 100644 index 00000000000..4424231470d Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_human.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_mammal.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_mammal.png new file mode 100644 index 00000000000..ca170deb400 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthetic_mammal.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthliz.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthliz.png new file mode 100644 index 00000000000..e31c24057cd Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_robotic_synthliz.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png new file mode 100644 index 00000000000..baf4edc8ec7 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_skrell.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png new file mode 100644 index 00000000000..ca170deb400 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_tajaran.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png new file mode 100644 index 00000000000..a0a35a5bc95 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_teshari.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_unathi.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_unathi.png new file mode 100644 index 00000000000..250ef5b3390 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_unathi.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png new file mode 100644 index 00000000000..50850273150 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vox.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vulpkanin.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vulpkanin.png new file mode 100644 index 00000000000..ca170deb400 Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_vulpkanin.png differ diff --git a/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_xeno.png b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_xeno.png new file mode 100644 index 00000000000..f29d624fe8f Binary files /dev/null and b/code/modules/unit_tests/screenshots/screenshot_humanoids__datum_species_xeno.png differ diff --git a/modular_skyrat/master_files/code/datums/outfits.dm b/modular_skyrat/master_files/code/datums/outfits.dm new file mode 100644 index 00000000000..769348fccb7 --- /dev/null +++ b/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 diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index 2de44486064..c223f84d1dd 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/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 diff --git a/tgstation.dme b/tgstation.dme index e931ea42ff1..7031f7d2d50 100644 --- a/tgstation.dme +++ b/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"