diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index d61770e765d..6e28e50ee82 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -34835,7 +34835,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/mob/living/simple_animal/pet/poppy, +/mob/living/basic/pet/poppy, /obj/structure/disposalpipe/segment{ dir = 10 }, diff --git a/_maps/map_files/LimaStation/LimaStation.dmm b/_maps/map_files/LimaStation/LimaStation.dmm index f3804766fe1..624de042ca6 100644 --- a/_maps/map_files/LimaStation/LimaStation.dmm +++ b/_maps/map_files/LimaStation/LimaStation.dmm @@ -35958,7 +35958,7 @@ pixel_x = -24; req_access = list("engineering") }, -/mob/living/simple_animal/pet/poppy, +/mob/living/basic/pet/poppy, /obj/structure/bed/dogbed{ anchored = 1; name = "Poppy's bed" diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index dea983a2e42..0b7bc24cad3 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -47236,7 +47236,7 @@ /turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) "nFV" = ( -/mob/living/simple_animal/pet/poppy, +/mob/living/basic/pet/poppy, /obj/effect/turf_decal/siding/dark{ dir = 9 }, diff --git a/code/modules/mod/mod_theme.dm b/code/modules/mod/mod_theme.dm index 0429958e43b..ab2c76fc40f 100644 --- a/code/modules/mod/mod_theme.dm +++ b/code/modules/mod/mod_theme.dm @@ -117,6 +117,7 @@ ) #ifdef UNIT_TESTS +/* BUBBER EDIT - Comments this check out until TG fixes it /datum/mod_theme/New() var/list/skin_parts = list() for(var/variant in variants) @@ -126,6 +127,7 @@ if(skin ~! compared_skin) stack_trace("[type] variants [skin] and [compared_skin] aren't made of the same parts.") skin_parts -= skin +*/ #endif /// Create parts of the suit and modify them using the theme's variables. diff --git a/modular_skyrat/modules/customization/__HELPERS/global_lists.dm b/modular_skyrat/modules/customization/__HELPERS/global_lists.dm index d913736249a..564ca6941c3 100644 --- a/modular_skyrat/modules/customization/__HELPERS/global_lists.dm +++ b/modular_skyrat/modules/customization/__HELPERS/global_lists.dm @@ -1,6 +1,7 @@ /proc/make_skyrat_datum_references() make_sprite_accessory_references() make_laugh_datum_references() + make_bloopers() // BUBBER EDIT - Bloopers make_default_mutant_bodypart_references() make_body_marking_references() make_body_marking_set_references() @@ -200,3 +201,14 @@ continue SSaccessories.bra_m -= sprite_name + +//BUBBER EDIT ADDITION BEGIN +// Text bloopers +/proc/make_bloopers() + GLOB.blooper_list = list() + for(var/sound_blooper_path in subtypesof(/datum/blooper)) + var/datum/blooper/bloop = new sound_blooper_path() + GLOB.blooper_list[bloop.id] = sound_blooper_path + if(bloop.allow_random) + GLOB.blooper_random_list[bloop.id] = sound_blooper_path +//BUBBER EDIT END diff --git a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm index 2efc9ab9f3f..c6be15a5365 100644 --- a/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm +++ b/modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm @@ -67,6 +67,8 @@ GLOBAL_LIST_EMPTY(cached_mutant_icon_files) default_color = DEFAULT_MATRIXED if (color_src == USE_MATRIXED_COLORS) color_layer_names = list() + if(isnull(GLOB.cached_mutant_icon_files)) // BUBBER EDIT - nullcheck + GLOB.cached_mutant_icon_files = list() if (!GLOB.cached_mutant_icon_files[icon]) GLOB.cached_mutant_icon_files[icon] = icon_states(new /icon(icon)) for (var/layer in relevent_layers) diff --git a/modular_zubbers/code/game/brain_damage/severe.dm b/modular_zubbers/code/game/brain_damage/severe.dm index 1f828c8fdb8..e62f48df7c3 100644 --- a/modular_zubbers/code/game/brain_damage/severe.dm +++ b/modular_zubbers/code/game/brain_damage/severe.dm @@ -9,5 +9,5 @@ for(var/mob/M in owner.held_items) //makes sure to check hands for your tiny friends! if(!isliving(M)) continue - if(istype(M, /mob/living/simple_animal/pet) || istype(M, /mob/living/basic/pet) || M.ckey) + if(istype(M, /mob/living/basic/pet) || M.ckey) return FALSE diff --git a/modular_zubbers/code/modules/mod/mod_theme.dm b/modular_zubbers/code/modules/mod/mod_theme.dm index 02150d225a6..30ab4426d1d 100644 --- a/modular_zubbers/code/modules/mod/mod_theme.dm +++ b/modular_zubbers/code/modules/mod/mod_theme.dm @@ -17,11 +17,11 @@ /obj/item/assembly/flash, /obj/item/melee/baton, ) - skins = list( + variants = list( "asset_protection" = list( MOD_ICON_OVERRIDE = 'modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi', MOD_WORN_ICON_OVERRIDE = 'modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi', - HELMET_FLAGS = list( + /obj/item/clothing/head/mod = list( UNSEALED_LAYER = null, UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS, @@ -29,17 +29,17 @@ SEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEMASK|HIDEEYES|HIDEFACE|HIDESNOUT, SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, ), - CHESTPLATE_FLAGS = list( + /obj/item/clothing/suit/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, SEALED_INVISIBILITY = HIDEJUMPSUIT, ), - GAUNTLETS_FLAGS = list( + /obj/item/clothing/gloves/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, CAN_OVERSLOT = TRUE, ), - BOOTS_FLAGS = list( + /obj/item/clothing/shoes/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, CAN_OVERSLOT = TRUE, @@ -59,84 +59,42 @@ acid = 100 wound = 15 -/datum/mod_theme/mining - default_skin = "mining" - skins = list( - "mining" = list( - HELMET_FLAGS = list( - UNSEALED_LAYER = null, - UNSEALED_CLOTHING = SNUG_FIT, - SEALED_CLOTHING = THICKMATERIAL|STOPSPRESSUREDAMAGE|HEADINTERNALS, - UNSEALED_INVISIBILITY = HIDEEARS|HIDEHAIR, - SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT, - SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, - ), - CHESTPLATE_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - SEALED_INVISIBILITY = HIDEJUMPSUIT, - ), - GAUNTLETS_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - CAN_OVERSLOT = TRUE, - ), - BOOTS_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - CAN_OVERSLOT = TRUE, - ), - ), - "asteroid" = list( - HELMET_FLAGS = list( - UNSEALED_LAYER = null, - UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS, - UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT, - SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE, - SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, - ), - CHESTPLATE_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - SEALED_INVISIBILITY = HIDEJUMPSUIT, - ), - GAUNTLETS_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - CAN_OVERSLOT = TRUE, - ), - BOOTS_FLAGS = list( - UNSEALED_CLOTHING = THICKMATERIAL, - SEALED_CLOTHING = STOPSPRESSUREDAMAGE, - CAN_OVERSLOT = TRUE, - ), - ), +/datum/mod_theme/mining/New() + variants += list( "imp" = list( MOD_ICON_OVERRIDE = 'modular_zubbers/icons/obj/clothing/modsuit/mod_clothing.dmi', MOD_WORN_ICON_OVERRIDE = 'modular_zubbers/icons/mob/clothing/modsuit/mod_clothing.dmi', - HELMET_FLAGS = list( + /obj/item/clothing/head/mod = list( UNSEALED_LAYER = null, UNSEALED_CLOTHING = SNUG_FIT|THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE|HEADINTERNALS, UNSEALED_INVISIBILITY = HIDEFACIALHAIR|HIDEEARS|HIDEHAIR|HIDESNOUT, SEALED_INVISIBILITY = HIDEMASK|HIDEEYES|HIDEFACE, SEALED_COVER = HEADCOVERSMOUTH|HEADCOVERSEYES|PEPPERPROOF, + UNSEALED_MESSAGE = HELMET_UNSEAL_MESSAGE, + SEALED_MESSAGE = HELMET_SEAL_MESSAGE, ), - CHESTPLATE_FLAGS = list( + /obj/item/clothing/suit/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, SEALED_INVISIBILITY = HIDEJUMPSUIT, + UNSEALED_MESSAGE = CHESTPLATE_UNSEAL_MESSAGE, + SEALED_MESSAGE = CHESTPLATE_SEAL_MESSAGE, ), - GAUNTLETS_FLAGS = list( + /obj/item/clothing/gloves/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = GAUNTLET_UNSEAL_MESSAGE, + SEALED_MESSAGE = GAUNTLET_SEAL_MESSAGE, ), - BOOTS_FLAGS = list( + /obj/item/clothing/shoes/mod = list( UNSEALED_CLOTHING = THICKMATERIAL, SEALED_CLOTHING = STOPSPRESSUREDAMAGE, CAN_OVERSLOT = TRUE, + UNSEALED_MESSAGE = BOOT_UNSEAL_MESSAGE, + SEALED_MESSAGE = BOOT_SEAL_MESSAGE, ), ), ) + . = ..()