July 5th TG sync (#1883)

July 5th TG sync
2017-07-05 22:14:19 -05:00
parent 454b9c3d68
commit b1b4826c0c
1264 changed files with 149689 additions and 570309 deletions
@@ -1,71 +1,71 @@
-/obj/item/weapon/implanter
-	name = "implanter"
-	desc = "A sterile automatic implant injector."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "implanter0"
-	item_state = "syringe_0"
-	throw_speed = 3
-	throw_range = 5
-	w_class = WEIGHT_CLASS_SMALL
-	origin_tech = "materials=2;biotech=3"
-	materials = list(MAT_METAL=600, MAT_GLASS=200)
-	var/obj/item/weapon/implant/imp = null
-	var/imp_type = null
-
-
-/obj/item/weapon/implanter/update_icon()
-	if(imp)
-		icon_state = "implanter1"
-		origin_tech = imp.origin_tech
-	else
-		icon_state = "implanter0"
-		origin_tech = initial(origin_tech)
-
-
-/obj/item/weapon/implanter/attack(mob/living/M, mob/user)
-	if(!istype(M))
-		return
-	if(user && imp)
-		if(M != user)
+/obj/item/weapon/implanter
+	name = "implanter"
+	desc = "A sterile automatic implant injector."
+	icon = 'icons/obj/items.dmi'
+	icon_state = "implanter0"
+	item_state = "syringe_0"
+	throw_speed = 3
+	throw_range = 5
+	w_class = WEIGHT_CLASS_SMALL
+	origin_tech = "materials=2;biotech=3"
+	materials = list(MAT_METAL=600, MAT_GLASS=200)
+	var/obj/item/weapon/implant/imp = null
+	var/imp_type = null
+
+
+/obj/item/weapon/implanter/update_icon()
+	if(imp)
+		icon_state = "implanter1"
+		origin_tech = imp.origin_tech
+	else
+		icon_state = "implanter0"
+		origin_tech = initial(origin_tech)
+
+
+/obj/item/weapon/implanter/attack(mob/living/M, mob/user)
+	if(!istype(M))
+		return
+	if(user && imp)
+		if(M != user)
 			M.visible_message("<span class='warning'>[user] is attempting to implant [M].</span>")
-
-		var/turf/T = get_turf(M)
-		if(T && (M == user || do_mob(user, M, 50)))
-			if(src && imp)
-				if(imp.implant(M, user))
-					if (M == user)
-						to_chat(user, "<span class='notice'>You implant yourself.</span>")
-					else
-						M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you.</span>")
-					imp = null
-					update_icon()
-				else
-					to_chat(user, "<span class='warning'>[src] fails to implant [M].</span>")
-
-/obj/item/weapon/implanter/attackby(obj/item/weapon/W, mob/user, params)
-	if(istype(W, /obj/item/weapon/pen))
-		var/t = stripped_input(user, "What would you like the label to be?", name, null)
-		if(user.get_active_held_item() != W)
-			return
-		if(!in_range(src, user) && loc != user)
-			return
-		if(t)
-			name = "implanter ([t])"
-		else
-			name = "implanter"
-	else
-		return ..()
-
-/obj/item/weapon/implanter/Initialize(mapload)
-	..()
-	if(imp_type)
-		imp = new imp_type(src)
-	update_icon()
-
-/obj/item/weapon/implanter/adrenalin
-	name = "implanter (adrenalin)"
-	imp_type = /obj/item/weapon/implant/adrenalin
-
-/obj/item/weapon/implanter/emp
-	name = "implanter (EMP)"
-	imp_type = /obj/item/weapon/implant/emp
+
+		var/turf/T = get_turf(M)
+		if(T && (M == user || do_mob(user, M, 50)))
+			if(src && imp)
+				if(imp.implant(M, user))
+					if (M == user)
+						to_chat(user, "<span class='notice'>You implant yourself.</span>")
+					else
+						M.visible_message("[user] has implanted [M].", "<span class='notice'>[user] implants you.</span>")
+					imp = null
+					update_icon()
+				else
+					to_chat(user, "<span class='warning'>[src] fails to implant [M].</span>")
+
+/obj/item/weapon/implanter/attackby(obj/item/weapon/W, mob/user, params)
+	if(istype(W, /obj/item/weapon/pen))
+		var/t = stripped_input(user, "What would you like the label to be?", name, null)
+		if(user.get_active_held_item() != W)
+			return
+		if(!in_range(src, user) && loc != user)
+			return
+		if(t)
+			name = "implanter ([t])"
+		else
+			name = "implanter"
+	else
+		return ..()
+
+/obj/item/weapon/implanter/Initialize(mapload)
+	..()
+	if(imp_type)
+		imp = new imp_type(src)
+	update_icon()
+
+/obj/item/weapon/implanter/adrenalin
+	name = "implanter (adrenalin)"
+	imp_type = /obj/item/weapon/implant/adrenalin
+
+/obj/item/weapon/implanter/emp
+	name = "implanter (EMP)"
+	imp_type = /obj/item/weapon/implant/emp