Fixed map

.gitignore

@@ -1,11 +1,21 @@
 ###Files and folders specified here will never be tracked.
 
-#Ignore everything in datafolder and subdirectories
+#Ignore everything in data subdirectories
 /data/**/*
 /data/*
 /data/*
 /_maps/map_files/backup
 
+#Ignore generated files in data
+/data/appearance_full.ban
+/data/banlist.bdb
+/data/job_full.ban
+/data/job_fullnew.bdb
+/data/memo.sav
+
+#Do not store automatic map backups
+/_maps/map_files/backup
+
 #Ignore compiled files and other files generated during compilation.
 *.dmb
 *.rsc

bot/NanoTrasenBot.py

@@ -902,42 +902,34 @@ def autoRecv():
                      print truesender+":"+temdata
                   arg = temdata
                   check = temdata.lower()
-                  if check[0:5] == "https":
+
+                  if cache_youtube_links == True:
+                     result = YTCV2(arg)
+                  else:
+                     result = YTCV2(arg,0)
+                  if type(result) == str:
+                     ### To remove ="
+                     if result[0:4] == 'nt="':
+                        result = result[4:]
+                        pass
+                     elif result[0:2] == '="':
+                        result = result[2:]
+                        pass
+                     else:
+                        pass
+                     if """ in result:
+                        result.replace(""",'"')
                      if len(temporal_list) == 1:
-                        #commenting out rather then remove the if and else because this uses odd spaced based indenting that doesn't seem to play well with notepad++ and im not fucking with that. attempting to do so broke everything already and i can't into python. so this works
-                        #conn.privmsg(targetchannel,sender+" :Secure Youtube does NOT exist")
-                        #break
+                        conn.privmsg(targetchannel,sender+" : "+result)
+                        break
                      else:
-                        #temporal_list2.append("Secure Youtube does NOT exist")
-                     break
+                        temporal_list2.append(result)
                   else:
-                     if cache_youtube_links == True:
-                        result = YTCV2(arg)
-                     else:
-                        result = YTCV2(arg,0)
-                     if type(result) == str:
-                        ### To remove ="
-                        if result[0:4] == 'nt="':
-                           result = result[4:]
-                           pass
-                        elif result[0:2] == '="':
-                           result = result[2:]
-                           pass
-                        else:
-                           pass
-                        if """ in result:
-                           result.replace(""",'"')
-                        if len(temporal_list) == 1:
-                           conn.privmsg(targetchannel,sender+" : "+result)
-                           break
-                        else:
-                           temporal_list2.append(result)
+                     if len(temporal_list) == 1:
+                        conn.privmsg(targetchannel,sender+" : The video does not exist")
+                        break
                      else:
-                        if len(temporal_list) == 1:
-                           conn.privmsg(targetchannel,sender+" : The video does not exist")
-                           break
-                        else:
-                           temporal_list2.append("The video does not exist")
+                        temporal_list2.append("The video does not exist")
                if len(temporal_list) == 1:
                   pass
                else:

code/__HELPERS/cmp.dm

@@ -11,10 +11,22 @@
 	return sorttext(a,b)
 
 /proc/cmp_name_asc(atom/a, atom/b)
-	return sorttext(b.name, a.name)
+	var/an = ""
+	var/bn = ""
+	if(a)
+		an = a.name
+	if(b)
+		bn = b.name
+	return sorttext(bn, an)
 
 /proc/cmp_name_dsc(atom/a, atom/b)
-	return sorttext(a.name, b.name)
+	var/an = ""
+	var/bn = ""
+	if(a)
+		an = a.name
+	if(b)
+		bn = b.name
+	return sorttext(an, bn)
 
 var/cmp_field = "name"
 /proc/cmp_records_asc(datum/data/record/a, datum/data/record/b)

code/_onclick/ai.dm

@@ -63,6 +63,10 @@
 		aicamera.camera_mode_off()
 		aicamera.captureimage(A, usr)
 		return
+	if(waypoint_mode)
+		set_waypoint(A)
+		waypoint_mode = 0
+		return
 
 	/*
 		AI restrained() currently does nothing

code/game/area/areas.dm

@@ -392,7 +392,7 @@
 
 			//Anything not bolted down is moved, everything else is destroyed
 			if(!AM.anchored)
-				AM.Move(D)
+				AM.Move(D, SOUTH)
 			else
 				qdel(AM)
 		if(istype(T, /turf/simulated))

code/game/atoms_movable.dm

@@ -4,23 +4,58 @@
 	var/anchored = 0
 	var/move_speed = 10
 	var/l_move_time = 1
-	var/m_flag = 1
 	var/throwing = 0
 	var/throw_speed = 2
 	var/throw_range = 7
 	var/mob/pulledby = null
 	var/languages = 0 //For say() and Hear()
+	var/inertia_dir = 0
 	glide_size = 8
 
-/atom/movable/Move()
-	var/atom/A = src.loc
-	. = ..()
+/atom/movable/Move(atom/newloc, direct = 0)
+	if(!loc || !newloc) return 0
+	last_move = direct
+	var/atom/oldloc = loc
+
+	if(loc != newloc)
+		if (!(direct & (direct - 1))) //Cardinal move
+			. = ..()
+		else //Diagonal move, split it into cardinal moves
+			if (direct & 1)
+				if (direct & 4)
+					if (step(src, NORTH))
+						. = step(src, EAST)
+					else if (step(src, EAST))
+						. = step(src, NORTH)
+				else if (direct & 8)
+					if (step(src, NORTH))
+						. = step(src, WEST)
+					else if (step(src, WEST))
+						. = step(src, NORTH)
+			else if (direct & 2)
+				if (direct & 4)
+					if (step(src, SOUTH))
+						. = step(src, EAST)
+					else if (step(src, EAST))
+						. = step(src, SOUTH)
+				else if (direct & 8)
+					if (step(src, SOUTH))
+						. = step(src, WEST)
+					else if (step(src, WEST))
+						. = step(src, SOUTH)
+
+
+	if(!loc || (loc == oldloc && oldloc != newloc))
+		last_move = 0
+		return
+
 	src.move_speed = world.timeofday - src.l_move_time
 	src.l_move_time = world.timeofday
-	src.m_flag = 1
-	if ((A != src.loc && A && A.z == src.z))
-		src.last_move = get_dir(A, src.loc)
-	return
+
+	spawn(5)	// Causes space drifting. /tg/station has no concept of speed, we just use 5
+		if(loc && direct && last_move == direct)
+			if(loc == newloc) //Remove this check and people can accelerate. Not opening that can of worms just yet.
+				newtonian_move(last_move)
 
 /atom/movable/Del()
 	if(isnull(gc_destroyed) && loc)
@@ -69,6 +104,39 @@
 		return 1
 	return 0
 
+//Called whenever an object moves and by mobs when they attempt to move themselves through space
+//And when an object or action applies a force on src, see newtonian_move() below
+//Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting
+//Mobs should return 1 if they should be able to move of their own volition, see client/Move() in mob_movement.dm
+//movement_dir == 0 when stopping or any dir when trying to move
+/atom/movable/proc/Process_Spacemove(var/movement_dir = 0)
+	if(has_gravity(src))
+		return 1
+
+	if(pulledby)
+		return 1
+
+	if(locate(/obj/structure/lattice) in orange(1, get_turf(src))) //Not realistic but makes pushing things in space easier
+		return 1
+
+	return 0
+
+/atom/movable/proc/newtonian_move(direction) //Only moves the object if it's under no gravity
+
+	if(!loc || Process_Spacemove(0))
+		inertia_dir = 0
+		return 0
+
+	inertia_dir = direction
+	if(!direction)
+		return 1
+
+
+	var/old_dir = dir
+	. = step(src, direction)
+	dir = old_dir
+
+
 /atom/movable/proc/hit_check() // todo: this is partly obsolete due to passflags already, add throwing stuff to mob CanPass and finish it
 	if(src.throwing)
 		for(var/atom/A in get_turf(src))
@@ -116,7 +184,7 @@
 		var/atom/step = get_step(src, (error < 0) ? tdy : tdx)
 		if(!step) // going off the edge of the map makes get_step return null, don't let things go off the edge
 			break
-		src.Move(step)
+		src.Move(step, get_dir(loc, step))
 		hit_check()
 		error += (error < 0) ? tdist_x : -tdist_y;
 		dist_travelled++

code/game/communications.dm

@@ -176,6 +176,9 @@ var/const/RADIO_AIRLOCK = "6"
 var/const/RADIO_SECBOT = "7"
 var/const/RADIO_MULEBOT = "8"
 var/const/RADIO_MAGNETS = "9"
+var/const/RADIO_CLEANBOT = "10"
+var/const/RADIO_FLOORBOT = "11"
+var/const/RADIO_MEDBOT = "12"
 
 var/global/datum/controller/radio/radio_controller
 

code/game/gamemodes/blob/blobs/blob_mobs.dm

@@ -114,8 +114,8 @@
 	pass_flags = PASSBLOB
 	health = 240
 	maxHealth = 240
-	melee_damage_lower = 25
-	melee_damage_upper = 25
+	melee_damage_lower = 10
+	melee_damage_upper = 10
 	attacktext = "hits"
 	attack_sound = 'sound/effects/blobattack.ogg'
 	faction = list("blob")
@@ -139,7 +139,7 @@
 	if(isliving(target))
 		var/mob/living/L = target
 		if(L.reagents)
-			L.reagents.add_reagent("spore_burning", 10)
+			L.reagents.add_reagent("spore_burning", 1)
 
 
 /mob/living/simple_animal/hostile/blobbernaut/blob_act()

code/game/gamemodes/revolution/revolution.dm

@@ -75,8 +75,7 @@
 		var/datum/mind/trotsky = pick(head_revolutionaries)
 		antag_candidates += trotsky
 		head_revolutionaries -= trotsky
-
-	heads_to_kill = heads
+		update_rev_icons_removed(trotsky)
 
 	for(var/datum/mind/rev_mind in head_revolutionaries)
 		log_game("[rev_mind.key] (ckey) has been selected as a head rev")
@@ -164,6 +163,7 @@
 	rev_obj.target = head_mind
 	rev_obj.explanation_text = "Assassinate [head_mind.name], the [head_mind.assigned_role]."
 	rev_mind.objectives += rev_obj
+	heads_to_kill += head_mind
 
 ////////////////////////////////////////////
 //Checks if new heads have joined midround//

code/game/jobs/job/captain.dm

@@ -80,7 +80,7 @@ Head of Personnel
 			            access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_manufacturing, access_construction, access_morgue,
 			            access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
 			            access_theatre, access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
-			            access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom)
+			            access_hop, access_RC_announce, access_keycard_auth, access_gateway, access_mineral_storeroom, access_counter)
 
 
 /datum/job/hop/equip_items(var/mob/living/carbon/human/H)