Merge tgstation13 r4570 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/modules/mob/mob.dm

@@ -26,9 +26,6 @@
 
 	usr.show_message(t, 1)
 
-/atom/proc/relaymove()
-	return
-
 /mob/proc/show_message(msg, type, alt, alt_type)//Message, type of message (1 or 2), alternative message, alt message type (1 or 2)
 	if(!client)	return
 	if (type)
@@ -75,6 +72,33 @@
 		M.show_message( message, 1, blind_message, 2)
 
 
+//What the fuck is this code
+/mob/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (user.intent != "harm")
+		if (istype(src.l_hand,/obj/item/latexballon) && src.l_hand:air_contents && is_sharp(W))
+			return src.l_hand.attackby(W)
+		if (istype(src.r_hand,/obj/item/latexballon) && src.r_hand:air_contents && is_sharp(W))
+			return src.r_hand.attackby(W)
+	var/shielded = 0
+	if (locate(/obj/item/weapon/grab, src))
+		var/mob/safe = null
+		if (istype(src.l_hand, /obj/item/weapon/grab))
+			var/obj/item/weapon/grab/G = src.l_hand
+			if ((G.state == 3 && get_dir(src, user) == src.dir))
+				safe = G.affecting
+		if (istype(src.r_hand, /obj/item/weapon/grab))
+			var/obj/item/weapon/grab/G = src.r_hand
+			if ((G.state == 3 && get_dir(src, user) == src.dir))
+				safe = G.affecting
+		if (safe)
+			return safe.attackby(W, user)
+	if ((!( shielded ) || !( W.flags ) & 32))
+		spawn( 0 )
+			if (W)
+				W.attack(src, user)
+				return
+	return
+
 /mob/proc/findname(msg)
 	for(var/mob/M in mob_list)
 		if (M.real_name == text("[]", msg))
@@ -505,11 +529,6 @@ var/list/slot_equipment_priority = list( \
 //	..()
 	return
 
-/mob/proc/UpdateLuminosity()
-	if(src.total_luminosity == src.last_luminosity)	return 0//nothing to do here
-	src.last_luminosity = src.total_luminosity
-	sd_SetLuminosity(min(src.total_luminosity,7))//Current hardcode max at 7, should likely be a const somewhere else
-	return 1
 
 /mob/MouseDrop(mob/M as mob)
 	..()
@@ -520,16 +539,6 @@ var/list/slot_equipment_priority = list( \
 	if(LinkBlocked(usr.loc,loc)) return
 	show_inv(usr)
 
-/atom/movable
-	var/mob/pulledby = null
-
-/atom/movable/verb/pull()
-	set name = "Pull"
-	set category = "IC"
-	set src in oview(1)
-
-	usr.start_pulling(src)
-	return
 
 /mob/proc/stop_pulling()
 	if(pulling)
@@ -553,18 +562,6 @@ var/list/slot_equipment_priority = list( \
 			else
 				M.LAssailant = usr
 
-/atom/verb/examine()
-	set name = "Examine"
-	set category = "IC"
-	set src in oview(12)	//make it work from farther away
-
-	if (!( usr ))
-		return
-	usr << "That's \a [src]." //changed to "That's" from "This is" because "This is some metal sheets" sounds dumb compared to "That's some metal sheets" ~Carn
-	usr << desc
-	// *****RM
-	//usr << "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]"
-	return
 
 /mob/proc/can_use_hands()
 	if(handcuffed)
@@ -850,4 +847,7 @@ note dizziness decrements automatically in the mob's Life() proc.
 		for(var/file in args)
 			src << browse_rsc(file)
 		return 1
-	return 0
+	return 0
+
+mob/proc/flash_weak_pain()
+	flick("weak_pain",pain)