Merge pull request #2068 from Markolie/lawstate

Welding tool refactor, in-hand updates

code/modules/assembly/holder.dm

@@ -35,13 +35,16 @@
 		if((!D)||(!D2))	return 0
 		if((!isassembly(D))||(!isassembly(D2)))	return 0
 		if((D:secured)||(D2:secured))	return 0
-		if(user)
-			user.remove_from_mob(D)
-			user.remove_from_mob(D2)
+		if(!D.remove_item_from_storage(src))
+			if(user)
+				user.remove_from_mob(D)
+			D.loc = src
+		if(!D2.remove_item_from_storage(src))
+			if(user)
+				user.remove_from_mob(D2)
+			D2.loc = src
 		D:holder = src
 		D2:holder = src
-		D.loc = src
-		D2.loc = src
 		a_left = D
 		a_right = D2
 		name = "[D.name]-[D2.name] assembly"

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

@@ -868,7 +868,7 @@ var/global/list/damage_icon_parts = list()
 		var/t_state = r_hand.item_state
 		if(!t_state)	t_state = r_hand.icon_state
 
-		var/image/I = image("icon" = r_hand.righthand_file, "icon_state"="[t_state]", "layer"=-R_HAND_LAYER)
+		var/image/I = image("icon" = r_hand.righthand_file, "icon_state"="[t_state]")
 		I = center_image(I, r_hand.inhand_x_dimension, r_hand.inhand_y_dimension)
 		overlays_standing[R_HAND_LAYER] = I		
 		
@@ -884,7 +884,7 @@ var/global/list/damage_icon_parts = list()
 		var/t_state = l_hand.item_state
 		if(!t_state)	t_state = l_hand.icon_state
 
-		var/image/I = image("icon" = l_hand.lefthand_file, "icon_state"="[t_state]", "layer"=-L_HAND_LAYER)
+		var/image/I = image("icon" = l_hand.lefthand_file, "icon_state"="[t_state]")
 		I = center_image(I, l_hand.inhand_x_dimension, l_hand.inhand_y_dimension)
 		overlays_standing[L_HAND_LAYER] = I
 

code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -171,7 +171,7 @@
 	src.modules += new /obj/item/borg/sight/meson(src)
 	src.modules += new /obj/item/weapon/rcd/borg(src)
 	src.modules += new /obj/item/weapon/extinguisher(src)
-	src.modules += new /obj/item/weapon/weldingtool/largetank(src)
+	src.modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
 	src.modules += new /obj/item/weapon/screwdriver(src)
 	src.modules += new /obj/item/weapon/wrench(src)
 	src.modules += new /obj/item/weapon/crowbar(src)
@@ -412,7 +412,7 @@
 		)
 
 /obj/item/weapon/robot_module/drone/New()
-	src.modules += new /obj/item/weapon/weldingtool(src)
+	src.modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src)
 	src.modules += new /obj/item/weapon/screwdriver(src)
 	src.modules += new /obj/item/weapon/wrench(src)
 	src.modules += new /obj/item/weapon/crowbar(src)

code/modules/paperwork/paperbin.dm

@@ -36,12 +36,12 @@
 	else if(istype(over_object, /obj/screen))
 		switch(over_object.name)
 			if("r_hand")
-				if(!M.unEquip(src))
-					return
+				if(!remove_item_from_storage(M))
+					M.unEquip(src)
 				M.put_in_r_hand(src)
 			if("l_hand")
-				if(!M.unEquip(src))
-					return
+				if(!remove_item_from_storage(M))
+					M.unEquip(src)
 				M.put_in_l_hand(src)
 
 	add_fingerprint(M)

code/modules/projectiles/guns/projectile.dm

@@ -143,6 +143,7 @@
 	desc = "A universal syndicate small-arms suppressor for maximum espionage."
 	icon = 'icons/obj/gun.dmi'
 	icon_state = "suppressor"
+	item_state = "suppressor"
 	w_class = 2
 	var/oldsound = null
 	var/initial_w_class = null

code/modules/projectiles/guns/projectile/automatic.dm

@@ -236,7 +236,8 @@
 	name = "\improper Thompson SMG"
 	desc = "A genuine 'Chicago Typewriter'."
 	icon_state = "tommygun"
-	item_state = "tommygun"
+	item_state = "shotgun"
+	w_class = 5
 	slot_flags = 0
 	origin_tech = "combat=5;materials=1;syndicate=2"
 	mag_type = "/obj/item/ammo_box/magazine/tommygunm45"

code/modules/reagents/reagent_containers/food/drinks.dm

@@ -169,7 +169,7 @@
 	desc = "A golden cup"
 	name = "golden cup"
 	icon_state = "golden_cup"
-	item_state = "" //nope :(
+	item_state = "golden_cup" //yup :)
 	w_class = 4
 	force = 14
 	throwforce = 10

code/modules/research/designs/equipment_designs.dm

@@ -1,6 +1,16 @@
 /////////////////////////////////////////
 /////////////////Equipment///////////////
 /////////////////////////////////////////
+/datum/design/exwelder
+	name = "Experimental Welding Tool"
+	desc = "An experimental welder capable of self-fuel generation."
+	id = "exwelder"
+	req_tech = list("materials" = 4, "engineering" = 4, "bluespace" = 3, "plasmatech" = 3)
+	build_type = PROTOLATHE
+	materials = list(MAT_METAL = 1000, MAT_GLASS = 500, MAT_PLASMA = 1500, MAT_URANIUM = 200)
+	build_path = /obj/item/weapon/weldingtool/experimental
+	category = list("Equipment")
+	
 /datum/design/health_hud
 	name = "Health Scanner HUD"
 	desc = "A heads-up display that scans the humans in view and provides accurate data about their health status."