cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-31 11:22:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3634 from VOREStation/aro-taur_suits_must_die

Browse Source 
Removes taur suits
This commit is contained in:
Aronai Sieyes
2018-05-08 19:09:29 -04:00
committed by GitHub
parent f2dae552f8 c4cbe31199
commit 86e413bf00
28 changed files with 5486 additions and 1381 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
code/modules/clothing/clothing_vr.dm
View File

@@ -99,11 +99,33 @@
)
//"Spider" = 'icons/mob/species/spider/mask_vr.dmi' Add this later when they have custom mask sprites and everything.
//Switch to taur sprites if a taur equips
/obj/item/clothing/suit
var/taurized = FALSE //Easier than trying to 'compare icons' to see if it's a taur suit
/obj/item/clothing/suit/equipped(var/mob/user, var/slot)
var/normalize = TRUE
//Pyramid of doom-y. Improve somehow?
if(!taurized && slot == slot_wear_suit && ishuman(user))
var/mob/living/carbon/human/H = user
if(isTaurTail(H.tail_style))
var/datum/sprite_accessory/tail/taur/taurtail = H.tail_style
if(taurtail.suit_sprites && (get_worn_icon_state(slot_wear_suit_str) in icon_states(taurtail.suit_sprites)))
icon_override = taurtail.suit_sprites
normalize = FALSE
taurized = TRUE
if(normalize && taurized)
icon_override = initial(icon_override)
taurized = FALSE
return ..()
// Taur suits need to be shifted so its centered on their taur half.
// TODO - Instead of just assuming this junk, shift some of the data onto the taur tail datum.
/obj/item/clothing/suit/make_worn_icon(var/body_type,var/slot_name,var/inhands,var/default_icon,var/default_layer = 0)
var/image/standing = ..()
if(icon_override && icon_override == 'icons/mob/taursuits_vr.dmi')
if(taurized) //Special snowflake var on suits
standing.pixel_x = -16
standing.layer = BODY_LAYER + 15 // 15 is above tail layer, so will not be covered by taurbody.
return standing

294
code/modules/clothing/spacesuits/rig/rig_pieces_vr.dm
View File

@@ -32,300 +32,6 @@
SPECIES_VOX = 'icons/mob/species/vox/suit.dmi'
)
/obj/item/clothing/suit/space/rig
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(icon_state == "security_rig_sealed")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-horse_sealed" //They have to toggle the chest piece off then on again for this to show up.
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "security_rig_sealed"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "engineering_rig_sealed")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "engineering_rig_sealed"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "science_rig_sealed")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "science_rig_sealed"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "medical_rig_sealed")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "medical_rig_sealed"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "security_rig")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "breacher_rig_cheap-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "security_rig"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "engineering_rig")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "industrial_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "engineering_rig"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "science_rig")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-wolf_sealed"
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "science_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "science_rig"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "medical_rig")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "medical_rig"
pixel_x = 0
update_icon()
return 1
else
return 1
/obj/item/clothing/suit/space/rig/ce
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(icon_state == "ce_rig")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-naga"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "ce_rig"
pixel_x = 0
update_icon()
return 1
else if(icon_state == "ce_rig_sealed")
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-horse_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-wolf_sealed"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "ce_rig-naga_sealed"
pixel_x = -16
update_icon()
return 1
else
icon = 'icons/obj/clothing/suits.dmi'
icon_override = null
icon_state = "ce_rig_sealed"
pixel_x = 0
update_icon()
return 1
else
return 1
/obj/item/clothing/head/helmet/space/rig
phoronproof = 1
/obj/item/clothing/gloves/gauntlets/rig

295
code/modules/clothing/spacesuits/void/void_vr.dm
View File

