cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Magboot and glove fix (#19415)

Browse Source 
* Magboot and glove fix

* Update armblade.dm

* Update leash.dm
This commit is contained in:
Cameron Lennox
2026-04-16 10:40:31 -04:00
committed by GitHub
parent bdffa69343
commit 51b00a200c
86 changed files with 278 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/armor.dm
+2 -2
View File
@@ -11,7 +11,7 @@
siemens_coefficient = 0.6
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
/obj/item/clothing/suit/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..()) //This will only run if no other problems occured when equiping.
for(var/obj/item/clothing/I in list(H.gloves, H.shoes))
if(I && (src.body_parts_covered & ARMS && I.body_parts_covered & ARMS) )
@@ -538,7 +538,7 @@
|ACCESSORY_SLOT_ARMOR_M)
blood_overlay_type = "armor"
/obj/item/clothing/suit/armor/pcarrier/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = FALSE)
/obj/item/clothing/suit/armor/pcarrier/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..()) //This will only run if no other problems occured when equiping.
if(H.gloves)
if(H.gloves.body_parts_covered & ARMS)
code/modules/clothing/suits/armor_vr.dm
+1 -1
View File
@@ -19,7 +19,7 @@
icon_state = "wolf_item"
item_state = "heavy_wolf_armor"
/obj/item/clothing/suit/armor/vest/wolftaur/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/armor/vest/wolftaur/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
code/modules/clothing/suits/lasertag.dm
+1 -1
View File
@@ -89,7 +89,7 @@
else
user.visible_message(span_notice("[src]'s healing function has been turned off!"))
/obj/item/clothing/suit/lasertag/dropped()
/obj/item/clothing/suit/lasertag/dropped(mob/user, equipping, slot)
..()
STOP_PROCESSING(SSobj, src)
visible_message(span_notice("[src] is unequipped, its health going back to full!"))
code/modules/clothing/suits/miscellaneous_vr.dm
+2 -2
View File
@@ -30,7 +30,7 @@
body_parts_covered = UPPER_TORSO|ARMS
pixel_x = -16
/obj/item/clothing/suit/drake_cloak/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/drake_cloak/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/drake))
return ..()
@@ -47,7 +47,7 @@
pixel_x = -16
armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 5, bio = 0, rad = 0)//Minor armor for fluff.
/obj/item/clothing/suit/barding/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/barding/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
return ..()
code/modules/clothing/suits/shibari.dm
+1 -1
View File
@@ -58,7 +58,7 @@
if(user.hud_used && user.hud_used.move_intent)
user.hud_used.move_intent.icon_state = "walking"
/obj/item/clothing/suit/shibari/dropped(var/mob/living/user)
/obj/item/clothing/suit/shibari/dropped(mob/user, equipping, slot)
..()
if(ishuman(user))
var/mob/living/carbon/human/H = user