merging upstream master into local repo

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

@@ -1,4 +1,3 @@
-
 /obj/item/device/laser_pointer
 	name = "laser pointer"
 	desc = "Don't shine it in your eyes!"
@@ -10,14 +9,17 @@
 	slot_flags = SLOT_BELT
 	m_amt = 500
 	g_amt = 500
-	w_class = 1.0
+	w_class = 2 //Increased to 2, because diodes are w_class 2. Conservation of matter.
 	origin_tech = "combat=1"
 	origin_tech = "magnets=2"
 	var/turf/pointer_loc
 	var/energy = 5
 	var/max_energy = 5
+	var/effectchance = 33
 	var/recharging = 0
 	var/recharge_locked = 0
+	var/obj/item/weapon/stock_parts/micro_laser/diode //used for upgrading!
+
 
 /obj/item/device/laser_pointer/red
 	pointer_icon_state = "red_laser"
@@ -30,12 +32,39 @@
 
 /obj/item/device/laser_pointer/New()
 	..()
+	diode = new(src)
 	if(!pointer_icon_state)
 		pointer_icon_state = pick("red_laser","green_laser","blue_laser","purple_laser")
 
+/obj/item/device/laser_pointer/upgraded/New()
+	..()
+	diode = new /obj/item/weapon/stock_parts/micro_laser/ultra
+
+
+
 /obj/item/device/laser_pointer/attack(mob/living/M, mob/user)
 	laser_act(M, user)
 
+/obj/item/device/laser_pointer/attackby(obj/item/W, mob/user)
+	if(istype(W, /obj/item/weapon/stock_parts/micro_laser))
+		if(!diode)
+			user.drop_item()
+			W.loc = src
+			diode = W
+			user << "<span class='notice'>You install a [diode.name] in [src].</span>"
+		else
+			user << "<span class='notice'>[src] already has a diode installed.</span>"
+		return
+
+	else if(istype(W, /obj/item/weapon/screwdriver))
+		if(diode)
+			user << "<span class='notice'>You remove the [diode.name] from the [src].</span>"
+			diode.loc = get_turf(src.loc)
+			diode = null
+		return
+	..()
+	return
+
 /obj/item/device/laser_pointer/afterattack(var/atom/target, var/mob/living/user, flag, params)
 	if(flag)	//we're placing the object on a table or in backpack
 		return
@@ -44,6 +73,9 @@
 /obj/item/device/laser_pointer/proc/laser_act(var/atom/target, var/mob/living/user)
 	if( !(user in (viewers(7,target))) )
 		return
+	if (!diode)
+		user << "<span class='notice'>You point [src] at [target], but nothing happens!</span>"
+		return
 	if (!user.IsAdvancedToolUser())
 		user << "<span class='warning'>You don't have the dexterity to do this!</span>"
 		return
@@ -72,7 +104,7 @@
 			var/mob/living/carbon/C = target
 
 			//20% chance to actually hit the eyes
-			if(prob(20))
+			if(prob(effectchance * diode.rating))
 				add_logs(user, C, "shone in the eyes", object="laser pointer")
 
 				//eye target check
@@ -121,7 +153,7 @@
 	else if(issilicon(target))
 		var/mob/living/silicon/S = target
 		//20% chance to actually hit the sensors
-		if(prob(20))
+		if(prob(effectchance * diode.rating))
 			S.Weaken(rand(5,10))
 			S << "<span class='warning'>Your sensors were overloaded by a laser!</span>"
 			outmsg = "<span class='notice'>You overload [S] by shining [src] at their sensors.</span>"
@@ -132,7 +164,7 @@
 	//cameras
 	else if(istype(target, /obj/machinery/camera))
 		var/obj/machinery/camera/C = target
-		if(prob(20))
+		if(prob(effectchance * diode.rating))
 			C.emp_act(1)
 			outmsg = "<span class='notice'>You hit the lens of [C] with [src], temporarily disabling the camera!</span>"
 			add_logs(user, C, "EMPed", object="laser pointer")