@@ -73,298 +73,3 @@
// This variable is normally used to set the icon_override when the suit is refitted,
// however the species spritesheet now means we no longer need that anyway!
sprite_sheets_refit = list()
/obj/item/clothing/suit/space/void/merc/taur
name = "taur specific blood-red voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "syndie-horse"
item_state = "syndie-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "syndie-wolf"
item_state = "syndie-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "syndie-naga"
item_state = "syndie-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/medical/taur
name = "taur specific medical voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical-horse"
item_state = "medical-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical-wolf"
item_state = "medical-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medical-naga"
item_state = "medical-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/medical/alt/taur
name = "taur specific streamlined medical voidsuit"
desc = "A more recent model of Vey-Med voidsuit, featuring the latest in radiation shielding technology. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medicalalt-horse"
item_state = "medicalalt-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medicalalt-wolf"
item_state = "medicalalt-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "medicalalt-naga"
item_state = "medicalalt-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/engineering/taur
name = "taur specific engineering voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "engineering-horse"
item_state = "engineering-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "engineering-wolf"
item_state = "engineering-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "engineering-naga"
item_state = "engineering-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/security/taur
name = "taur specific security voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "security-horse"
item_state = "security-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "security-wolf"
item_state = "security-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "security-naga"
item_state = "security-naga"
pixel_x = -16
update_icon()
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/security/alt/taur
name = "taur specific riot security voidsuit"
desc = "A heavily armored voidsuit. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
armor = list(melee = 70, bullet = 20, laser = 30, energy = 5, bomb = 35, bio = 100, rad = 10)
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityalt-horse"
item_state = "securityalt-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityalt-wolf"
item_state = "securityalt-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityalt-naga"
item_state = "securityalt-naga"
pixel_x = -16
update_icon()
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/security/riot/taur
name = "taur specific crowd control voidsuit"
desc = "A high-tech space suit. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityriot-horse"
item_state = "securityriot-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityriot-wolf"
item_state = "securityriot-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "securityriot-naga"
item_state = "securityriot-naga"
pixel_x = -16
update_icon()
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/atmos/taur
name = "taur specific atmospherics voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "atmos-horse"
item_state = "atmos-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "atmos-wolf"
item_state = "atmos-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "atmos-naga"
item_state = "atmos-naga"
pixel_x = -16
update_icon()
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/suit/space/void/mining/taur
name = "taur specific mining voidsuit"
desc = "A high-tech space suit. It says has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "mining-horse"
item_state = "mining-horse"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "mining-wolf"
item_state = "mining-wolf"
pixel_x = -16
update_icon()
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "mining-naga"
item_state = "mining-naga"
pixel_x = -16
update_icon()
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0

11
code/modules/clothing/suits/armor_vr.dm
View File

@@ -16,20 +16,15 @@
name = "wolf-taur armor vest"
desc = "An armored vest that protects against some damage. It appears to be created for a wolf-taur."
species_restricted = null //Species restricted since all it cares about is a taur half
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "heavy_wolf_armor"
item_state = "heavy_wolf_armor"
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "serdy_armor") //This is to prevent Serdy's custom armor from turning into heavy_wolf_armor
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi' //Just in case
icon_state = "heavy_wolf_armor" //Just in case
pixel_x = -16
return ..()
else
H << "<span class='warning'>You need to have a wolf-taur half to wear this.</span>"
to_chat(H,"<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
return 0
// HoS armor improved by Vorestation to be slightly better than normal security stuff.

101
code/modules/clothing/suits/bio_vr.dm
View File

@@ -1,101 +0,0 @@
//Biosuits for use with taurs (Currently only nagas)
//Virology biosuit, green stripe
/obj/item/clothing/suit/bio_suit/virology/taur
name = "taur specific bio suit"
desc = "A suit that protects against biological contamination. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bioviro-naga"
item_state = "bioviro-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
//Security biosuit, grey with red stripe across the chest
/obj/item/clothing/suit/bio_suit/security/taur
name = "taur specific bio suit"
desc = "A suit that protects against biological contamination. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "biosec-naga"
item_state = "biosec-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
//Janitor's biosuit, grey with purple arms
/obj/item/clothing/suit/bio_suit/janitor/taur
name = "taur specific bio suit"
desc = "A suit that protects against biological contamination. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "biojan-naga"
item_state = "biojan-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
//Scientist's biosuit, white with a pink-ish hue
/obj/item/clothing/suit/bio_suit/scientist/taur
name = "taur specific bio suit"
desc = "A suit that protects against biological contamination. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "biosci-naga"
item_state = "biosci-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
//CMO's biosuit, blue stripe
/obj/item/clothing/suit/bio_suit/cmo/taur
name = "taur specific bio suit"
desc = "A suit that protects against biological contamination. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS
flags_inv = HIDEGLOVES|HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null //Species restricted since all it cares about is a taur half
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "biocmo-naga"
item_state = "biocmo-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0

127
code/modules/clothing/suits/utility_vr.dm
View File

@@ -1,130 +1,3 @@
/*
* Contains:
* Bomb protection
* Radiation protection
*/
/*
* Bomb protection
*/
/obj/item/clothing/suit/bomb_suit/taur
name = "taur specific bomb suit"
desc = "A suit designed for safety when handling explosives. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.01
permeability_coefficient = 0.01
slowdown = 2
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 100, bio = 0, rad = 0)
flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
heat_protection = UPPER_TORSO|LOWER_TORSO
max_heat_protection_temperature = ARMOR_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-horse"
item_state = "bombsuit-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-wolf"
item_state = "bombsuit-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-naga"
item_state = "bombsuit-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/obj/item/clothing/head/bomb_hood/security
icon_state = "bombsuitsec"
body_parts_covered = HEAD
/obj/item/clothing/suit/bomb_suit/taur/security
allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs)
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|FEET|ARMS|HANDS
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-horse"
item_state = "bombsuit-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-wolf"
item_state = "bombsuit-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "bombsuit-naga"
item_state = "bombsuit-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0
/*
* Radiation protection
*/
/obj/item/clothing/suit/radiation/taur
name = "taur specific radiation suit"
desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation. It has a sticker saying one size fits all taurs on it. Below the sticker, it states that it only fits horses, wolves, and naga taurs."
w_class = ITEMSIZE_LARGE//bulky item
gas_transfer_coefficient = 0.90
permeability_coefficient = 0.50
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET
allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank/emergency/oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas)
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100)
flags_inv = HIDEJUMPSUIT|HIDETAIL|HIDETIE|HIDEHOLSTER
species_restricted = null
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/horse))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "radsuit-horse"
item_state = "radsuit-horse"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "radsuit-wolf"
item_state = "radsuit-wolf"
pixel_x = -16
return 1
else if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/naga))
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "radsuit-naga"
item_state = "radsuit-naga"
pixel_x = -16
return 1
else
H << "<span class='warning'>You need to have a horse, wolf, or naga half to wear this.</span>"
return 0

