TG Sync 12/15/17

s s
2017-12-15 06:27:57 -08:00
parent b6b0ab69e3
commit 253c819bc1
762 changed files with 13429 additions and 14872 deletions
@@ -110,12 +110,12 @@
 	else if(stage == WIRED && istype(I, /obj/item/wrench))
 		if(beakers.len)
 			for(var/obj/O in beakers)
-				O.loc = get_turf(src)
+				O.forceMove(drop_location())
 			beakers = list()
 			to_chat(user, "<span class='notice'>You open the [initial(name)] assembly and remove the payload.</span>")
 			return // First use of the wrench remove beakers, then use the wrench to remove the activation mechanism.
 		if(nadeassembly)
-			nadeassembly.loc = get_turf(src)
+			nadeassembly.forceMove(drop_location())
 			nadeassembly.master = null
 			nadeassembly = null
 		else // If "nadeassembly = null && stage == WIRED", then it most have been cable_coil that was used.
@@ -167,7 +167,7 @@
 		playsound(loc, 'sound/items/screwdriver2.ogg', 50, 1)
 		if(beakers.len)
 			for(var/obj/O in beakers)
-				O.loc = get_turf(src)
+				O.forceMove(drop_location())
 			beakers = list()
 		stage_change(EMPTY)
 		return
@@ -1,60 +1,60 @@
-//improvised explosives//
-
-/obj/item/grenade/iedcasing
-	name = "improvised firebomb"
-	desc = "A weak, improvised incendiary device."
-	w_class = WEIGHT_CLASS_SMALL
-	icon = 'icons/obj/grenade.dmi'
-	icon_state = "improvised_grenade"
-	item_state = "flashbang"
-	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
-	throw_speed = 3
-	throw_range = 7
-	flags_1 = CONDUCT_1
-	slot_flags = SLOT_BELT
-	active = 0
-	det_time = 50
-	display_timer = 0
-	var/range = 3
-	var/list/times
-
-/obj/item/grenade/iedcasing/Initialize()
-	. = ..()
-	add_overlay("improvised_grenade_filled")
-	add_overlay("improvised_grenade_wired")
-	times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
-	det_time = text2num(pickweight(times))
-	if(det_time < 0) //checking for 'duds'
-		range = 1
-		det_time = rand(30,80)
-	else
-		range = pick(2,2,2,3,3,3,4)
-
-/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
-	..()
-	var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents
-	if(can)
-		can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
-		can.pixel_y = 0
-		var/mutable_appearance/can_underlay = new(can)
-		can_underlay.layer = FLOAT_LAYER
-		can_underlay.plane = FLOAT_PLANE
-		underlays += can_underlay
-
-
-/obj/item/grenade/iedcasing/attack_self(mob/user) //
-	if(!active)
-		if(clown_check(user))
-			to_chat(user, "<span class='warning'>You light the [name]!</span>")
-			cut_overlay("improvised_grenade_filled")
+//improvised explosives//
+
+/obj/item/grenade/iedcasing
+	name = "improvised firebomb"
+	desc = "A weak, improvised incendiary device."
+	w_class = WEIGHT_CLASS_SMALL
+	icon = 'icons/obj/grenade.dmi'
+	icon_state = "improvised_grenade"
+	item_state = "flashbang"
+	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	throw_speed = 3
+	throw_range = 7
+	flags_1 = CONDUCT_1
+	slot_flags = SLOT_BELT
+	active = 0
+	det_time = 50
+	display_timer = 0
+	var/range = 3
+	var/list/times
+
+/obj/item/grenade/iedcasing/Initialize()
+	. = ..()
+	add_overlay("improvised_grenade_filled")
+	add_overlay("improvised_grenade_wired")
+	times = list("5" = 10, "-1" = 20, "[rand(30,80)]" = 50, "[rand(65,180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
+	det_time = text2num(pickweight(times))
+	if(det_time < 0) //checking for 'duds'
+		range = 1
+		det_time = rand(30,80)
+	else
+		range = pick(2,2,2,3,3,3,4)
+
+/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
+	..()
+	var/obj/item/reagent_containers/food/drinks/soda_cans/can = locate() in contents
+	if(can)
+		can.pixel_x = 0 //Reset the sprite's position to make it consistent with the rest of the IED
+		can.pixel_y = 0
+		var/mutable_appearance/can_underlay = new(can)
+		can_underlay.layer = FLOAT_LAYER
+		can_underlay.plane = FLOAT_PLANE
+		underlays += can_underlay
+
+
+/obj/item/grenade/iedcasing/attack_self(mob/user) //
+	if(!active)
+		if(clown_check(user))
+			to_chat(user, "<span class='warning'>You light the [name]!</span>")
+			cut_overlay("improvised_grenade_filled")
 			preprime(user, null, FALSE)
-
-/obj/item/grenade/iedcasing/prime() //Blowing that can up
-	update_mob()
-	explosion(src.loc,-1,-1,2, flame_range = 4)	// small explosion, plus a very large fireball.
-	qdel(src)
-
-/obj/item/grenade/iedcasing/examine(mob/user)
-	..()
-	to_chat(user, "You can't tell when it will explode!")
+
+/obj/item/grenade/iedcasing/prime() //Blowing that can up
+	update_mob()
+	explosion(src.loc,-1,-1,2, flame_range = 4)	// small explosion, plus a very large fireball.
+	qdel(src)
+
+/obj/item/grenade/iedcasing/examine(mob/user)
+	..()
+	to_chat(user, "You can't tell when it will explode!")
@@ -48,4 +48,4 @@
 			for(var/mob/living/carbon/L in T)
 				L.adjustStaminaLoss(stamina_damage)
 				L.bodytemperature -= 230
-	qdel(src)
+	qdel(src)