Skip to content

Commit

Permalink
Fixes a typo causing caps to display contained items when not worn (#…
Browse files Browse the repository at this point in the history
…4689)

# About the pull request

<!-- Remove this text and explain what the purpose of your PR is.

Mention if you have tested your changes. If you changed a map, make sure
you used the mapmerge tool.
If this is an Issue Correction, you can type "Fixes Issue #169420" to
link the PR to the corresponding Issue number #169420.

Remember: something that is self-evident to you might not be to others.
Explain your rationale fully, even if you feel it goes without saying.
-->

A small oopsie made it so caps still displayed contained items when they
were held and not worn. This fixes that.

Thanks to joooks for reporting

# Explain why it's good for the game
Consistency


# Testing Photographs and Procedure
spawn in as SO, with mgoggles, switch between hand and equipped


# Changelog
:cl:
fix: Fixed caps displaying contained items on character even without
being worn.
/:cl:
  • Loading branch information
fira committed Oct 18, 2023
1 parent 9b655b5 commit 114fe8d
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions code/modules/clothing/head/head.dm
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,8 @@

/obj/item/clothing/head/cmcap/get_mob_overlay(mob/user_mob, slot)
var/image/return_image = ..()
if(!slot == WEAR_HEAD)
return
if(slot != WEAR_HEAD)
return return_image

if(length(pockets.contents) && (flags_marine_hat & HAT_GARB_OVERLAY))
for(var/obj/garb_object in pockets.contents)
Expand Down

0 comments on commit 114fe8d

Please sign in to comment.