Merge pull request #4949 from hornygranny/alienpockets

alien pockets removed

code/_onclick/hud/alien.dm

@@ -32,26 +32,6 @@
 	l_hand_hud_object = inv_box
 	adding += inv_box
 
-//pocket 1
-	inv_box = new /obj/screen/inventory()
-	inv_box.name = "storage1"
-	inv_box.icon = 'icons/mob/screen_alien.dmi'
-	inv_box.icon_state = "pocket"
-	inv_box.screen_loc = ui_alien_storage_l
-	inv_box.slot_id = slot_l_store
-	inv_box.layer = 19
-	adding += inv_box
-
-//pocket 2
-	inv_box = new /obj/screen/inventory()
-	inv_box.name = "storage2"
-	inv_box.icon = 'icons/mob/screen_alien.dmi'
-	inv_box.icon_state = "pocket"
-	inv_box.screen_loc = ui_alien_storage_r
-	inv_box.slot_id = slot_r_store
-	inv_box.layer = 19
-	adding += inv_box
-
 //begin buttons
 
 	using = new /obj/screen/inventory()

code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm

@@ -143,12 +143,15 @@ Doesn't work on other aliens/AI.*/
 	set category = "Alien"
 
 	if(powerc(55))
+		if(locate(/obj/structure/alien/resin) in loc)
+			src << "<span class='danger'>There is already a resin structure there.</span>"
+			return
 		var/choice = input("Choose what you wish to shape.","Resin building") as null|anything in list("resin wall","resin membrane","resin nest") //would do it through typesof but then the player choice would have the type path and we don't want the internal workings to be exposed ICly - Urist
 		if(!choice || !powerc(55))	return
 		adjustToxLoss(-55)
-		src << "<span class='userdanger'>You shape a [choice].</span>"
+		src << "<span class='notice'>You shape a [choice].</span>"
 		for(var/mob/O in viewers(src, null))
-			O.show_message(text("<span class='userdanger'>[src] vomits up a thick purple substance and begins to shape it!</span>"), 1)
+			O.show_message(text("<span class='notice'>[src] vomits up a thick purple substance and begins to shape it.</span>"), 1)
 		switch(choice)
 			if("resin wall")
 				new /obj/structure/alien/resin/wall(loc)

code/modules/mob/living/carbon/alien/humanoid/inventory.dm

@@ -3,39 +3,3 @@
 	if(!. || !I)
 		return
 
-	if(I == r_store)
-		r_store = null
-		update_inv_pockets(0)
-	else if(I == l_store)
-		l_store = null
-		update_inv_pockets(0)
-
-
-//yaaaaaaay snowflakes
-/mob/living/carbon/alien/humanoid/attack_ui(slot_id)
-	var/obj/item/I = get_active_hand()
-	if(!I)	return 0
-	if(I.w_class > 3)	return 0
-
-	if(I == l_hand)
-		l_hand = null
-	else if(I == r_hand)
-		r_hand = null
-
-	switch(slot_id)
-		if(slot_l_store)
-			if(l_store)
-				return 0
-			l_store = I
-			update_inv_pockets()
-		if(slot_r_store)
-			if(r_store)
-				return 0
-			r_store = I
-			update_inv_pockets()
-
-	I.loc = src
-	I.equipped(src, slot_id)
-	I.layer = 20
-
-	return 1

code/modules/mob/living/carbon/alien/humanoid/update_icons.dm

@@ -38,7 +38,6 @@
 
 	update_inv_r_hand(0)
 	update_inv_l_hand(0)
-	update_inv_pockets(0)
 	update_hud()
 //	update_icons() //Handled in update_transform(), leaving this here as a reminder
 	update_fire()
@@ -56,16 +55,6 @@
 		client.screen |= contents
 
 
-/mob/living/carbon/alien/humanoid/update_inv_pockets(update_icons = 1)
-	if(l_store)
-		l_store.screen_loc = ui_alien_storage_l
-	if(r_store)
-		r_store.screen_loc = ui_alien_storage_r
-
-	if(update_icons)
-		update_icons()
-
-
 /mob/living/carbon/alien/humanoid/update_inv_r_hand(update_icons = 1)
 	if(r_hand)
 		var/t_state = r_hand.item_state