Skip to content

Commit

Permalink
Merge pull request #3397 from ARF-SS13/asterisk-dtf
Browse files Browse the repository at this point in the history
Adds *lewdintent
  • Loading branch information
Tk420634 authored Oct 13, 2023
2 parents 6873286 + cf5e995 commit a1b8450
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 0 deletions.
8 changes: 8 additions & 0 deletions code/modules/clothing/under/accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -908,3 +908,11 @@
name = "Cowboy Vest"
desc = "A white vest with black splotches. Yeehaw."
icon_state = "vest_sheriff"

/obj/item/clothing/accessory/heart
name = "frisky attitude"
desc = "You really do wear your heart on your sleeve, don't you?"
item_state = "heart"
icon_state = "heart"
minimize_when_attached = FALSE
item_flags = DROPDEL | ABSTRACT | HAND_ITEM
14 changes: 14 additions & 0 deletions code/modules/mob/living/carbon/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -572,3 +572,17 @@
key = "hairchew"
message = "chews on their bangs a little bit."

/datum/emote/living/carbon/lewdintent
key = "lewdintent"
restraint_check = TRUE

/datum/emote/living/carbon/lewdintent/run_emote(mob/user)
. = ..()
if(user.get_active_held_item())
to_chat(user, span_warning("Your active hand is full, you can't wear your sleeve on your shoulder! Don't ask why!"))
return
var/obj/item/clothing/accessory/heart/dtf = new(user)
if(user.put_in_active_hand(dtf))
to_chat(user, span_notice("You're ready to make it clear to others what it is you REALLY want!"))
else
qdel(dtf)
Binary file modified icons/mob/clothing/accessories.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/accessories.dmi
Binary file not shown.

0 comments on commit a1b8450

Please sign in to comment.