From 2f55ca2aa32c0cc3d9f9b0fca6871bfa50d2db2b Mon Sep 17 00:00:00 2001 From: Francinum <5572280+francinum@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:08:35 -0400 Subject: [PATCH 1/3] fixes #879 --- code/game/objects/structures/mirror.dm | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index eedd8b78146f..5c5219362e41 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -9,6 +9,9 @@ max_integrity = 200 integrity_failure = 0.5 + /// If true, skip base mirror behaviour. + var/magic_mirror = FALSE + MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) /obj/structure/mirror/Initialize(mapload) @@ -25,6 +28,10 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) if(!ishuman(user)) return TRUE + + if(magic_mirror) + return FALSE //Pass control to child proc. + var/mob/living/carbon/human/hairdresser = user //handle facial hair (if necessary) @@ -125,6 +132,8 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror, 28) desc = "Turn and face the strange... face." icon_state = "magic_mirror" + magic_mirror = TRUE + ///Flags this race must have to be selectable with this type of mirror. var/race_flags = MIRROR_MAGIC ///List of all Races that can be chosen, decided by its Initialize. From 9aebc19f3720ca6620fe2379b82e79b79c7e9952 Mon Sep 17 00:00:00 2001 From: Francinum <5572280+francinum@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:17:50 -0400 Subject: [PATCH 2/3] fixes #967 Also fixes the fact that basic color customization in the loadout was busted. --- code/modules/client/preferences/loadout/loadout.dm | 2 +- .../modules/client/preferences/loadout/loadout_item/gloves.dm | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/code/modules/client/preferences/loadout/loadout.dm b/code/modules/client/preferences/loadout/loadout.dm index babaac3c9394..20ec80e6ea46 100644 --- a/code/modules/client/preferences/loadout/loadout.dm +++ b/code/modules/client/preferences/loadout/loadout.dm @@ -92,7 +92,7 @@ return TRUE if("color") - if(loadout_item.customization_flags & CUSTOMIZE_COLOR) + if(!(loadout_item.customization_flags & CUSTOMIZE_COLOR)) return var/current_color_display = entry.custom_color ? entry.custom_color : "#FFFFFF" diff --git a/code/modules/client/preferences/loadout/loadout_item/gloves.dm b/code/modules/client/preferences/loadout/loadout_item/gloves.dm index 84092da5027d..675af629edfc 100644 --- a/code/modules/client/preferences/loadout/loadout_item/gloves.dm +++ b/code/modules/client/preferences/loadout/loadout_item/gloves.dm @@ -20,3 +20,7 @@ /datum/loadout_item/gloves/diamondring path = /obj/item/clothing/gloves/ring/diamond cost = 4 + +/datum/loadout_item/gloves/white + path = /obj/item/clothing/gloves/color/white + customization_flags = CUSTOMIZE_NAME_DESC_COLOR From 8e0975efecce533f7f70abc310b11dacc8585113 Mon Sep 17 00:00:00 2001 From: Francinum <5572280+francinum@users.noreply.github.com> Date: Tue, 27 Aug 2024 22:35:39 -0400 Subject: [PATCH 3/3] Obsoletes obj_flags:USES_TGUI Fixes #1066 --- code/__DEFINES/obj_flags.dm | 2 +- code/_globalvars/bitfields.dm | 2 +- code/game/objects/items/devices/radio/radio.dm | 1 - code/game/objects/objs.dm | 2 +- code/modules/cards/cardhand.dm | 1 + code/modules/cards/singlecard.dm | 1 + code/modules/mob/mob.dm | 5 +++++ code/modules/power/generator.dm | 1 - code/modules/recycling/disposal/bin.dm | 1 - 9 files changed, 10 insertions(+), 6 deletions(-) diff --git a/code/__DEFINES/obj_flags.dm b/code/__DEFINES/obj_flags.dm index ac392dcbf9cf..1b16a15c6d1d 100644 --- a/code/__DEFINES/obj_flags.dm +++ b/code/__DEFINES/obj_flags.dm @@ -6,7 +6,7 @@ #define CAN_BE_HIT (1<<2) //can this be bludgeoned by items? #define DANGEROUS_POSSESSION (1<<3) //Admin possession yes/no #define UNIQUE_RENAME (1<<4) // can you customize the description/name of the thing? -#define USES_TGUI (1<<5) //put on things that use tgui on ui_interact instead of custom/old UI. +#define SECRET_EXAMINE (1<<5) //Will never generate visible examine messages. Used for stuff like playing card hands. #define BLOCK_Z_OUT_DOWN (1<<6) // Should this object block z falling from loc? #define BLOCK_Z_OUT_UP (1<<7) // Should this object block z uprise from loc? #define BLOCK_Z_IN_DOWN (1<<8) // Should this object block z falling from above? diff --git a/code/_globalvars/bitfields.dm b/code/_globalvars/bitfields.dm index ec46cf71726b..2348466c7b1b 100644 --- a/code/_globalvars/bitfields.dm +++ b/code/_globalvars/bitfields.dm @@ -271,7 +271,7 @@ DEFINE_BITFIELD(obj_flags, list( "IN_USE" = IN_USE, "NO_BUILD" = NO_BUILD, "UNIQUE_RENAME" = UNIQUE_RENAME, - "USES_TGUI" = USES_TGUI, + "SECRET_EXAMINE" = SECRET_EXAMINE, )) DEFINE_BITFIELD(pass_flags, list( diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index a4e2e4987a62..fdcf9359ef12 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -14,7 +14,6 @@ throw_range = 7 w_class = WEIGHT_CLASS_SMALL custom_materials = list(/datum/material/iron=75, /datum/material/glass=25) - obj_flags = USES_TGUI ///if FALSE, broadcasting and listening dont matter and this radio shouldnt do anything VAR_PRIVATE/on = TRUE diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 3730800c1bd5..99c50ae72ac7 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -85,7 +85,7 @@ return null /obj/proc/updateUsrDialog() - if((obj_flags & IN_USE) && !(obj_flags & USES_TGUI)) + if((obj_flags & IN_USE)) var/is_in_use = FALSE var/list/nearby = viewers(1, src) for(var/mob/M in nearby) diff --git a/code/modules/cards/cardhand.dm b/code/modules/cards/cardhand.dm index e134543801ea..5ebe4366d0e3 100644 --- a/code/modules/cards/cardhand.dm +++ b/code/modules/cards/cardhand.dm @@ -5,6 +5,7 @@ icon_state = "none" w_class = WEIGHT_CLASS_TINY worn_icon_state = "card" + obj_flags = parent_type::obj_flags | SECRET_EXAMINE /obj/item/toy/cards/cardhand/Initialize(mapload, list/cards_to_combine = list()) . = ..() diff --git a/code/modules/cards/singlecard.dm b/code/modules/cards/singlecard.dm index 2ad0eff5d33c..30cd93d3fbf9 100644 --- a/code/modules/cards/singlecard.dm +++ b/code/modules/cards/singlecard.dm @@ -16,6 +16,7 @@ throw_range = 7 attack_verb_continuous = list("attacks") attack_verb_simple = list("attack") + obj_flags = parent_type::obj_flags | SECRET_EXAMINE /// Artistic style of the deck var/deckstyle = "nanotrasen" /// If the cards in the deck have different icon states (blank and CAS decks do not) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index 77fbea26465f..e7b5ab5b777d 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -591,6 +591,11 @@ if(examined == src) return + if(isobj(examined)) + var/obj/examined_obj = examined + if(examined_obj.obj_flags & SECRET_EXAMINE) + return + // If TRUE, the usr's view() for the examined object too var/examining_worn_item = FALSE var/loc_str = "at something off in the distance." diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 83b7dd75e583..4b938318a81e 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -5,7 +5,6 @@ icon_state = "teg" density = TRUE use_power = NO_POWER_USE - obj_flags = USES_TGUI interaction_flags_atom = INTERACT_ATOM_UI_INTERACT zmm_flags = ZMM_MANGLE_PLANES diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm index fb5132d9ef24..ef6c59a2b6e3 100644 --- a/code/modules/recycling/disposal/bin.dm +++ b/code/modules/recycling/disposal/bin.dm @@ -9,7 +9,6 @@ max_integrity = 200 resistance_flags = FIRE_PROOF interaction_flags_machine = INTERACT_MACHINE_OPEN | INTERACT_MACHINE_WIRES_IF_OPEN | INTERACT_MACHINE_ALLOW_SILICON | INTERACT_MACHINE_OPEN_SILICON - obj_flags = CAN_BE_HIT | USES_TGUI var/datum/gas_mixture/air_contents // internal reservoir var/full_pressure = FALSE