Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Conflicts:
	maps/tgstation.2.0.8.dmm

code/game/objects/devices/PDA/cart.dm

@@ -182,7 +182,7 @@
 		access_status_display = 1
 
 	syndicate
-		name = "Detomatix Cartridge"
+		name = "modified signaler cartridge"
 		icon_state = "cart"
 		access_remote_door = 1
 		remote_door_id = "syndicate" //Make sure this matches the syndicate shuttle's shield/door id!!

code/game/objects/devices/chameleonproj.dm

@@ -40,7 +40,7 @@
 		return
 
 /obj/item/device/chameleon
-	name = "chameleon-projector"
+	name = "small device"
 	icon_state = "shield0"
 	flags = FPRINT | TABLEPASS| CONDUCT | USEDELAY
 	slot_flags = SLOT_BELT

code/game/objects/effect_system.dm

@@ -13,6 +13,10 @@ would spawn and follow the beaker, even if it is carried or thrown.
 	unacidable = 1//So effect are not targeted by alien acid.
 	flags = TABLEPASS
 
+/obj/effect/ex_act(severity)
+	if(severity)
+		del(src)
+
 /obj/effect/effect/water
 	name = "water"
 	icon = 'effects.dmi'

code/game/objects/items/weapons/cigs_lighters.dm

@@ -406,7 +406,7 @@ ZIPPO
 	var/lit = 0
 
 /obj/item/weapon/lighter/zippo
-	name = "Zippo lighter"
+	name = "\improper Zippo lighter"
 	desc = "The zippo."
 	icon_state = "zippo"
 	item_state = "zippo"

code/game/objects/items/weapons/explosives.dm

@@ -28,6 +28,8 @@
 			message_admins("ATTACK: [user] ([user.ckey]) planted [src] on [target] ([target:ckey]).")
 			log_attack("<font color='red'> [user.real_name] ([user.ckey]) tried planting [name] on [target:real_name] ([target:ckey])</font>")
 		target.overlays += image('assemblies.dmi', "plastic-explosive2")
+		log_admin("[user] ([user.ckey]) has planted a [src].")
+		message_admins("[user] ([user.ckey]) planted a [src].")
 		user << "Bomb has been planted. Timer counting down from [timer]."
 		spawn(timer*10)
 			if(target)

code/game/objects/items/weapons/implants/implanter.dm

@@ -66,7 +66,7 @@
 
 
 /obj/item/weapon/implanter/explosive
-	name = "implanter-explosive"
+	name = "implanter (E)"
 
 /obj/item/weapon/implanter/explosive/New()
 	imp = new /obj/item/weapon/implant/explosive( src )
@@ -75,7 +75,7 @@
 	return
 
 /obj/item/weapon/implanter/compressed
-	name = "implanter-compressed"
+	name = "implanter (C)"
 	icon_state = "cimplanter0"
 
 /obj/item/weapon/implanter/compressed/New()

code/game/objects/items/weapons/syndie.dm

@@ -9,8 +9,8 @@
 /obj/item/weapon/syndie/c4explosive
 	icon_state = "c-4small_0"
 	item_state = "c-4small"
-	name = "mysterious package"
-	desc = "A mysterious package."
+	name = "normal-sized package"
+	desc = "A small wrapped package."
 	w_class = 3
 
 	var/power = 1  /*Size of the explosion.*/
@@ -27,9 +27,9 @@
 	var/K = rand(1,2000)
 	K = md5(num2text(K)+name)
 	K = copytext(K,1,7)
-	src.desc += "\n You see [K] engraved on \the [src]"
+	src.desc += "\n You see [K] engraved on \the [src]."
 	var/obj/item/weapon/syndie/c4detonator/detonator = new(src.loc)
-	detonator.desc += "\n You see [K] engraved on \the [src]"
+	detonator.desc += "\n You see [K] engraved on the lighter."
 	detonator.bomb = src
 
 /obj/item/weapon/syndie/c4explosive/proc/detonate()
@@ -53,8 +53,8 @@
 /obj/item/weapon/syndie/c4detonator
 	icon_state = "c-4detonator_0"
 	item_state = "c-4detonator"
-	name = "lighter"  /*Sneaky, thanks Dreyfus.*/
-	desc = "A disposable lighter, it's quite heavy."
+	name = "\improper Zippo lighter"  /*Sneaky, thanks Dreyfus.*/
+	desc = "The zippo."
 	w_class = 1
 
 	var/obj/item/weapon/syndie/c4explosive/bomb

code/game/objects/storage/uplink_kits.dm

@@ -1,11 +1,11 @@
 /obj/item/weapon/storage/syndie_kit
-	name = "Box"
-	desc = "A sleek, sturdy box"
-	icon_state = "box_of_doom"
+	name = "box"
+	desc = "It's just an ordinary box."
+	icon_state = "box"
 	item_state = "syringe_kit"
 
 /obj/item/weapon/storage/syndie_kit/imp_freedom
-	name = "Freedom Implant (with injector)"
+	name = "box (FI)"
 
 /obj/item/weapon/storage/syndie_kit/imp_freedom/New()
 	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
@@ -15,7 +15,7 @@
 	return
 
 /obj/item/weapon/storage/syndie_kit/imp_compress
-	name = "Compressed Matter Implant (with injector)"
+	name = "box (CMI)"
 
 /obj/item/weapon/storage/syndie_kit/imp_compress/New()
 	new /obj/item/weapon/implanter/compressed(src)
@@ -23,18 +23,18 @@
 	return
 
 /obj/item/weapon/storage/syndie_kit/imp_explosive
-	name = "Explosive Implant (with injector)"
+	name = "box (EI)"
 
 /obj/item/weapon/storage/syndie_kit/imp_explosive/New()
 	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
 	O.imp = new /obj/item/weapon/implant/explosive(O)
-	O.name = "(BIO-HAZARD) BIO-detpack"
+//	O.name = "(BIO-HAZARD) BIO-detpack"
 	O.update()
 	..()
 	return
 
 /obj/item/weapon/storage/syndie_kit/imp_uplink
-	name = "Uplink Implant (with injector)"
+	name = "box (UI)"
 
 /obj/item/weapon/storage/syndie_kit/imp_uplink/New()
 	var/obj/item/weapon/implanter/O = new /obj/item/weapon/implanter(src)
@@ -44,7 +44,7 @@
 	return
 
 /obj/item/weapon/storage/syndie_kit/space
-	name = "Space Suit and Helmet"
+	name = "box (SS)"
 
 /obj/item/weapon/storage/syndie_kit/space/New()
 	new /obj/item/clothing/suit/space/syndicate(src)

code/game/objects/window.dm

@@ -345,11 +345,11 @@
 /obj/structure/window/proc/update_nearby_tiles(need_rebuild)
 	if(!air_master) return 0
 
-	var/turf/simulated/source = loc
+	var/turf/simulated/source = get_turf(src)
 	var/turf/simulated/target = get_step(source,dir)
 
-	if(istype(source)) air_master.tiles_to_update += source
-	if(istype(target)) air_master.tiles_to_update += target
+	if(istype(source)) air_master.tiles_to_update |= source
+	if(istype(target)) air_master.tiles_to_update |= target
 
 	return 1