diff --git a/code/datums/components/self_ignition.dm b/code/datums/components/self_ignition.dm index db03b62d172..a1635bcf715 100644 --- a/code/datums/components/self_ignition.dm +++ b/code/datums/components/self_ignition.dm @@ -33,7 +33,7 @@ if (HAS_TRAIT(owner, TRAIT_STASIS)) return - if (owner.is_atmos_sealed(additional_flags = PLASMAMAN_PREVENT_IGNITION, check_hands = TRUE, ignore_chest_pressureprot = TRUE)) + if (owner.is_atmos_sealed(additional_flags = PLASMAMAN_PREVENT_IGNITION, check_hands = TRUE, alt_flags = TRUE)) if (!owner.on_fire) REMOVE_TRAIT(owner, TRAIT_IGNORE_FIRE_PROTECTION, REF(parent)) return diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index eafb85912b0..b11dd119e7f 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1125,6 +1125,26 @@ add_traits(list(TRAIT_NO_DNA_SCRAMBLE, TRAIT_BADDNA, TRAIT_BORN_MONKEY), SPECIES_TRAIT) +/mob/living/carbon/human/proc/is_atmos_sealed(additional_flags = null, check_hands = FALSE, alt_flags = FALSE) + var/chest_covered = FALSE + var/head_covered = FALSE + var/hands_covered = FALSE + for (var/obj/item/clothing/equipped in get_equipped_items()) + // We don't really have space-proof gloves, so even if we're checking them we ignore the flags + if ((equipped.body_parts_covered & HANDS) && num_hands >= default_num_hands) + hands_covered = TRUE + if (!alt_flags && !isnull(additional_flags) && !(equipped.clothing_flags & additional_flags)) + continue + if ((equipped.clothing_flags & (STOPSPRESSUREDAMAGE | (alt_flags ? additional_flags : NONE))) && (equipped.body_parts_covered & CHEST)) + chest_covered = TRUE + if ((equipped.clothing_flags & (STOPSPRESSUREDAMAGE | (alt_flags ? additional_flags : NONE))) && (equipped.body_parts_covered & HEAD)) + head_covered = TRUE + if (!chest_covered) + return FALSE + if (!hands_covered && check_hands) + return FALSE + return head_covered || HAS_TRAIT(src, TRAIT_NOFIRE_SPREAD) + /mob/living/carbon/human/species/abductor race = /datum/species/abductor diff --git a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png index 1ca452de089..a8e3dfe648a 100644 Binary files a/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png and b/code/modules/unit_tests/screenshots/screenshot_digi_leg_test.png differ diff --git a/html/changelogs/AutoChangeLog-pr-2265.yml b/html/changelogs/AutoChangeLog-pr-2265.yml deleted file mode 100644 index 4b1ff8b6f69..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2265.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "shellspeed1" -delete-after: True -changes: - - rscadd: "The Persistence land crawler has been deployed to local mineral rich areas." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2589.yml b/html/changelogs/AutoChangeLog-pr-2589.yml deleted file mode 100644 index db1c74c546e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2589.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Jinshee" -delete-after: True -changes: - - rscadd: "Added new snout \"Mandibles (Top)\"" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2590.yml b/html/changelogs/AutoChangeLog-pr-2590.yml deleted file mode 100644 index df0df208b72..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2590.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "BurgerBB" -delete-after: True -changes: - - bugfix: "Moves Lizard Full Stub horns to beard because of overlay issues." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2591.yml b/html/changelogs/AutoChangeLog-pr-2591.yml deleted file mode 100644 index ed923651ed6..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2591.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Arturlang" -delete-after: True -changes: - - balance: "Can't kinetic crusher mark space dragons anymore" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2592.yml b/html/changelogs/AutoChangeLog-pr-2592.yml deleted file mode 100644 index 94a7ea8bc45..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2592.yml +++ /dev/null @@ -1,7 +0,0 @@ -author: "sippykot" -delete-after: True -changes: - - balance: "ration tickets capacity doubled" - - rscadd: "added blood bag and glucose as options to the regular ration ticket" - - rscadd: "added blood tea and soda + lemonade as drink option for luxury ration ticket" - - rscadd: "added chewing gum as option for the luxury ration ticket" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2598.yml b/html/changelogs/AutoChangeLog-pr-2598.yml deleted file mode 100644 index e24799c9bfd..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2598.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "LT3" -delete-after: True -changes: - - balance: "Minor reduction to the strength of scrubber overflows" \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2601.yml b/html/changelogs/AutoChangeLog-pr-2601.yml deleted file mode 100644 index 27d700ee22e..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2601.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "TealSeer" -delete-after: True -changes: - - bugfix: "Fixed a few disposal pipes on boxstation." \ No newline at end of file diff --git a/html/changelogs/AutoChangeLog-pr-2603.yml b/html/changelogs/AutoChangeLog-pr-2603.yml deleted file mode 100644 index 6f93afb8e1f..00000000000 --- a/html/changelogs/AutoChangeLog-pr-2603.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Odairu" -delete-after: True -changes: - - bugfix: "map vote respects current pop" \ No newline at end of file diff --git a/html/changelogs/archive/2024-12.yml b/html/changelogs/archive/2024-12.yml new file mode 100644 index 00000000000..50297d1d0d7 --- /dev/null +++ b/html/changelogs/archive/2024-12.yml @@ -0,0 +1,21 @@ +2024-12-01: + Arturlang: + - balance: Can't kinetic crusher mark space dragons anymore + BurgerBB: + - bugfix: Moves Lizard Full Stub horns to beard because of overlay issues. + Jinshee: + - rscadd: Added new snout "Mandibles (Top)" + LT3: + - balance: Minor reduction to the strength of scrubber overflows + Odairu: + - bugfix: map vote respects current pop + TealSeer: + - bugfix: Fixed a few disposal pipes on boxstation. + shellspeed1: + - rscadd: The Persistence land crawler has been deployed to local mineral rich areas. + sippykot: + - balance: ration tickets capacity doubled + - rscadd: added blood bag and glucose as options to the regular ration ticket + - rscadd: added blood tea and soda + lemonade as drink option for luxury ration + ticket + - rscadd: added chewing gum as option for the luxury ration ticket diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm index 67d15ed6e2c..0d2112c484b 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/glasses.dm @@ -71,11 +71,6 @@ name = "White Eyepatch" item_path = /obj/item/clothing/glasses/eyepatch/white -/datum/loadout_item/glasses/medical_eyepatch - name = "Medical Eyepatch" - item_path = /obj/item/clothing/glasses/eyepatch/medical - - /datum/loadout_item/glasses/fakeblindfold name = "Fake Blindfold" item_path = /obj/item/clothing/glasses/trickblindfold diff --git a/tgstation.dme b/tgstation.dme index fa3a7cbb224..f4ea22415ea 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -1335,6 +1335,7 @@ #include "code\datums\components\security_vision.dm" #include "code\datums\components\seethrough.dm" #include "code\datums\components\seethrough_mob.dm" +#include "code\datums\components\self_ignition.dm" #include "code\datums\components\shell.dm" #include "code\datums\components\shielded.dm" #include "code\datums\components\shovel_hands.dm"