Fixes for: #663, #661, #658, and #628

baystation12.dme

@@ -1092,9 +1092,6 @@
 #include "code\WorkInProgress\Ported\Abi79\uplinks.dm"
 #include "code\WorkInProgress\Ported\Bureaucracy\copier.dm"
 #include "code\WorkInProgress\Ported\Bureaucracy\filing.dm"
-#include "code\WorkInProgress\Ported\ZeroPoint\Laser2.dm"
-#include "code\WorkInProgress\Ported\ZeroPoint\LaserComputer.dm"
-#include "code\WorkInProgress\Ported\ZeroPoint\SuperMatter.dm"
 #include "code\WorkInProgress\SkyMarshal\coatrack.dm"
 #include "code\WorkInProgress\SkyMarshal\traitoritems.dm"
 #include "code\WorkInProgress\SkyMarshal\wardrobes.dm"

code/defines/obj/computer.dm

@@ -50,7 +50,10 @@
 	if(stat & BROKEN)
 		user << "\red The status panel is broken!"
 		return
-	user << "\red You don't understand any of this!"
+	if(!issilicon(user))
+		user << "\red You don't understand any of this!"
+	else
+		user << "\blue You know all of this already, why are you messing with it?"
 	return
 
 /obj/machinery/computer/aiupload

code/game/machinery/camera.dm

@@ -95,7 +95,7 @@
 /mob/living/silicon/ai/proc/ai_actual_track(mob/target as mob)
 
 	usr:cameraFollow = target
-	usr << text("Now tracking [] on camera.", target.name)
+	usr << "Now tracking target on camera." //Unidentifieds are no longer screamed at you.
 	if (usr.machine == null)
 		usr.machine = usr
 

code/game/objects/radio/radio.dm

@@ -271,7 +271,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 			"connection" = connection, // the radio connection to use
 			"radio" = src, // stores the radio used for transmission
 			"slow" = 0, // how much to sleep() before broadcasting - simulates net lag
-			"traffic" = 0 // dictates the total traffic sum that the signal went through
+			"traffic" = 0, // dictates the total traffic sum that the signal went through
+			"type" = 0, // determines what type of radio input it is: normal broadcast
+			"server" = null, // the last server to log this signal
+			"reject" = 0	// if nonzero, the signal will not be accepted by any broadcasting machinery
 		)
 		signal.frequency = connection.frequency // Quick frequency set
 
@@ -323,7 +326,10 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
 		"connection" = connection, // the radio connection to use
 		"radio" = src, // stores the radio used for transmission
 		"slow" = 0, // how much to sleep() before broadcasting - simulates net lag
-		"traffic" = 0 // dictates the total traffic sum that the signal went through
+		"traffic" = 0, // dictates the total traffic sum that the signal went through
+		"type" = 0, // determines what type of radio input it is: normal broadcast
+		"server" = null, // the last server to log this signal
+		"reject" = 0	// if nonzero, the signal will not be accepted by any broadcasting machinery
 	)
 	signal.frequency = connection.frequency // Quick frequency set
 

code/modules/projectiles/gun.dm

@@ -52,7 +52,7 @@
 	attack_self()
 		if(target)
 			target.NotTargeted(src)
-			usr.visible_message("[usr] lowers \the [src].")
+			usr.visible_message("\blue [usr] lowers \the [src]...")
 			return 0
 		return 1
 
@@ -89,16 +89,7 @@
 		 || istype(src.in_chamber, /obj/item/projectile/bullet)))
 			//Lets shoot them, then.
 			user.visible_message("\red <b> [user] fires \the [src] point blank at [M]!</b>")
-			M.bullet_act(in_chamber,"head")
-			if (prob(20))
-				if (M.paralysis < 10)
-					M.paralysis = 10
-			else
-				if (M.weakened < 10)
-					M.weakened = 10
-			if(M.stat != 2)	M.stat = 1
-			if(M.health <= -50) //I pumped 7 more rounds into the guy, and only did an extra 26 damage :|
-				M.apply_damage(45) //So we'll put him an inch from death.
+			M.apply_damage(30+in_chamber.damage,BRUTE,"Point Blank Shot") //So we'll put him an inch from death.
 			del(in_chamber)
 			return
 		else if(user.a_intent != "hurt" && load_into_chamber() && istype(src,/obj/item/weapon/gun/energy/taser))
@@ -198,9 +189,9 @@
 			if(target)
 				//usr.ClearRequest("Aim")
 				target.NotTargeted(src)
-				usr.visible_message("[usr] turns \the [src] on [M]!")
+				usr.visible_message("\red <b>[usr] turns \the [src] on [M]!</b>")
 			else
-				usr.visible_message("[usr] aims \a [src] at [M]!")
+				usr.visible_message("\red <b>[usr] aims \a [src] at [M]!</b>")
 			for(var/mob/K in viewers(usr))
 				K << 'TargetOn.ogg'
 			M.Targeted(src)
@@ -210,7 +201,7 @@
 	proc/TargetActed()
 		var/mob/M = loc
 		if(target == M) return
-		if(src.loc != M.equipped())
+		if(src != M.equipped())
 			target.NotTargeted(src)
 			return
 		usr.last_move_intent = world.time