Skip to content

Commit 9f154ae

Browse files
authored
Totally December Postround Tweaks (#852)
1 parent 6746d7e commit 9f154ae

19 files changed

Lines changed: 129 additions & 28 deletions

File tree

code/_onclick/hud/alert.dm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
426426
if(!examinable)
427427
return ..()
428428

429+
user.examine_feedback(offer.offered_item)
429430
return list(
430431
span_boldnotice(name),
431432
span_info("[offer.owner] is offering you the following item (click the alert to take it!):"),

code/datums/quirks/negative_quirks/prosopagnosia.dm

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,26 @@
3535
/datum/status_effect/grouped/see_no_names/proc/examine_name_override(datum/source, mob/living/carbon/human/examined, visible_name, list/name_override)
3636
SIGNAL_HANDLER
3737

38-
if(!ishuman(examined) || source == examined)
38+
if(!isliving(examined) || source == examined)
3939
return NONE
40+
if(!ishuman(examined) || !see_ids)
41+
name_override[1] = "Unknown"
42+
return COMPONENT_EXAMINE_NAME_OVERRIDEN
4043

41-
var/id_name = see_ids && examined.get_id_name("", honorifics = TRUE)
44+
var/id_name = examined.get_id_name("", honorifics = TRUE)
4245
name_override[1] = id_name ? "[id_name]?" : "Unknown"
4346
return COMPONENT_EXAMINE_NAME_OVERRIDEN
4447

4548
/datum/status_effect/grouped/see_no_names/proc/screentip_name_override(datum/source, list/returned_name, obj/item/held_item, mob/living/carbon/human/hovered)
4649
SIGNAL_HANDLER
4750

48-
if(!ishuman(hovered) || source == hovered)
51+
if(!isliving(hovered) || source == hovered)
4952
return NONE
50-
if(!see_ids)
53+
if(!ishuman(hovered) || !see_ids)
5154
returned_name[1] = "Unknown"
5255
return SCREENTIP_NAME_SET
5356

54-
var/id_name = see_ids && hovered.get_id_name("", honorifics = TRUE)
57+
var/id_name = hovered.get_id_name("", honorifics = TRUE)
5558
returned_name[1] = id_name ? "[id_name]?" : "Unknown"
5659
return SCREENTIP_NAME_SET
5760

code/game/atom/alternate_appearance.dm

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -178,16 +178,16 @@ GLOBAL_LIST_EMPTY(active_alternate_appearances)
178178

179179
/datum/atom_hud/alternate_appearance/basic/food_demands
180180

181-
/// Hud specifically used for humans when unconscious to hide other humans
182-
/datum/atom_hud/alternate_appearance/basic/human_unconscious_hud
181+
/// Hud specifically used for mobs when unconscious to hide other humans
182+
/datum/atom_hud/alternate_appearance/basic/unconscious_obscurity
183183

184-
/datum/atom_hud/alternate_appearance/basic/human_unconscious_hud/New(key, image/I, options)
184+
/datum/atom_hud/alternate_appearance/basic/unconscious_obscurity/New(key, image/I, options)
185185
. = ..()
186186
RegisterSignal(target, COMSIG_LIVING_POST_UPDATE_TRANSFORM, PROC_REF(turn_image))
187187

188-
/datum/atom_hud/alternate_appearance/basic/human_unconscious_hud/proc/turn_image(datum/source, ...)
188+
/datum/atom_hud/alternate_appearance/basic/unconscious_obscurity/proc/turn_image(datum/source, ...)
189189
SIGNAL_HANDLER
190190
image.transform = target.transform
191191

192-
/datum/atom_hud/alternate_appearance/basic/human_unconscious_hud/mobShouldSee(mob/M)
192+
/datum/atom_hud/alternate_appearance/basic/unconscious_obscurity/mobShouldSee(mob/M)
193193
return FALSE // this hud is managed manually, so don't show it generically

code/modules/mob/living/basic/revolutionary.dm

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@
108108
shuffle_inplace(causes)
109109
desc += span_notice("#[pick(causes)].")
110110

111+
/mob/living/basic/revolutionary/init_unconscious_appearance()
112+
add_generic_humanoid_static_appearance()
111113

112114
/obj/effect/mob_spawn/corpse/human/revolutionary
113115
name = "Revolutionary"

code/modules/mob/living/basic/ruin_defender/skeleton.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
var/list/foods_list = good_drinks + bad_drinks
5757
ai_controller?.set_blackboard_key(BB_BASIC_FOODS, typecacheof(foods_list))
5858

59+
/mob/living/basic/skeleton/init_unconscious_appearance()
60+
add_generic_humanoid_static_appearance()
61+
5962
/mob/living/basic/skeleton/settler
6063
name = "undead settler"
6164
desc = "The reanimated remains of some poor settler."

code/modules/mob/living/basic/ruin_defender/wizard/wizard.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,9 @@
9090
fake_blood_type = random_human_blood_type()
9191
return find_blood_type(fake_blood_type)
9292

93+
/mob/living/basic/wizard/init_unconscious_appearance()
94+
add_generic_humanoid_static_appearance()
95+
9396
/// Uses the colors and loadout of the original wizard simplemob
9497
/mob/living/basic/wizard/classic
9598
selected_outfit = /obj/effect/mob_spawn/corpse/human/wizard

code/modules/mob/living/basic/space_fauna/cat_surgeon.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@
5151
fake_blood_type = random_human_blood_type()
5252
return find_blood_type(fake_blood_type)
5353

54+
/mob/living/basic/cat_butcherer/init_unconscious_appearance()
55+
add_generic_humanoid_static_appearance()
56+
5457
/mob/living/basic/cat_butcherer/proc/after_attack(mob/living/basic/attacker, atom/target)
5558
SIGNAL_HANDLER
5659

code/modules/mob/living/basic/space_fauna/paper_wizard/paper_wizard.dm

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@
3535
grant_loot()
3636
AddElement(/datum/element/effect_trail, /obj/effect/temp_visual/paper_scatter)
3737

38+
/mob/living/basic/paper_wizard/init_unconscious_appearance()
39+
add_generic_humanoid_static_appearance()
40+
3841
/mob/living/basic/paper_wizard/proc/grant_abilities()
3942
var/static/list/innate_actions = list(
4043
/datum/action/cooldown/spell/conjure/wizard_summon_minions = BB_WIZARD_SUMMON_MINIONS,
@@ -175,4 +178,3 @@
175178
new /obj/effect/temp_visual/paper_scatter(current_turf)
176179
new /obj/item/clothing/suit/wizrobe/paper(current_turf)
177180
new /obj/item/clothing/head/collectable/paper(current_turf)
178-

code/modules/mob/living/basic/trader/trader.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@
5858
setup_shop.Grant(src)
5959
ai_controller.set_blackboard_key(BB_SETUP_SHOP, setup_shop)
6060

61+
/mob/living/basic/trader/init_unconscious_appearance()
62+
add_generic_humanoid_static_appearance()
63+
6164
/mob/living/basic/trader/mrbones
6265
name = "Mr. Bones"
6366
desc = "A skeleton merchant, he seems very humerus."

code/modules/mob/living/basic/trooper/trooper.dm

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,6 @@
4444
if(!fake_blood_type)
4545
fake_blood_type = random_human_blood_type()
4646
return find_blood_type(fake_blood_type)
47+
48+
/mob/living/basic/trooper/init_unconscious_appearance()
49+
add_generic_humanoid_static_appearance()

0 commit comments

Comments
 (0)