Merge pull request #2736 from Spamcat/master

Stuff v2

code/game/objects/items/weapons/storage/firstaid.dm

@@ -106,6 +106,7 @@
 	can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
 	allow_quick_gather = 1
 	use_to_pickup = 1
+	storage_slots = 14
 
 /obj/item/weapon/storage/pill_bottle/MouseDrop(obj/over_object as obj) //Quick pillbottle fix. -Agouri
 

code/game/objects/structures/lamarr_cage.dm

@@ -89,9 +89,16 @@
 
 /obj/structure/lamarr/proc/Break()
 	if(occupied)
-		var/obj/item/clothing/mask/facehugger/A = new /obj/item/clothing/mask/facehugger( src.loc )
-		A.sterile = 1
-		A.name = "Lamarr"
+		new /obj/item/clothing/mask/facehugger/lamarr(src.loc)
 		occupied = 0
 	update_icon()
+	return
+
+/obj/item/clothing/mask/facehugger/lamarr
+	name = "Lamarr"
+	desc = "The worst she might do is attempt to... couple with your head."//hope we don't get sued over a harmless reference, rite?
+	sterile = 1
+	gender = FEMALE
+
+/obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
 	return

code/modules/client/preferences.dm

@@ -1008,11 +1008,9 @@ datum/preferences
 							gender = FEMALE
 						else
 							gender = MALE
-					if("disabilities")
-						if(disabilities == 0)
-							disabilities = 1
-						else
-							disabilities = 0
+
+					if("disabilities")				//please note: current code only allows nearsightedness as a disability
+						disabilities = !disabilities//if you want to add actual disabilities, code that selects them should be here
 
 					if("hear_adminhelps")
 						toggles ^= SOUND_ADMINHELP

code/modules/clothing/clothing.dm

@@ -1,6 +1,3 @@
-/obj/item
-	var/prescription = 0
-
 /obj/item/clothing
 	name = "clothing"
 

code/modules/clothing/glasses/glasses.dm

@@ -8,7 +8,7 @@
 	//var/vision_flags = 0
 	//var/darkness_view = 0//Base human is 2
 	//var/invisa_view = 0
-	//var/prescription = 0
+	var/prescription = 0
 
 /obj/item/clothing/glasses/meson
 	name = "Optical Meson Scanner"
@@ -19,6 +19,8 @@
 	vision_flags = SEE_TURFS
 
 /obj/item/clothing/glasses/meson/prescription
+	name = "prescription mesons"
+	desc = "Optical Meson Scanner with prescription lenses."
 	prescription = 1
 
 /obj/item/clothing/glasses/science
@@ -123,6 +125,7 @@
 	vision_flags = BLIND
 
 /obj/item/clothing/glasses/sunglasses/prescription
+	name = "prescription sunglasses"
 	prescription = 1
 
 /obj/item/clothing/glasses/sunglasses/big

code/modules/mob/living/carbon/human/life.dm

@@ -1227,8 +1227,14 @@
 				if(blinded)		blind.layer = 18
 				else			blind.layer = 0
 
-			if( disabilities & NEARSIGHTED && ((glasses && !glasses.prescription) || !glasses))
-				client.screen += global_hud.vimpaired
+			if(disabilities & NEARSIGHTED)	//this looks meh but saves a lot of memory by not requiring to add var/prescription
+				if(glasses)					//to every /obj/item
+					var/obj/item/clothing/glasses/G = glasses
+					if(!G.prescription)
+						client.screen += global_hud.vimpaired
+				else
+					client.screen += global_hud.vimpaired
+
 			if(eye_blurry)			client.screen += global_hud.blurry
 			if(druggy)				client.screen += global_hud.druggy
 

code/modules/mob/new_player/preferences_setup.dm

@@ -558,6 +558,9 @@ datum/preferences
 					else if(backbag == 3 || backbag == 4)
 						clothes_s.Blend(new /icon('icons/mob/back.dmi', "satchel"), ICON_OVERLAY)
 
+		if(disabilities & NEARSIGHTED)
+			clothes_s.Blend(new /icon('icons/mob/eyes.dmi', "glasses"), ICON_OVERLAY)
+
 		preview_icon.Blend(eyes_s, ICON_OVERLAY)
 		if(clothes_s)
 			preview_icon.Blend(clothes_s, ICON_OVERLAY)

code/modules/reagents/Chemistry-Machinery.dm

@@ -341,8 +341,9 @@
 			P.icon_state = "pill"+pillsprite
 			reagents.trans_to(P,50)
 			if(src.loaded_pill_bottle)
-				P.loc = src.loaded_pill_bottle
-				src.updateUsrDialog()
+				if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots)
+					P.loc = loaded_pill_bottle
+					src.updateUsrDialog()
 		else if (href_list["createbottle"])
 			if(!condi)
 				var/name = reject_bad_text(input(usr,"Name:","Name your bottle!",reagents.get_master_reagent_name()))

html/changelog.html

@@ -59,6 +59,15 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
 
+<div class="commit sansserif">
+	<h2 class="date">30.04.2013</h2>
+	<h3 class="author">Spamcat updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="tweak">Pill bottle capacity increased to 14 items.</li>
+		<li class="bugfix">Fixed Lamarr (it now spawns properly)</li>
+	</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">17 April 2013</h2>
 	<h3 class="author">SkyMarshal updated:</h3>