7
code/modules/vore/appearance/sprite_accessories_taur_vr.dm
View File

@@ -105,6 +105,8 @@
do_colouration = 1 // Yes color, using tail color
color_blend_mode = ICON_MULTIPLY // The sprites for taurs are designed for ICON_MULTIPLY
var/icon/suit_sprites = null //File for suit sprites, if any.
//Could do nested lists but it started becoming a nightmare. It'd be more fun for lookups of a_intent and m_intent, but then subtypes need to
//duplicate all the messages, and it starts getting awkward. These are singletons, anyway!
@@ -142,6 +144,7 @@
/datum/sprite_accessory/tail/taur/wolf
name = "Wolf (Taur)"
icon_state = "wolf_s"
suit_sprites = 'icons/mob/taursuits_wolf_vr.dmi'
/datum/sprite_accessory/tail/taur/wolf/wolf_2c
name = "Wolf dual-color (Taur)"
@@ -156,6 +159,7 @@
/datum/sprite_accessory/tail/taur/naga
name = "Naga (Taur)"
icon_state = "naga_s"
suit_sprites = 'icons/mob/taursuits_naga_vr.dmi'
msg_owner_help_walk = "You carefully slither around %prey."
msg_prey_help_walk = "%owner's huge tail slithers past beside you!"
@@ -192,6 +196,7 @@
/datum/sprite_accessory/tail/taur/horse
name = "Horse (Taur)"
icon_state = "horse_s"
suit_sprites = 'icons/mob/taursuits_horse_vr.dmi'
msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!"
msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!"
@@ -216,6 +221,7 @@
/datum/sprite_accessory/tail/taur/cow
name = "Cow (Taur)"
icon_state = "cow_s"
suit_sprites = 'icons/mob/taursuits_cow_vr.dmi'
msg_owner_disarm_run = "You quickly push %prey to the ground with your hoof!"
msg_prey_disarm_run = "%owner pushes you down to the ground with their hoof!"
@@ -255,6 +261,7 @@
/datum/sprite_accessory/tail/taur/lizard
name = "Lizard (Taur)"
icon_state = "lizard_s"
suit_sprites = 'icons/mob/taursuits_lizard_vr.dmi'
/datum/sprite_accessory/tail/taur/lizard/lizard_2c
name = "Lizard dual-color (Taur)"

41
code/modules/vore/fluffstuff/custom_clothes_vr.dm
View File

