cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-13 16:13:49 +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/vore/fluffstuff/custom_clothes_vr.dm
+17 -18
View File
@@ -502,7 +502,7 @@
species_restricted = null
/obj/item/clothing/head/helmet/space/void/engineering/hazmat/fluff/screehelm/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/head/helmet/space/void/engineering/hazmat/fluff/screehelm/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "scree")
to_chat(H, span_warning("Your face and whoever is meant for this helmet are too different."))
@@ -524,7 +524,7 @@
species_restricted = null
/obj/item/clothing/suit/space/void/engineering/hazmat/fluff/screespess/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/space/void/engineering/hazmat/fluff/screespess/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "scree")
to_chat(H, span_warning("The gloves only have three fingers, not to mention the accommodation for extra limbs."))
@@ -556,7 +556,7 @@
slot_head_str = 'icons/vore/custom_onmob_32x48_vr.dmi'
)
/obj/item/clothing/head/fluff/avida/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/head/fluff/avida/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
var/static/list/allowed_ear_names = list("Bnnuy Ears", "Bnnuy Ears 2")
//check if wearer's ear sprite is compatible with trimmed icon
@@ -577,7 +577,7 @@
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
item_state_slots = list(slot_r_hand_str = "alurane-vines_r", slot_l_hand_str = "alurane-vines_l")
/obj/item/clothing/under/fluff/aluranevines/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/under/fluff/aluranevines/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "natje")
to_chat(H, span_warning("Wrapping vines around yourself is a quite an... Odd idea. You decide otherwise."))
@@ -719,7 +719,7 @@
light_overlay = "helmet_light"
/obj/item/clothing/head/helmet/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/head/helmet/space/fluff/joan/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "joanrisu")
to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit."))
@@ -745,7 +745,7 @@
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
/obj/item/clothing/suit/space/fluff/joan/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/space/fluff/joan/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "joanrisu")
to_chat(H, span_warning("You try to fit into the suit, to no avail."))
@@ -1150,7 +1150,7 @@ Departamental Swimsuits, for general use
icon = 'icons/mob/taursuits_wolf.dmi'
icon_state = "jessiecoat"
/obj/item/clothing/suit/storage/hooded/wintercoat/jessie/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/storage/hooded/wintercoat/jessie/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 ..()
@@ -1167,7 +1167,7 @@ Departamental Swimsuits, for general use
icon_state = "katesuit"
item_state_slots = null
/obj/item/clothing/suit/armor/vest/wolftaur/kate/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/armor/vest/wolftaur/kate/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 ..()
@@ -1197,7 +1197,7 @@ Departamental Swimsuits, for general use
light_overlay = "helmet_light"
species_restricted = null
/obj/item/clothing/head/helmet/space/fluff/kate/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/head/helmet/space/fluff/kate/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "samanthafyre")
to_chat(H, span_warning("You try to fit on the helmet, but it doesn't fit."))
@@ -1521,7 +1521,7 @@ Departamental Swimsuits, for general use
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
species_restricted = null
/obj/item/clothing/head/helmet/space/void/security/hasd/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/head/helmet/space/void/security/hasd/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "silencedmp5a5")
to_chat(H, span_warning("...The faceplate is clearly not made for your anatomy, thus, does not fit."))
@@ -1538,7 +1538,7 @@ Departamental Swimsuits, for general use
icon_state = "hasd_suit"
pixel_x = -16
/obj/item/clothing/suit/space/void/security/hasd/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/space/void/security/hasd/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..() && istype(H) && H.ckey == "silencedmp5a5")
return 1
else
@@ -1649,12 +1649,11 @@ Departamental Swimsuits, for general use
species_restricted = list("exclude", SPECIES_TESHARI)
/obj/item/clothing/under/fluff/slime_skeleton/mob_can_equip(M as mob, slot, disable_warning = FALSE)
/obj/item/clothing/under/fluff/slime_skeleton/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(!..())
return 0
if(ishuman(M))
var/mob/living/carbon/human/H = M
if(ishuman(H))
if(!(H.get_species() == SPECIES_PROMETHEAN)) //Only wearable by slimes, since species_restricted actually checks bodytype, not species
return 0
@@ -1704,7 +1703,7 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_clothes_mob.dmi'
update_clothing_icon()
/obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip/dropped()
/obj/item/clothing/accessory/poncho/roles/cloak/hop/fluff/pip/dropped(mob/user, equipping, slot)
..()
icon_override = 'icons/vore/custom_clothes_mob.dmi'
@@ -1781,7 +1780,7 @@ Departamental Swimsuits, for general use
icon_state = "nikki_outfit"
sensor_mode = 3 // I'm a dumbass and forget these all the time please understand :(
/obj/item/clothing/under/skirt/outfit/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0)
/obj/item/clothing/under/skirt/outfit/fluff/nikki/mob_can_equip(mob/living/carbon/human/M, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if (M.ckey == "ryumi")
return 1
@@ -1796,7 +1795,7 @@ Departamental Swimsuits, for general use
default_worn_icon = 'icons/vore/custom_clothes_mob.dmi'
icon_state = "nikki_boots"
/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0)
/obj/item/clothing/shoes/fluff/nikki/mob_can_equip(mob/living/carbon/human/M, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if (M.ckey == "ryumi")
return 1
@@ -2055,7 +2054,7 @@ Departamental Swimsuits, for general use
icon_override = 'icons/vore/custom_clothes_mob.dmi'
update_clothing_icon()
/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped(mob/user)
/obj/item/clothing/accessory/poncho/roles/cloak/fluff/cloakglowing/dropped(mob/user, equipping, slot)
..()
icon_override = 'icons/vore/custom_clothes_mob.dmi'
code/modules/vore/fluffstuff/custom_items_vr.dm
+11 -12
View File
@@ -458,7 +458,7 @@
item_state = "serdy_armor"
body_parts_covered = CHEST|LEGS|ARMS //It's a full body suit, minus hands and feet. Arms and legs should be protected, not just the torso. Retains normal security armor values still.
/obj/item/clothing/suit/armor/vest/wolftaur/serdy/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/suit/armor/vest/wolftaur/serdy/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
return ..()
else
@@ -1000,12 +1000,11 @@
else
set_light(0)
/obj/item/melee/baton/fluff/stunstaff/dropped(mob/user)
/obj/item/melee/baton/fluff/stunstaff/dropped(mob/user, equipping, slot)
..()
if(wielded)
wielded = 0
spawn(0)
update_held_icon()
wielded = FALSE
update_held_icon()
/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user)
. = ..(user)
@@ -1119,7 +1118,7 @@
allowed = list(/obj/item/shield/fluff/wolfgirlshield)
damtype = HALLOSS
/obj/item/melee/fluffstuff/wolfgirlsword/dropped(mob/user)
/obj/item/melee/fluffstuff/wolfgirlsword/dropped(mob/user, equipping, slot)
..()
if(!istype(loc,/mob))
deactivate(user)
@@ -1215,7 +1214,7 @@
icon_override = 'icons/vore/custom_clothes_vr.dmi'
icon_state = "tiemgogs"
/obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/clothing/glasses/welding/tiemgogs/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "radiantaurora")
to_chat(H, span_warning("These don't look like they were made to fit you..."))
@@ -1255,12 +1254,12 @@
return
..()
/obj/item/rig/nikki/mob_can_equip(var/mob/living/carbon/human/M, slot, disable_warning = 0) // Feel free to (try to) put Nikki's hat on! The necklace though is a flat-out no-go.
/obj/item/rig/nikki/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE) // Feel free to (try to) put Nikki's hat on! The necklace though is a flat-out no-go.
if(..())
if (M.ckey == "ryumi")
if(H.ckey == "ryumi")
return 1
else if (M.get_active_hand() == src)
to_chat(M, span_warning("For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit."))
else if (H.get_active_hand() == src)
to_chat(H, span_warning("For some reason, the necklace seems to never quite get past your head when you try to put it on... Weird, it looked like it would fit."))
return 0
//Nickcrazy - Damon Bones Xrim
@@ -1641,7 +1640,7 @@
slot_flags = SLOT_MASK | SLOT_OCLOTHING
replacementType = /obj/item/remote_scene_tool/tally_doll
/obj/item/remote_scene_tool/tally_necklace/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
/obj/item/remote_scene_tool/tally_necklace/mob_can_equip(mob/living/carbon/human/H, slot, disable_warning = FALSE, ignore_obstruction, go_over_slot = FALSE)
if(..())
if(H.ckey != "bricker98")
if(!disable_warning)
code/modules/vore/resizing/holder_vr.dm
+2 -2
View File
@@ -1,5 +1,5 @@
/obj/item/holder/dropped(mob/user)
if (held_mob?.loc != src || isturf(loc))
/obj/item/holder/dropped(mob/user, equipping, slot)
if(held_mob?.loc != src || isturf(loc))
var/held = held_mob
dump_mob()
held_mob = held