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

[MIRROR] Adds non-clothing item equipping others feedback messages [MDB IGNORE] (#19881)

Browse Source 
* Adds non-clothing item equipping others feedback messages (#73982)

## About The Pull Request
Things like pens weren't giving any feedback messages when you put them
on someone else, and I ran into this while working on another PR so I've
dealt with that

Renames `worn_dangerous` to `show_visible_message` as it was only used
to confirm if there would be visible messages or not
The `DANGEROUS_OBJECT` clothing flag is a trait now, so it can be put on
non-clothing items too
Removing non-clothing items from someone has been unchanged.

## Why It's Good For The Game
People should be able to identify that someone is putting something on
them, and recognize what that is if they pay attention.
This means that a player cannot reverse pickpocket a grenade onto
someone else without giving any indication of doing so

## Changelog

🆑
balance: Putting a non-clothing item onto someone else creates a visible
message the same way a clothing item would.
/🆑

* Adds non-clothing item equipping others feedback messages

---------

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-25 23:28:13 -07:00
committed by GitHub
co-authored by ArcaneDefence
parent 715f0557a7
commit dbb6c5fba4
7 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+3 -4
View File
@@ -1610,11 +1610,10 @@ GLOBAL_DATUM_INIT(fire_overlay, /mutable_appearance, mutable_appearance('icons/e
* This proc calls at the begining of anytime an item is being equiped to a target by another mob.
* It handles initial messages, AFK stripping, and initial logging.
*/
/obj/item/proc/item_start_equip(atom/target, obj/item/equipping, mob/user, warn_dangerous = TRUE)
/obj/item/proc/item_start_equip(atom/target, obj/item/equipping, mob/user, show_visible_message = TRUE)
if(warn_dangerous && isclothing(equipping))
var/obj/item/clothing/clothing = equipping
if(clothing.clothing_flags & DANGEROUS_OBJECT)
if(show_visible_message)
if(HAS_TRAIT(equipping, TRAIT_DANGEROUS_OBJECT))
target.visible_message(
span_danger("[user] tries to put [equipping] on [target]."),
span_userdanger("[user] tries to put [equipping] on you."),