cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-29 16:18:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

upstream-2406b

Browse Source
This commit is contained in:
Waterpig
2024-06-08 18:43:30 +02:00
parent 227fefdf33
commit ea0c979e66
8 changed files with 40 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/BoxStation/BoxStation.dmm
+1 -1
View File
@@ -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
},
_maps/map_files/LimaStation/LimaStation.dmm
+1 -1
View File
@@ -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"
_maps/map_files/moonstation/moonstation.dmm
+1 -1
View File
@@ -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
},
code/modules/mod/mod_theme.dm
+2
View File
@@ -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.
modular_skyrat/modules/customization/__HELPERS/global_lists.dm
+12
View File
@@ -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
modular_skyrat/modules/customization/modules/mob/dead/new_player/sprite_accessories.dm
+2
View File
@@ -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)
modular_zubbers/code/game/brain_damage/severe.dm
+1 -1
View File
@@ -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
modular_zubbers/code/modules/mod/mod_theme.dm
+20 -62
View File
@@ -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,
),
),
)
. = ..()