From a0f35c5c46f30aa87f6114288d4fbb0f7a5e12e0 Mon Sep 17 00:00:00 2001 From: "noisomehollow@lycos.com" Date: Fri, 3 Dec 2010 22:07:45 +0000 Subject: [PATCH] Cleaned up a few lines of clothing code. Rig suits will now properly slow you down (a little less than a regular space suit), hotrod. Bio suits will also slow you down, as per fire suits. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@528 316c924e-a436-60f5-8080-3fe189b3f50e --- code/defines/obj/clothing.dm | 10 ++-------- code/modules/mob/living/carbon/human/human.dm | 7 +++++++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/code/defines/obj/clothing.dm b/code/defines/obj/clothing.dm index 0dc98dfc3ba..a63d35a694f 100644 --- a/code/defines/obj/clothing.dm +++ b/code/defines/obj/clothing.dm @@ -195,7 +195,6 @@ icon_state = "pwig" item_state = "pwig" - /obj/item/clothing/head/that name = "hat" desc = "An amish looking hat" @@ -208,7 +207,7 @@ icon_state = "wizard" /obj/item/clothing/head/wizard/red - name = "wizard hat" + name = "red wizard hat" desc = "Strange-looking, red, hat-wear that most certainly belongs to a real magic user." icon_state = "redwizard" @@ -566,14 +565,10 @@ body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /obj/item/clothing/suit/wizrobe/red - name = "wizard robe" + name = "red wizard robe" desc = "A magnificant, red, gem-lined robe that seems to radiate power." icon_state = "redwizard" item_state = "redwizrobe" - gas_transfer_coefficient = 0.01 // IT'S MAGICAL OKAY JEEZ +1 TO NOT DIE - permeability_coefficient = 0.01 - heat_transfer_coefficient = 0.01 - body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS /obj/item/clothing/suit/wizrobe_fake name = "wizard robe" @@ -700,7 +695,6 @@ desc = "A special suit that protects against hazardous, low pressure environments." icon_state = "rig" item_state = "rig_suit" - w_class = 4//bulky item /obj/item/clothing/suit/space/syndicate name = "red space suit" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 32201d591c1..6366948f92e 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -131,9 +131,16 @@ tally += 1.3 if(/obj/item/clothing/suit/fire/heavy) // firesuits slow you down a bit tally += 1.7 + if(/obj/item/clothing/suit/bio_suit) // biosuits slow you down a bit + tally += 1.3 + if(/obj/item/clothing/suit/bio_suit/plaguedoctorsuit) // biosuits slow you down a bit + tally += 1.3 if(/obj/item/clothing/suit/space) if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space tally += 3 + if(/obj/item/clothing/suit/space/rig) + if(!istype(src.loc, /turf/space)) // space suits slow you down a bit unless in space + tally += 2 if (istype(src.shoes, /obj/item/clothing/shoes)) if (src.shoes.chained)