diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 40a26083e75..5aaaf203e45 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -31,7 +31,7 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( //SKYRAT EDIT ADDITION BEGIN list(/datum/quirk/equipping/nerve_staple, /datum/quirk/nonviolent), list(/datum/quirk/equipping/nerve_staple, /datum/quirk/item_quirk/nearsighted), - list(/datum/quirk/no_guns, /datum/quirk/bighands, /datum/quirk/poor_aim), + list(/datum/quirk/no_guns, /datum/quirk/poor_aim), list(/datum/quirk/no_guns, /datum/quirk/nonviolent), list(/datum/quirk/spacer_born, /datum/quirk/oversized), list(/datum/quirk/felinid_aspect, /datum/quirk/item_quirk/canine, /datum/quirk/item_quirk/avian), @@ -96,8 +96,6 @@ PROCESSING_SUBSYSTEM_DEF(quirks) for(var/type in quirk_list) var/datum/quirk/quirk_type = type // SKYRAT EDIT ADDITION START - if(initial(quirk_type.abstract_parent_type) == type) - continue if(initial(quirk_type.erp_quirk) && CONFIG_GET(flag/disable_erp_preferences)) continue diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm index a8f0f9c7225..713c9f6be18 100644 --- a/code/game/objects/items/implants/implant_misc.dm +++ b/code/game/objects/items/implants/implant_misc.dm @@ -50,9 +50,7 @@ /obj/item/implant/smoke/activate() . = ..() uses-- - var/datum/effect_system/fluid_spread/smoke/bad/smoke = new - smoke.set_up(6, holder = imp_in, location = imp_in) - smoke.start() + do_smoke(6, imp_in, imp_in.loc, smoke_type = /datum/effect_system/fluid_spread/smoke/bad) if(!uses) qdel(src) diff --git a/code/modules/buildmode/submodes/advanced.dm b/code/modules/buildmode/submodes/advanced.dm index d0d67f0dde3..bb08ddaf529 100644 --- a/code/modules/buildmode/submodes/advanced.dm +++ b/code/modules/buildmode/submodes/advanced.dm @@ -58,12 +58,4 @@ else if(right_click) if(isobj(object)) log_admin("Build Mode: [key_name(c)] deleted [object] at [AREACOORD(object)]") - // SKYRAT EDIT -- BS delete sparks. Original was just qdel(object) - var/turf/T = get_turf(object) qdel(object) - if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) - var/datum/effect_system/basic/spark_spread/quantum/sparks = new - sparks.set_up(10, 1, T) - sparks.attach(T) - sparks.start() diff --git a/code/modules/buildmode/submodes/basic.dm b/code/modules/buildmode/submodes/basic.dm index 3ff137c3688..e68ccda926d 100644 --- a/code/modules/buildmode/submodes/basic.dm +++ b/code/modules/buildmode/submodes/basic.dm @@ -37,15 +37,7 @@ var/turf/T = object T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) else if(isobj(object)) - // SKYRAT EDIT -- BS delete sparks. Original was just qdel(object) - var/turf/T = get_turf(object) qdel(object) - if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) - var/datum/effect_system/basic/spark_spread/quantum/sparks = new - sparks.set_up(10, 1, T) - sparks.attach(T) - sparks.start() return else if(istype(object,/turf) && alt_click && left_click) log_admin("Build Mode: [key_name(c)] built an airlock at [AREACOORD(object)]") diff --git a/code/modules/buildmode/submodes/delete.dm b/code/modules/buildmode/submodes/delete.dm index 7f873816bfe..1980375a33c 100644 --- a/code/modules/buildmode/submodes/delete.dm +++ b/code/modules/buildmode/submodes/delete.dm @@ -15,15 +15,7 @@ var/turf/T = object T.ScrapeAway(flags = CHANGETURF_INHERIT_AIR) else if(isatom(object)) - // SKYRAT EDIT -- BS delete sparks. Original was just qdel(object) - var/turf/T = get_turf(object) qdel(object) - if(T && c.prefs.read_preference(/datum/preference/toggle/admin/delete_sparks)) - playsound(T, 'sound/effects/magic/repulse.ogg', 100, 1) - var/datum/effect_system/basic/spark_spread/quantum/sparks = new - sparks.set_up(10, 1, T) - sparks.attach(T) - sparks.start() if(LAZYACCESS(modifiers, RIGHT_CLICK)) if(check_rights(R_DEBUG|R_SERVER)) //Prevents buildmoded non-admins from breaking everything. diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm index 1be072f8d80..2fd3c7c84a3 100644 --- a/code/modules/mob/living/carbon/carbon_defense.dm +++ b/code/modules/mob/living/carbon/carbon_defense.dm @@ -353,7 +353,7 @@ return else playsound(src, 'modular_zubbers/sound/emotes/nose_boop.ogg', 50, 0) - if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH)) + if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && !is_mouth_covered(ITEM_SLOT_MASK)) to_chat(src, span_warning("[helper] boops you on your sensitive nose, sending you to the ground!")) src.Knockdown(20) src.apply_damage(30, STAMINA) diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm index 8141e65af1d..8ca4a9c7b60 100644 --- a/code/modules/mob/living/carbon/life.dm +++ b/code/modules/mob/living/carbon/life.dm @@ -533,7 +533,7 @@ for(var/obj/item/organ/organ in organs) // On-death is where organ decay is handled if(organ?.owner) // organ + owner can be null due to reagent metabolization causing organ shuffling - rot_count += organ.on_death(seconds_per_tick, times_fired) //BUBBERSTATION ADDITION: MIASMA_COUNT. NOTE THIS ISN'T CALLED ON ROBOTIC ORGANS. + rot_count += organ.on_death(seconds_per_tick) //BUBBERSTATION ADDITION: MIASMA_COUNT. NOTE THIS ISN'T CALLED ON ROBOTIC ORGANS. // We need to re-check the stat every organ, as one of our others may have revived us if(stat != DEAD) break diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 6c75826d3ad..73205fb943b 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -595,7 +595,7 @@ if(active && new_module.has_required_parts(mod_parts, need_active = TRUE)) new_module.on_part_activation() new_module.part_activated = TRUE - if(user && !silent) // Bubber Edit: Silent Arg + if(user) // Bubber Edit: Silent Arg balloon_alert(user, "[new_module] added") playsound(src, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE) return TRUE // Bubber Edit: Return True diff --git a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm index 886c49fc3e5..45889011818 100644 --- a/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm +++ b/code/modules/surgery/bodyparts/species_parts/lizard_bodyparts.dm @@ -51,7 +51,6 @@ icon_greyscale = 'icons/mob/human/species/lizard/bodyparts.dmi' limb_id = SPECIES_LIZARD -/* SKYRAT EDIT REMOVAL - MOVED TO MODULAR MUTANT_BODYPARTS.DM /// Checks if this mob is wearing anything that does not have a valid sprite set for digitigrade legs /// (In other words, is the mob's digitigrade body squished by its clothing?) /mob/living/carbon/proc/is_digitigrade_squished() @@ -99,4 +98,3 @@ /obj/item/bodypart/leg/right/digitigrade/update_limb(dropping_limb = FALSE, is_creating = FALSE) . = ..() limb_id = owner?.is_digitigrade_squished() ? SPECIES_LIZARD : BODYPART_ID_DIGITIGRADE -*/ diff --git a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm index 65102cfeb11..9fb24b3ac89 100644 --- a/modular_skyrat/master_files/code/modules/clothing/head/_head.dm +++ b/modular_skyrat/master_files/code/modules/clothing/head/_head.dm @@ -54,12 +54,12 @@ //TODO - this needs a better method, can we do this as a SQUISH thing like digitigrade? /obj/item/clothing/head/helmet/space/changeling flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - supports_variations_flags = CLOTHING_NO_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/head/helmet/space/freedom flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - supports_variations_flags = CLOTHING_NO_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON /obj/item/clothing/head/helmet/space/santahat flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - supports_variations_flags = CLOTHING_NO_VARIATION + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON diff --git a/modular_skyrat/modules/alerts/code/alert_sound_to_playing.dm b/modular_skyrat/modules/alerts/code/alert_sound_to_playing.dm index 4ec4ccd4443..4686a169719 100644 --- a/modular_skyrat/modules/alerts/code/alert_sound_to_playing.dm +++ b/modular_skyrat/modules/alerts/code/alert_sound_to_playing.dm @@ -8,7 +8,7 @@ for(var/m in players) if(ismob(m) && !isnewplayer(m)) var/mob/M = m - if(M.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements) && M.can_hear()) + if(M.client?.prefs.read_preference(/datum/preference/toggle/sound_announcements) && !HAS_TRAIT(M, TRAIT_DEAF)) if(override_volume) M.playsound_local(get_turf(M), S, 80, FALSE) else diff --git a/modular_skyrat/modules/alt_vox/code/vox_procs.dm b/modular_skyrat/modules/alt_vox/code/vox_procs.dm index 2b218eb340f..2cc855922f0 100644 --- a/modular_skyrat/modules/alt_vox/code/vox_procs.dm +++ b/modular_skyrat/modules/alt_vox/code/vox_procs.dm @@ -170,7 +170,7 @@ if(!only_listener) // Play voice for all mobs in the z level for(var/mob/player_mob in GLOB.player_list) - if(!player_mob.can_hear() || !(safe_read_pref(player_mob.client, /datum/preference/toggle/sound_announcements))) + if(!HAS_TRAIT(player_mob, TRAIT_DEAF) || !(safe_read_pref(player_mob.client, /datum/preference/toggle/sound_announcements))) continue var/turf/player_turf = get_turf(player_mob)