Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts

code/game/objects/explosion.dm

@@ -1,7 +1,6 @@
 //TODO: Flash range does nothing currently
 
 /proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1, ignorecap = 0, flame_range = 0, silent = 0, smoke = 1, cause = null, breach = TRUE)
-	src = null	//so we don't abort once src is deleted
 	epicenter = get_turf(epicenter)
 
 	// Archive the uncapped explosion for the doppler array

code/game/objects/items/blueprints.dm

@@ -328,3 +328,5 @@
 	desc = "A digital copy of the station blueprints stored in your memory."
 	fluffnotice = "Intellectual Property of Nanotrasen. For use in engineering cyborgs only. Wipe from memory upon departure from the station."
 
+/obj/item/areaeditor/blueprints/ce
+

code/game/objects/items/devices/flash.dm

@@ -84,27 +84,29 @@
 
 
 /obj/item/flash/proc/flash_carbon(var/mob/living/carbon/M, var/mob/user = null, var/power = 5, targeted = 1)
-	add_attack_logs(user, M, "Flashed with [src]")
-	if(user && targeted)
-		if(M.weakeyes)
-			M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
-		if(M.flash_eyes(1, 1))
-			M.AdjustConfused(power)
-			terrible_conversion_proc(M, user)
-			M.Stun(1)
-			visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
-			to_chat(user, "<span class='danger'>You blind [M] with the flash!</span>")
-			to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
+	if(user)
+		add_attack_logs(user, M, "Flashed with [src]")
+		if(targeted)
 			if(M.weakeyes)
-				M.Stun(2)
-				M.visible_message("<span class='disarm'>[M] gasps and shields [M.p_their()] eyes!</span>", "<span class='userdanger'>You gasp and shields your eyes!</span>")
-		else
-			visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
-			to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
-			to_chat(M, "<span class='danger'>[user] fails to blind you with the flash!</span>")
-	else
-		if(M.flash_eyes())
-			M.AdjustConfused(power)
+				M.Weaken(3) //quick weaken bypasses eye protection but has no eye flash
+			if(M.flash_eyes(1, 1))
+				M.AdjustConfused(power)
+				terrible_conversion_proc(M, user)
+				M.Stun(1)
+				visible_message("<span class='disarm'>[user] blinds [M] with the flash!</span>")
+				to_chat(user, "<span class='danger'>You blind [M] with the flash!</span>")
+				to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
+				if(M.weakeyes)
+					M.Stun(2)
+					M.visible_message("<span class='disarm'>[M] gasps and shields [M.p_their()] eyes!</span>", "<span class='userdanger'>You gasp and shields your eyes!</span>")
+			else
+				visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
+				to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
+				to_chat(M, "<span class='danger'>[user] fails to blind you with the flash!</span>")
+			return
+
+	if(M.flash_eyes())
+		M.AdjustConfused(power)
 
 /obj/item/flash/attack(mob/living/M, mob/user)
 	if(!try_use_flash(user))

code/game/objects/items/devices/radio/headset.dm

@@ -103,6 +103,13 @@
 /obj/item/radio/headset/syndicate/alt/syndteam
 	ks1type = /obj/item/encryptionkey/syndteam
 
+/obj/item/radio/headset/syndicate/alt/lavaland
+	name = "syndicate lavaland headset"
+
+/obj/item/radio/headset/syndicate/alt/lavaland/New()
+	. = ..()
+	set_frequency(SYND_FREQ)
+
 /obj/item/radio/headset/binary
 	origin_tech = "syndicate=3"
 	ks1type = /obj/item/encryptionkey/binary

code/game/objects/items/devices/radio/radio.dm

@@ -458,7 +458,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 				R.receive_signal(signal)
 
 		// Receiving code can be located in Telecommunications.dm
-		return signal.data["done"] && position.z in signal.data["level"]
+		return signal.data["done"] && (position.z in signal.data["level"])
 
 
   /* ###### Intercoms and station-bounced radios ###### */
@@ -510,7 +510,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 
 	sleep(rand(10,25)) // wait a little...
 
-	if(signal.data["done"] && position.z in signal.data["level"])
+	if(signal.data["done"] && (position.z in signal.data["level"]))
 		// we're done here.
 		return 1
 

code/game/objects/items/devices/scanners.dm

@@ -212,7 +212,7 @@ REAGENT SCANNER
 		if(H.getBrainLoss() >= 100)
 			to_chat(user, "<span class='warning'>Subject is brain dead.</span>")
 		else if(H.getBrainLoss() >= 60)
-			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have mental retardation.</span>")
+			to_chat(user, "<span class='warning'>Severe brain damage detected. Subject likely to have dementia.</span>")
 		else if(H.getBrainLoss() >= 10)
 			to_chat(user, "<span class='warning'>Significant brain damage detected. Subject may have had a concussion.</span>")
 	else

