Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594

[MIRROR] Adds knock off component
This commit is contained in:
deathride58
2017-12-21 03:25:41 +00:00
committed by GitHub
6 changed files with 62 additions and 4 deletions
+2
View File
@@ -406,6 +406,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
if(DROPDEL_1 & flags_1)
qdel(src)
in_inventory = FALSE
SendSignal(COMSIG_ITEM_DROPPED,user)
// called just as an item is picked up (loc is not yet changed)
/obj/item/proc/pickup(mob/user)
@@ -436,6 +437,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
var/datum/action/A = X
if(item_action_slot_check(slot, user)) //some items only give their actions buttons when in a specific slot.
A.Grant(user)
SendSignal(COMSIG_ITEM_EQUIPPED,user,slot)
in_inventory = TRUE
//sometimes we only want to grant the item's action if it's equipped in a specific slot.
+1
View File
@@ -129,6 +129,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
reagents.add_reagent_list(list_reagents)
if(starts_lit)
light()
AddComponent(/datum/component/knockoff,90,list("mouth"),list(slot_wear_mask))//90% to knock off when wearing a mask
/obj/item/clothing/mask/cigarette/Destroy()
STOP_PROCESSING(SSobj, src)