cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-01 21:13:47 +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. //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 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 //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(!slot) return 0
if(!M) 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() /obj/item/weapon/storage/internal/attack_hand()
return //make sure this is never picked up 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 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. //Helper procs to cleanly implement internal storages - storage items that provide inventory slots for other items.

4
code/modules/clothing/clothing.dm
View File

@@ -59,7 +59,7 @@
user.recalculate_vis() user.recalculate_vis()
//BS12: Species-restricted clothing check. //BS12: Species-restricted clothing check.
/obj/item/clothing/mob_can_equip(M as mob, slot, disable_warning = 0) /obj/item/clothing/mob_can_equip(M as mob, slot, disable_warning = FALSE)
//if we can't equip the item anyway, don't bother with species_restricted (cuts down on spam) //if we can't equip the item anyway, don't bother with species_restricted (cuts down on spam)
if (!..()) if (!..())
@@ -337,7 +337,7 @@
return return
*/ */
/obj/item/clothing/gloves/mob_can_equip(mob/user, slot, disable_warning = 0) /obj/item/clothing/gloves/mob_can_equip(mob/user, slot, disable_warning = FALSE)
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(slot && slot == slot_gloves) if(slot && slot == slot_gloves)

2
code/modules/clothing/gloves/arm_guards.dm
View File

@@ -7,7 +7,7 @@
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
drop_sound = 'sound/items/drop/metalshield.ogg' drop_sound = 'sound/items/drop/metalshield.ogg'
/obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) /obj/item/clothing/gloves/arm_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping. if(..()) //This will only run if no other problems occured when equiping.
if(H.wear_suit) if(H.wear_suit)
if(H.wear_suit.body_parts_covered & ARMS) if(H.wear_suit.body_parts_covered & ARMS)

2
code/modules/clothing/gloves/gauntlets.dm
View File

@@ -14,7 +14,7 @@
punch_force = 5 punch_force = 5
var/obj/item/clothing/gloves/gloves = null //Undergloves var/obj/item/clothing/gloves/gloves = null //Undergloves
/obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = 0) /obj/item/clothing/gloves/gauntlets/mob_can_equip(mob/user, slot, disable_warning = FALSE)
var/mob/living/carbon/human/H = user var/mob/living/carbon/human/H = user
if(H.gloves) if(H.gloves)
gloves = H.gloves gloves = H.gloves

2
code/modules/clothing/shoes/leg_guards.dm
View File

@@ -9,7 +9,7 @@
can_hold_knife = TRUE can_hold_knife = TRUE
drop_sound = 'sound/items/drop/boots.ogg' drop_sound = 'sound/items/drop/boots.ogg'
/obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) /obj/item/clothing/shoes/leg_guard/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping. if(..()) //This will only run if no other problems occured when equiping.
if(H.wear_suit) if(H.wear_suit)
if(H.wear_suit.body_parts_covered & LEGS) if(H.wear_suit.body_parts_covered & LEGS)

2
code/modules/clothing/suits/armor.dm
View File

@@ -9,7 +9,7 @@
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.6 siemens_coefficient = 0.6
/obj/item/clothing/suit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0) /obj/item/clothing/suit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
if(..()) //This will only run if no other problems occured when equiping. if(..()) //This will only run if no other problems occured when equiping.
for(var/obj/item/clothing/I in list(H.gloves, H.shoes)) for(var/obj/item/clothing/I in list(H.gloves, H.shoes))
if(I && (src.body_parts_covered & ARMS && I.body_parts_covered & ARMS) ) if(I && (src.body_parts_covered & ARMS && I.body_parts_covered & ARMS) )