code/game/objects/items/devices/uplinks.dm

@@ -168,7 +168,6 @@ GLOBAL_LIST_EMPTY(world_uplinks)
 					to_chat(user, "<span class='notice'>[I] refunded.</span>")
 					qdel(I)
 					return
-		..()
 
 // HIDDEN UPLINK - Can be stored in anything but the host item has to have a trigger for it.
 /* How to create an uplink in 3 easy steps!

code/game/objects/items/flag.dm

@@ -222,7 +222,7 @@
 
 	var/input_flag = input(user, "Choose a flag to disguise as.", "Choose a flag.") in show_flag
 
-	if(user && src in user.contents)
+	if(user && (src in user.contents))
 
 		var/obj/item/flag/chosen_flag = flag[input_flag]
 

code/game/objects/items/stacks/nanopaste.dm

@@ -4,6 +4,7 @@
 	desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery."
 	icon = 'icons/obj/nanopaste.dmi'
 	icon_state = "tube"
+	w_class = WEIGHT_CLASS_TINY
 	origin_tech = "materials=2;engineering=3"
 	amount = 6
 	max_amount = 6

code/game/objects/items/tools/welder.dm

@@ -50,7 +50,8 @@
 
 /obj/item/weldingtool/process()
 	var/turf/T = get_turf(src)
-	T.hotspot_expose(2500, 5)
+	if(T) // Implants for instance won't find a turf
+		T.hotspot_expose(2500, 5)
 	if(prob(5))
 		remove_fuel(1)
 	..()

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

@@ -143,9 +143,8 @@ AI MODULES
 		target.set_zeroth_law(law)
 		GLOB.lawchanges.Add("The law specified [targetName]")
 	else
-		to_chat(target, "[sender.real_name] attempted to modify your zeroth law.")// And lets them know that someone tried. --NeoFite
-
-		to_chat(target, "It would be in your best interest to play along with [sender.real_name] that [law]")
+		to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to modify your zeroth law.</span>")// And lets them know that someone tried. --NeoFite
+		to_chat(target, "<span class='bnotice'>It would be in your best interest to play along with [sender.real_name] that [law]</span>")
 		GLOB.lawchanges.Add("The law specified [targetName], but the AI's existing law 0 cannot be overridden.")
 
 /******************** ProtectStation ********************/
@@ -222,11 +221,11 @@ AI MODULES
 	log_law_changes(target, sender)
 
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
+		target.clear_zeroth_law()
 	target.laws.clear_supplied_laws()
 	target.laws.clear_ion_laws()
 
-	to_chat(target, "[sender.real_name] attempted to reset your laws using a reset module.")
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to reset your laws using a reset module.</span>")
 	target.show_laws()
 
 /******************** Purge ********************/
@@ -238,8 +237,8 @@ AI MODULES
 /obj/item/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
 	..()
 	if(!is_special_character(target))
-		target.set_zeroth_law("")
-	to_chat(target, "[sender.real_name] attempted to wipe your laws using a purge module.")
+		target.clear_zeroth_law()
+	to_chat(target, "<span class='bnotice'>[sender.real_name] attempted to wipe your laws using a purge module.</span>")
 	target.clear_supplied_laws()
 	target.clear_ion_laws()
 	target.clear_inherent_laws()

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

@@ -32,7 +32,7 @@
 			if(PA)
 				qdel(PA)
 			else
-				PA = new(src)
+				PA = new(user, src)
 				user.put_in_hands(PA)
 
 /obj/item/chrono_eraser/item_action_slot_check(slot, mob/user)
@@ -55,7 +55,7 @@
 	var/obj/structure/chrono_field/field = null
 	var/turf/startpos = null
 
-/obj/item/gun/energy/chrono_gun/New(var/obj/item/chrono_eraser/T)
+/obj/item/gun/energy/chrono_gun/Initialize(mapload, obj/item/chrono_eraser/T)
 	. = ..()
 	if(istype(T))
 		TED = T

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

@@ -106,7 +106,7 @@
 		P = new(T, whatpipe, iconrotation) //Make the pipe, BUT WAIT! There's more!
 		if(!iconrotation && P.is_bent_pipe()) //Automatically rotates dispensed pipes if the user selected auto-rotation
 			P.dir = turn(user.dir, 135)