@@ -1313,18 +1313,13 @@ Departamental Swimsuits, for general use
/obj/item/clothing/suit/storage/hooded/wintercoat/jessie
name = "Handmade Winter Suit"
desc = "A durable, but somewhat ragged lower portion of a snow suit fitted for a wolftaur."
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "jessiecoat"
item_state = "jessiecoat"
/obj/item/clothing/suit/storage/hooded/wintercoat/jessie/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "jessiecoat")
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "jessiecoat"
pixel_x = -16
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
@@ -1335,19 +1330,13 @@ Departamental Swimsuits, for general use
name = "Kat's Fox Taur Armor"
desc = "A set of security armor, light weight and easy to run in for a Taur, this item protects the \
entire body."
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon = 'icons/mob/taursuits_wolf_vr.dmi'
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)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "katesuit")
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "katesuit"
pixel_x = -16
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
@@ -1359,25 +1348,12 @@ Departamental Swimsuits, for general use
desc = "Taur engineering voidsuit. Recolored navy blue and white. Slightly tweaked as well to \
get close to having security voidsuit protection as possible with a slight reduction in movement \
speed to compensate for custom padding and armor Kateryna made herself."
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "lilithsuit"
item_state = "lilithsuit"
species_restricted = null
armor = list(melee = 40, bullet = 20, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
/obj/item/clothing/suit/space/void/engineering/kate/mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..())
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
if(icon_state == "lilithsuit")
return ..()
icon_override = 'icons/mob/taursuits_vr.dmi'
icon_state = "lilithsuit"
pixel_x = -16
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
return 0
//samanthafyre:Kateryna Petrovitch
/obj/item/clothing/head/helmet/space/fluff/kate
name = "Kat's Navy Engineer Helmet"
@@ -1785,17 +1761,16 @@ Departamental Swimsuits, for general use
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
desc = "A series of armor plates painted black, deployed from a back-mounted module. They fit smoothly over the unit's armor plates and projects a skintight bubble shield over the unit's uncovered parts. Faceplate and coolant unit not included."
species_restricted = null
icon = 'icons/mob/taursuits_vr.dmi'
icon_override = 'icons/mob/taursuits_vr.dmi'
icon = 'icons/mob/taursuits_lizard_vr.dmi'
icon_state = "hasd_suit"
item_state = "hasd_suit"
pixel_x = -16
mob_can_equip(var/mob/living/carbon/human/H, slot, disable_warning = 0)
if(..() && istype(H) && H.ckey == "silencedmp5a5" && istype(H.tail_style, /datum/sprite_accessory/tail/taur/lizard/synthlizard))
if(..() && istype(H) && H.ckey == "silencedmp5a5")
return 1
else
H << "<span class='warning'>This suit is not designed for you.</span>"
to_chat(H,"<span class='warning'>This suit is not designed for you.</span>")
return 0
//Zigfe:Zaoozaoo Xrimxuqmqixzix

8
code/modules/vore/fluffstuff/custom_items_vr.dm
View File

@@ -355,15 +355,13 @@
name = "KSS-8 security armor"
desc = "A set of armor made from pieces of many other armors. There are two orange holobadges on it, one on the chestplate, one on the steel flank plates. The holobadges appear to be russian in origin. 'Kosmicheskaya Stantsiya-8' is printed in faded white letters on one side, along the spine. It smells strongly of dog."
species_restricted = null //Species restricted since all it cares about is a taur half
icon_override = 'icons/mob/taursuits_vr.dmi' //Needs to be this since it's 64*32
icon = 'icons/mob/taursuits_wolf_vr.dmi'
icon_state = "serdy_armor"
item_state = "serdy_armor"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|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)
if(istype(H) && istype(H.tail_style, /datum/sprite_accessory/tail/taur/wolf))
icon_override = 'icons/mob/taursuits_vr.dmi' //Just in case
icon_state = "serdy_armor" //Just in case
pixel_x = -16
return ..()
else
to_chat(H, "<span class='warning'>You need to have a wolf-taur half to wear this.</span>")
@@ -1977,7 +1975,7 @@
icon_state = "modkit"
from_helmet = /obj/item/clothing/head/helmet/space/void/security
from_suit = /obj/item/clothing/suit/space/void/security/taur
from_suit = /obj/item/clothing/suit/space/void/security
to_helmet = /obj/item/clothing/head/helmet/space/void/security/hasd
to_suit = /obj/item/clothing/suit/space/void/security/hasd