From 4ce68ee286ace0acff036fbc30817929cb03b639 Mon Sep 17 00:00:00 2001 From: "vageyenaman@gmail.com" Date: Sat, 23 Jul 2011 06:44:33 +0000 Subject: [PATCH] Changed some descriptions up. Fixed a bug where you could not draw blood from anything. This has been fixed! (It was throwing a runtime error related to the virus2 system) You can't draw blood from Metroids though because they have no blood. Fixed some silly typo. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1909 316c924e-a436-60f5-8080-3fe189b3f50e --- code/WorkInProgress/Chemistry-Tools.dm | 6 ++++-- code/defines/obj/clothing/mask.dm | 14 +++++++------- code/defines/obj/clothing/shoes.dm | 5 +++-- code/defines/obj/clothing/suit.dm | 8 ++++---- code/game/objects/items/weapons/guns_new.dm | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/code/WorkInProgress/Chemistry-Tools.dm b/code/WorkInProgress/Chemistry-Tools.dm index 411c3c264b7..3ab32fe9360 100644 --- a/code/WorkInProgress/Chemistry-Tools.dm +++ b/code/WorkInProgress/Chemistry-Tools.dm @@ -850,7 +850,7 @@ return if(ismob(target))//Blood! - if(istype(src, /mob/living/carbon/metroid)) + if(istype(target, /mob/living/carbon/metroid)) user << "\red You are unable to locate any blood." return if(src.reagents.has_reagent("blood")) @@ -881,7 +881,9 @@ B.data["viruses"] += new D.type - B.data["virus2"] = T.virus2.getcopy() + if(B.data["virus2"]) + if(T.virus2) + B.data["virus2"] = T.virus2.getcopy() B.data["blood_DNA"] = copytext(T.dna.unique_enzymes,1,0) if(T.resistances&&T.resistances.len) diff --git a/code/defines/obj/clothing/mask.dm b/code/defines/obj/clothing/mask.dm index d1718d8089d..0128d2b20c7 100644 --- a/code/defines/obj/clothing/mask.dm +++ b/code/defines/obj/clothing/mask.dm @@ -84,7 +84,7 @@ /obj/item/clothing/mask/gas/emergency name = "emergency gas mask" - desc = "Gas mask mooks for emergencies." + desc = "A close-fitting mask that can filter some environmental toxins or be connected to an air supply." icon_state = "gas_alt" item_state = "gas_alt" @@ -111,19 +111,19 @@ /obj/item/clothing/mask/gas/clown_hat name = "clown wig and mask" - desc = "You're gay for even considering wearing this." + desc = "A true prankster's facial attire. A clown is incomplete without his wig and mask." icon_state = "clown" item_state = "clown_hat" /obj/item/clothing/mask/gas/sexyclown name = "sexy clown mask" - desc = "That face...." + desc = "A feminine clown mask for the dabbling crossdressers or female entertainers." icon_state = "sexyclown" item_state = "sexyclown" /obj/item/clothing/mask/gas/mime name = "mime mask" - desc = "It looks a little creepy" + desc = "The traditional mime's mask. It has an eerie facial posture." icon_state = "mime" item_state = "mime" @@ -146,7 +146,7 @@ /obj/item/clothing/mask/cigarette name = "Cigarette" - desc = "Tasty" + desc = "A roll of tobacco and nicotine." icon_state = "cigoff" var/lit = 0 var/icon_on = "cigon" //Note - these are in masks.dmi not in cigarette.dmi @@ -161,7 +161,7 @@ /obj/item/clothing/mask/cigarette/cigar name = "Premium Cigar" - desc = "Only for the best of space travelers." + desc = "A brown roll of tobacco and... well, you're not quite sure. This thing's huge!" icon_state = "cigaroff" icon_on = "cigaron" icon_off = "cigaroff" @@ -180,7 +180,7 @@ /obj/item/clothing/mask/cigarette/cigar/havanian name = "Premium Havanian Cigar" - desc = "Only the best for the best." + desc = "A cigar fit for only the best for the best." icon_state = "cigar2off" icon_on = "cigar2on" icon_off = "cigar2off" diff --git a/code/defines/obj/clothing/shoes.dm b/code/defines/obj/clothing/shoes.dm index c8e106f99c0..43b11d09e12 100644 --- a/code/defines/obj/clothing/shoes.dm +++ b/code/defines/obj/clothing/shoes.dm @@ -3,6 +3,7 @@ /obj/item/clothing/shoes name = "shoes" icon = 'shoes.dmi' + desc = "Comfortable-looking shoes." body_parts_covered = FEET @@ -80,7 +81,7 @@ // flags = NOSLIP //disabled by default /obj/item/clothing/shoes/clown_shoes - desc = "Damn, thems some big shoes." + desc = "The prankster's standard-issue clowning shoes. Damn they're huge!" name = "clown shoes" icon_state = "clown" item_state = "clown_shoes" @@ -88,6 +89,6 @@ /obj/item/clothing/shoes/jackboots name = "Jackboots" - desc = "Formerly owned by Officer Jack." + desc = "Nanotrasen-issue Security combat boots for combat scenarios or combat situations. All combat, all the time." icon_state = "jackboots" item_state = "jackboots" \ No newline at end of file diff --git a/code/defines/obj/clothing/suit.dm b/code/defines/obj/clothing/suit.dm index 0731d0751fb..62073c535eb 100644 --- a/code/defines/obj/clothing/suit.dm +++ b/code/defines/obj/clothing/suit.dm @@ -67,7 +67,7 @@ /obj/item/clothing/suit/det_suit name = "coat" - desc = "Someone who wears this means business." + desc = "An 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." icon_state = "detective" item_state = "det_suit" body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS @@ -170,7 +170,7 @@ /obj/item/clothing/suit/chef name = "Chef's apron" - desc = "An Apron used by a high class chef. The chef unfortunately retired." + desc = "An apron used by a high class chef." icon_state = "chef" item_state = "chef" gas_transfer_coefficient = 0.90 @@ -215,7 +215,7 @@ /obj/item/clothing/suit/wizrobe/fake name = "wizard robe" - desc = "A rather dull, blue robe one could probably find in Space-Walmart." + desc = "A rather dull, blue robe meant to mimick real wizard robes." icon_state = "wizard-fake" item_state = "wizrobe" body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS //It's not magic, shit is reasonable. --NEO @@ -281,7 +281,7 @@ /obj/item/clothing/suit/armor/captain name = "Captain's armor" - desc = "Wearing this armor exemplifies who is in charge. You are in charge." + desc = "A bulky, heavy-duty piece of exclusive Nanotrasen armor. YOU are in charge!" icon_state = "caparmor" item_state = "caparmor" w_class = 4//bulky item diff --git a/code/game/objects/items/weapons/guns_new.dm b/code/game/objects/items/weapons/guns_new.dm index c60491c584e..436c3c4f20f 100644 --- a/code/game/objects/items/weapons/guns_new.dm +++ b/code/game/objects/items/weapons/guns_new.dm @@ -319,7 +319,7 @@ dart desc = "A dart for use in shotguns.." - name = "shotgun daFrt" + name = "shotgun darts" icon_state = "blshell" //someone, draw the icon, please. m_amt = 50000 //because it's like, instakill.