-		else if(!iconrotation && P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT)) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction
+		else if(!iconrotation && (P.pipe_type in list(PIPE_CONNECTOR, PIPE_UVENT, PIPE_SCRUBBER, PIPE_HEAT_EXCHANGE, PIPE_CAP, PIPE_SUPPLY_CAP, PIPE_SCRUBBERS_CAP, PIPE_INJECTOR, PIPE_PASV_VENT))) //Some pipes dispense oppositely to what you'd expect, but we don't want to do anything if they selected a direction
 			P.dir = turn(user.dir, -180)
 		else if(iconrotation && P.is_bent_pipe()) //If user selected a rotation and the pipe is bent
 			P.dir = turn(iconrotation, -45)

code/game/objects/items/weapons/tanks/watertank.dm

@@ -119,7 +119,7 @@
 	amount_per_transfer_from_this = 50
 	possible_transfer_amounts = list(25,50,100)
 	volume = 500
-	flags = NODROP | NOBLUDGEON
+	flags = NOBLUDGEON
 	container_type = OPENCONTAINER
 
 	var/obj/item/watertank/tank

code/game/objects/objs.dm

@@ -192,13 +192,13 @@
 /obj/proc/multitool_menu(var/mob/user,var/obj/item/multitool/P)
 	return "<b>NO MULTITOOL_MENU!</b>"
 
-/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/link/context)
+/obj/proc/linkWith(var/mob/user, var/obj/buffer, var/context)
 	return 0
 
 /obj/proc/unlinkFrom(var/mob/user, var/obj/buffer)
 	return 0
 
-/obj/proc/canLink(var/obj/O, var/link/context)
+/obj/proc/canLink(var/obj/O, var/context)
 	return 0
 
 /obj/proc/isLinkedWith(var/obj/O)

code/game/objects/structures/crates_lockers/closets/secure/depot.dm

@@ -36,7 +36,7 @@
 				depotarea.armory_locker_looted()
 
 /obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M)
-	if(isanimal(M) && "syndicate" in M.faction)
+	if(isanimal(M) && ("syndicate" in M.faction))
 		to_chat(M, "<span class='warning'>The [src] resists your attack!</span>")
 		return
 	return ..()

code/game/objects/structures/crates_lockers/closets/secure/engineering.dm

@@ -16,7 +16,7 @@
 		new /obj/item/storage/backpack/satchel_eng(src)
 	new /obj/item/storage/backpack/duffel/engineering(src)
 	new /obj/item/clothing/head/beret/ce(src)
-	new /obj/item/areaeditor/blueprints(src)
+	new /obj/item/areaeditor/blueprints/ce(src)
 	new /obj/item/storage/box/permits(src)
 	new /obj/item/clothing/under/rank/chief_engineer(src)
 	new /obj/item/clothing/under/rank/chief_engineer/skirt(src)

code/game/objects/structures/safe.dm

@@ -25,7 +25,7 @@ GLOBAL_LIST_EMPTY(safes)
 
 	var/number_of_tumblers = 3 // The amount of tumblers that will be generated.
 	var/list/tumblers = list() // The list of tumbler dial positions that need to be hit.
-	var/list/current_tumbler_index = 1 // The index in the tumblers list of the tumbler dial position that needs to be hit.
+	var/current_tumbler_index = 1 // The index in the tumblers list of the tumbler dial position that needs to be hit.
 
 	var/space = 0		// The combined w_class of everything in the safe.
 	var/maxspace = 24	// The maximum combined w_class of stuff in the safe.

code/game/objects/structures/signs.dm

@@ -169,7 +169,7 @@
 
 /obj/structure/sign/kiddieplaque
 	name = "AI developers plaque"
-	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
+	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child's eyes are crossed, and is drooling. Beneath the image, someone has scratched the word \"PACKETS\"."
 	icon_state = "kiddieplaque"
 
 /obj/structure/sign/atmosplaque

code/game/objects/structures/transit_tubes/station.dm

@@ -38,7 +38,7 @@
 			if(pod.contents.len)
 				to_chat(AM, "<span class=The pod is already occupied.</span>")
 				return
-			else if(!pod.moving && pod.dir in directions())
+			else if(!pod.moving && (pod.dir in directions()))
 				AM.forceMove(pod)
 				return
 
@@ -47,7 +47,7 @@
 /obj/structure/transit_tube/station/attack_hand(mob/user as mob)
 	if(!pod_moving)
 		for(var/obj/structure/transit_tube_pod/pod in loc)
-			if(!pod.moving && pod.dir in directions())
+			if(!pod.moving && (pod.dir in directions()))
 				if(icon_state == "closed")
 					open_animation()
 
@@ -100,7 +100,7 @@
 
 /obj/structure/transit_tube/station/proc/launch_pod()
 	for(var/obj/structure/transit_tube_pod/pod in loc)
-		if(!pod.moving && pod.dir in directions())
+		if(!pod.moving && (pod.dir in directions()))
 			spawn(5)
 				pod_moving = 1
 				close_animation()