cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7882 from VOREStation/upstream-merge-7162

Browse Source 
[MIRROR] Fixes Runtime in ,: bad arg name 'disable_warning'
This commit is contained in:
Aronai Sieyes
2020-05-15 20:54:46 -04:00
committed by GitHub
parent 71271c0274 259e33da5d
commit 36aa031b1e
7 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -341,7 +341,7 @@ var/list/global/slot_flags_enumeration = list(
//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.
//Should probably move the bulk of this into mob code some time, as most of it is related to the definition of slots and not item-specific
/obj/item/proc/mob_can_equip(M as mob, slot, disable_warning = 0)
/obj/item/proc/mob_can_equip(M as mob, slot, disable_warning = FALSE)
if(!slot) return 0
if(!M) return 0

2
code/game/objects/items/weapons/storage/internal.dm
View File

@@ -18,7 +18,7 @@
/obj/item/weapon/storage/internal/attack_hand()
return //make sure this is never picked up
/obj/item/weapon/storage/internal/mob_can_equip(M as mob, slot, disable_warning = 0)
/obj/item/weapon/storage/internal/mob_can_equip(M as mob, slot, disable_warning = FALSE)
return 0 //make sure this is never picked up
//Helper procs to cleanly implement internal storages - storage items that provide inventory slots for other items.