@@ -173,4 +205,4 @@
 			energy = max_energy
 			recharging = 0
 			recharge_locked = 0
-			..()
+			..()

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

@@ -149,7 +149,7 @@
 
 /obj/item/device/radio/headset/headset_srv
 	name = "service radio headset"
-	desc = "Headset used by the foodservice staff, tasked with keeping the station full and happy. To access the service channel, use :v."
+	desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. To access the service channel, use :v."
 	icon_state = "srv_headset"
 	item_state = "headset"
 	keyslot2 = new /obj/item/device/encryptionkey/headset_service
@@ -265,4 +265,4 @@
 
 		secure_radio_connections[ch_name] = radio_controller.add_object(src, radiochannels[ch_name],  RADIO_CHAT)
 
-	return
+	return

code/game/objects/items/robot/robot_items.dm

@@ -21,6 +21,7 @@
 		for(var/mob/O in viewers(M, null))
 			if (O.client)
 				O.show_message("\red <B>[user] has prodded [M] with an electrically-charged arm!</B>", 1, "\red You hear someone fall", 2)
+		add_logs(user, M, "stunned", object="[src.name]", addition="(INTENT: [uppertext(user.a_intent)])")
 
 /obj/item/borg/overdrive
 	name = "overdrive"

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

@@ -11,70 +11,62 @@
 	var/heal_burn = 0
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
-	var/mob/living/carbon/human/H = M
-	var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting)
 
+	if (M.stat == 2)
+		var/t_him = "it"
+		if (M.gender == MALE)
+			t_him = "him"
+		else if (M.gender == FEMALE)
+			t_him = "her"
+		user << "\red \The [M] is dead, you cannot help [t_him]!"
+		return
 
-	if(affecting.status == ORGAN_ORGANIC) //Limb must be organic to be healed - RR
-		if (M.stat == 2)
-			var/t_him = "it"
-			if (M.gender == MALE)
-				t_him = "him"
-			else if (M.gender == FEMALE)
-				t_him = "her"
-			user << "\red \The [M] is dead, you cannot help [t_him]!"
-			return
+	if (!istype(M))
+		user << "\red \The [src] cannot be applied to [M]!"
+		return 1
 
