cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Also implementing /tg/station pr #40767

Browse Source
This commit is contained in:
Ghommie
2019-10-09 00:38:09 +02:00
parent 9c3e532be7
commit dac6fef57a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/_onclick/hud/screen_objects.dm
View File

@@ -157,7 +157,7 @@
var/image/item_overlay = image(holding) var/image/item_overlay = image(holding)
item_overlay.alpha = 92 item_overlay.alpha = 92
if(!user.can_equip(holding, slot_id, disable_warning = TRUE)) if(!user.can_equip(holding, slot_id, TRUE))
item_overlay.color = "#FF0000" item_overlay.color = "#FF0000"
else else
item_overlay.color = "#00ff00" item_overlay.color = "#00ff00"

4
code/game/objects/items.dm
View File

@@ -421,10 +421,10 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
//the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't. //the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't.
//if this is being done by a mob other than M, it will include the mob equipper, who is trying to equip the item to mob M. equipper will be null otherwise. //if this is being done by a mob other than M, it will include the mob equipper, who is trying to equip the item to mob M. equipper will be null otherwise.
//If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen. //If you are making custom procs but would like to retain partial or complete functionality of this one, include a 'return ..()' to where you want this to happen.
//Set disable_warning to 1 if you wish it to not give you outputs. //Set disable_warning to TRUE if you wish it to not give you outputs.
/obj/item/proc/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE) /obj/item/proc/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
if(!M) if(!M)
return 0 return FALSE
return M.can_equip(src, slot, disable_warning, bypass_equip_delay_self) return M.can_equip(src, slot, disable_warning, bypass_equip_delay_self)