cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-14 16:43:05 +01: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
code/modules/vore/appearance/sprite_accessories_taur_vr.dm
+7
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)"
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+8 -33
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
code/modules/vore/fluffstuff/custom_items_vr.dm
+3 -5
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