Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Xeno_Tyranny_Electric_Boogaloo

code/modules/clothing/masks/gasmask.dm

@@ -104,9 +104,9 @@
 	flags_inv = HIDEEARS|HIDEFACE
 	item_state_slots = list(slot_r_hand_str = "mime", slot_l_hand_str = "mime")
 
-/obj/item/clothing/mask/gas/death_commando
-	name = "Death Commando Mask"
-	icon_state = "death_commando_mask"
+/obj/item/clothing/mask/gas/commando
+	name = "commando mask"
+	icon_state = "fullgas"
 	item_state_slots = list(slot_r_hand_str = "swat", slot_l_hand_str = "swat")
 	siemens_coefficient = 0.2
 

code/modules/mob/living/silicon/pai/life.dm

@@ -9,6 +9,7 @@
 			for (var/mob/M in viewers(T))
 				M.show_message("<font color='red'>The data cable rapidly retracts back into its spool.</font>", 3, "<font color='red'>You hear a click and the sound of wire spooling rapidly.</font>", 2)
 			qdel(src.cable)
+			src.cable = null
 
 	handle_regular_hud_updates()
 

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

@@ -10,11 +10,7 @@
 	fire_sound = 'sound/weapons/semiauto.ogg'
 	load_method = MAGAZINE
 
-/obj/item/weapon/gun/projectile/colt/detective
-	desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds."
-	magazine_type = /obj/item/ammo_magazine/m45/rubber
-
-/obj/item/weapon/gun/projectile/colt/detective/update_icon()
+/obj/item/weapon/gun/projectile/colt/update_icon()
 	if(ammo_magazine)
 		if(unique_reskin)
 			icon_state = unique_reskin
@@ -26,6 +22,10 @@
 		else
 			icon_state = "[initial(icon_state)]-e"
 
+/obj/item/weapon/gun/projectile/colt/detective
+	desc = "A Martian recreation of an old Terran pistol. Uses .45 rounds."
+	magazine_type = /obj/item/ammo_magazine/m45/rubber
+
 /obj/item/weapon/gun/projectile/colt/detective/verb/rename_gun()
 	set name = "Name Gun"
 	set category = "Object"

code/modules/research/designs.dm

@@ -733,13 +733,31 @@ other types of metals and chemistry for reagents).
 	sort_string = "VASBA"
 
 /datum/design/item/experimental_welder
-	name = "Expiermental Welding Tool"
+	name = "Experimental welding tool"
 	desc = "A welding tool that generate fuel for itself."
 	id = "expwelder"
 	req_tech = list(TECH_ENGINEERING = 4, TECH_PHORON = 3, TECH_MATERIAL = 4)
 	materials = list(DEFAULT_WALL_MATERIAL = 70, "glass" = 120, "phoron" = 100)
 	build_path = /obj/item/weapon/weldingtool/experimental
 	sort_string = "VASCA"
+
+/datum/design/item/hand_drill
+	name = "Hand drill"
+	desc = "A simple powered hand drill."
+	id = "handdrill"
+	req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100)
+	build_path = /obj/item/weapon/screwdriver/power
+	sort_string = "VASDA"
+
+/datum/design/item/jaws_life
+	name = "Jaws of life"
+	desc = "A set of jaws of life, compressed through the magic of science."
+	id = "jawslife"
+	req_tech = list(TECH_ENGINEERING = 3, TECH_MATERIAL = 2)
+	materials = list(DEFAULT_WALL_MATERIAL = 300, "silver" = 100)
+	build_path = /obj/item/weapon/crowbar/power
+	sort_string = "VASEA"
 /*
 CIRCUITS BELOW
 */