Merge pull request #1274 from Erthilo/master

Randomises blob weakness/strengths + removal of customs by request + changelog!

code/modules/chemical/Chemistry-Reagents.dm

@@ -734,6 +734,20 @@ datum
 						M.take_organ_damage(min(15, volume * 2))
 
 			reaction_obj(var/obj/O, var/volume)
+				if(istype(O, /obj/effect/blob))
+					var/obj/effect/blob/B = O
+					if(B.weakness == "acid")
+						B.health -= rand(volume*2,volume*3)
+						B.update()
+						O.visible_message("\red \The [O] sizzles violently!")
+					else if(B.strength == "acid")
+						B.health += rand(volume*0.5,volume*1)
+						B.update()
+						O.visible_message("\red <B>\The [O] strengthens!</B>")
+					else
+						B.health -= rand(volume*1,volume*1.5)
+						O.visible_message("\red \The [O] dissolves slightly.")
+					B.update()
 				if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(10))
 					if(!O.unacidable)
 						var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)
@@ -801,6 +815,20 @@ datum
 							M.take_organ_damage(min(15, volume * 4))
 
 			reaction_obj(var/obj/O, var/volume)
+				if(istype(O, /obj/effect/blob))
+					var/obj/effect/blob/B = O
+					if(B.weakness == "acid")
+						B.health -= rand(volume*5,volume*6)
+						B.update()
+						O.visible_message("\red \The [O] sizzles violently!")
+					if(B.strength == "acid")
+						B.health += rand(volume*2,volume*3)
+						B.update()
+						O.visible_message("\red <B>\The [O] strengthens!</B>")
+					else
+						B.health -= rand(volume*2,volume*2.5)
+						O.visible_message("\red \The [O] dissolves slightly.")
+					B.update()
 				if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)))
 					if(!O.unacidable)
 						var/obj/effect/decal/cleanable/molten_item/I = new/obj/effect/decal/cleanable/molten_item(O.loc)

code/modules/customitems/item_defines.dm

@@ -167,13 +167,15 @@
 	icon_state = "serithi_artalis_1"
 
 //////////// Hats ////////////
-
+//Removed by request
+/*
 /obj/item/clothing/head/helmet/hardhat/fluff/greg_anderson_1 //deusdactyl: Greg Anderson
 	name = "old hard hat"
 	desc = "An old dented hard hat with the nametag \"Anderson\". It seems to be backwards."
 	icon_state = "hardhat0_dblue" //Already an in-game sprite
 	item_state = "hardhat0_dblue"
 	color = "dblue"
+*/
 
 /obj/item/clothing/head/secsoft/fluff/swatcap //deusdactyl: James Girard
 	name = "\improper SWAT hat"
@@ -287,7 +289,8 @@
 //////////// Sets ////////////
 
 ////// CDC //deusdactyl: Roger Wiles
-
+//Removed by request.
+/*
 /obj/item/clothing/under/rank/virologist/fluff/cdc_jumpsuit
 	name = "\improper CDC jumpsuit"
 	desc = "A modified standard-issue CDC jumpsuit made of a special fiber that gives special protection against biohazards.  It has a biohazard symbol sewn into the back."
@@ -300,7 +303,7 @@
 	desc = "A standard-issue CDC labcoat that protects against minor chemical spills.  It has the name \"Wiles\" sewn on to the breast pocket."
 	icon = 'custom_items.dmi'
 	icon_state = "labcoat_cdc_open"
-
+*/
 ////// Short Sleeve Medical Outfit //erthilo: Farah Lants
 
 /obj/item/clothing/under/rank/medical/fluff/short