mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-29 23:17:28 +01:00
Somemissingthings (#17615)
* cleans up some comments * ... * . * somemissing things * that too * make this nicer * . * .
This commit is contained in:
@@ -427,13 +427,13 @@
|
||||
if(user.client) user.client.screen |= src
|
||||
if(user.pulling == src) user.stop_pulling()
|
||||
if(("[slot]" in slot_flags_enumeration) && (slot_flags & slot_flags_enumeration["[slot]"]))
|
||||
if(equip_sound)
|
||||
if(equip_sound && !muffled_by_belly(user))
|
||||
playsound(src, equip_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
|
||||
else
|
||||
else if(!muffled_by_belly(user))
|
||||
playsound(src, drop_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
|
||||
else if(slot == slot_l_hand || slot == slot_r_hand)
|
||||
playsound(src, pickup_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
|
||||
return
|
||||
if(!muffled_by_belly(user))
|
||||
playsound(src, pickup_sound, 20, preference = /datum/preference/toggle/pickup_sounds)
|
||||
|
||||
/// Gives one of our item actions to a mob, when equipped to a certain slot
|
||||
/obj/item/proc/give_item_action(datum/action/action, mob/to_who, slot)
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
var/list/warned_of_possession //Checks to see who has been informed this item is possessed.
|
||||
|
||||
|
||||
/obj/item/proc/inhabit_item(var/mob/candidate, var/candidate_name, var/mob/living/candidate_original_form)
|
||||
/obj/item/proc/inhabit_item(var/mob/candidate, var/candidate_name, var/mob/living/candidate_original_form, var/is_item_tf = FALSE)
|
||||
//This makes it so that any object in the game can have something put in it like the cursed sword!
|
||||
//This means the proc can also be manually called by admin commands.
|
||||
//Handle moving the person into the object.
|
||||
@@ -25,3 +25,16 @@
|
||||
listening_objects |= src
|
||||
remove_verb(new_voice, /mob/living/voice/verb/change_name) //No changing your name! Bad!
|
||||
remove_verb(new_voice, /mob/living/voice/verb/hang_up) //Also you can't hang up. You are the item!
|
||||
src.item_tf_spawnpoint_used()
|
||||
// Let the inhabitor know what happened to them
|
||||
if(!istype(src, /obj/item/communicator) && is_item_tf)
|
||||
new_voice.item_tf = is_item_tf // allows items to use /me
|
||||
new_voice.emote_type = 1
|
||||
to_chat(new_voice,span_notice("You have become [src]!"))
|
||||
|
||||
/obj/item/proc/muffled_by_belly(var/mob/user)
|
||||
if(isbelly(user.loc))
|
||||
var/obj/belly/B = user.loc
|
||||
if(B.mode_flags & DM_FLAG_MUFFLEITEMS)
|
||||
return TRUE
|
||||
return FALSE
|
||||
|
||||
Reference in New Issue
Block a user