-		if (!istype(M))
-			user << "\red \The [src] cannot be applied to [M]!"
-			return 1
+	if ( ! (istype(user, /mob/living/carbon/human) || \
+			istype(user, /mob/living/silicon) || \
+			istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
+		user << "\red You don't have the dexterity to do this!"
+		return 1
 
-		if ( ! (istype(user, /mob/living/carbon/human) || \
-				istype(user, /mob/living/silicon) || \
-				istype(user, /mob/living/carbon/monkey) && ticker && ticker.mode.name == "monkey") )
-			user << "\red You don't have the dexterity to do this!"
-			return 1
+	if (user)
+		if (M != user)
+			user.visible_message( \
+				"\blue [M] has been applied with [src] by [user].", \
+				"\blue You apply \the [src] to [M]." \
+			)
+		else
+			var/t_himself = "itself"
+			if (user.gender == MALE)
+				t_himself = "himself"
+			else if (user.gender == FEMALE)
+				t_himself = "herself"
 
-		if (user)
-			if (M != user)
-				user.visible_message( \
-					"\blue [M] has been applied with [src] by [user].", \
-					"\blue You apply \the [src] to [M]." \
-				)
-			else
-				var/t_himself = "itself"
-				if (user.gender == MALE)
-					t_himself = "himself"
-				else if (user.gender == FEMALE)
-					t_himself = "herself"
+			user.visible_message( \
+				"\blue [M] applied [src] on [t_himself].", \
+				"\blue You apply \the [src] on yourself." \
+			)
 
-				user.visible_message( \
-					"\blue [M] applied [src] on [t_himself].", \
-					"\blue You apply \the [src] on yourself." \
-				)
-
-		if (istype(M, /mob/living/carbon/human))
-
-
-			if(istype(user, /mob/living/carbon/human))
-				var/mob/living/carbon/human/user2 = user
-				affecting = H.get_organ(check_zone(user2.zone_sel.selecting))
-			else
-				if(!istype(affecting, /obj/item/organ/limb) || affecting:burn_dam <= 0)
-					affecting = H.get_organ("head")
+	if (istype(M, /mob/living/carbon/human))
 
+		var/mob/living/carbon/human/H = M
+		var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
 
+		if(affecting.status == ORGAN_ORGANIC) //Limb must be organic to be healed - RR
 			if (affecting.heal_damage(src.heal_brute, src.heal_burn, 0))
 				H.update_damage_overlays(0)
 
 			M.updatehealth()
 		else
-			M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
-
-
-		use(1)
+			user << "<span class='notice'>Medicine won't work on a robotic limb!</span>"
 	else
-		user << "<span class='notice'>Medicine won't work on a robotic limb!</span>"
+		M.heal_organ_damage((src.heal_brute/2), (src.heal_burn/2))
+
+
+	use(1)
+
 
 
 /obj/item/stack/medical/bruise_pack

code/game/objects/items/toys.dm

@@ -851,7 +851,23 @@ obj/item/toy/singlecard/attack_self(mob/user)
 	Flip()
 
 
-
+/obj/item/toy/nuke
+	name = "\improper Nuclear Fission Explosive toy"
+	desc = "A plastic model of a Nuclear Fission Explosive."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "nuketoyidle"
+	w_class = 2.0
+	var/cooldown = 0
+
+/obj/item/toy/nuke/attack_self(mob/user)
+	if (cooldown < world.time)
+		cooldown = world.time + 3000 //5 minutes
+		user.visible_message("<span class='warning'>[user] presses a button on [src]</span>", "<span class='notice'>You activate [src], it plays a loud noise!</span>", "<span class='notice'>You hear the click of a button.</span>")
+		spawn(5) //gia said so
+			icon_state = "nuketoy"
+			playsound(src, 'sound/machines/Alarm.ogg', 100, 0, surround = 0)
+			sleep(135)
+			icon_state = "nuketoyidle"
 
 
 

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

@@ -56,12 +56,40 @@
 		new /obj/item/stack/sheet/wood( user.loc )
 		del(src)
 
+	if (istype(W, /obj/item/stack/tile/grass))
+		var/obj/item/stack/tile/grass/Grass = W
+		if(Grass.amount > 1)
+			Grass.amount -= 1
+		else
+			del(Grass)
+		new /obj/item/weapon/table_parts/wood/poker( src.loc )
+		visible_message("<span class='notice'>[user] adds grass to the wooden table parts</span>")
+		del(src)
+
 /obj/item/weapon/table_parts/wood/attack_self(mob/user as mob)
 	new /obj/structure/table/woodentable( user.loc )
 	user.drop_item()
 	del(src)
 	return
 
+
+/*
+ * Poker Table Parts
+ */
+
+/obj/item/weapon/table_parts/wood/poker/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/wrench))
+		new /obj/item/stack/sheet/wood( user.loc )
+		new /obj/item/stack/tile/grass( user.loc )
+		del(src)
+
+/obj/item/weapon/table_parts/wood/poker/attack_self(mob/user as mob)
+	new /obj/structure/table/woodentable/poker( user.loc )
+	user.drop_item()
+	del(src)
+	return
+
+
 /*
  * Rack Parts
  */

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

@@ -6,7 +6,7 @@
 	item_state = "waterbackpack"
 	w_class = 4.0
 	slot_flags = SLOT_BACK
-	slowdown = 3
+	slowdown = 1
 	action_button_name = "Toggle Mister"
 
 	var/obj/item/weapon/reagent_containers/glass/mister/noz