Merge branch 'master' into mapsyncs43293845982

code/modules/admin/topic.dm

@@ -816,7 +816,9 @@
 	//Antagonist (Orange)
 		var/isbanned_dept = jobban_isbanned(M, "Syndicate")
 		dat += "<table cellpadding='1' cellspacing='0' width='100%'>"
-		dat += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[REF(src)];[HrefToken()];jobban3=Syndicate;jobban4=[REF(M)]'>Antagonist Positions</a></th></tr><tr align='center'>"
+		dat += "<tr bgcolor='ffeeaa'><th colspan='10'><a href='?src=[REF(src)];[HrefToken()];jobban3=Syndicate;jobban4=[REF(M)]'>Antagonist Positions</a> | "
+		dat += "<a href='?src=[REF(src)];[HrefToken()];jobban3=teamantags;jobban4=[REF(M)]'>Team Antagonists</a></th>"
+		dat += "<a href='?src=[REF(src)];[HrefToken()];jobban3=convertantags;jobban4=[REF(M)]'>Conversion Antagonists</a></th></tr><tr align='center'>"
 
 		//Traitor
 		if(jobban_isbanned(M, "traitor") || isbanned_dept)
@@ -940,6 +942,10 @@
 					joblist += jobPos
 			if("ghostroles")
 				joblist += list("pAI", "posibrain", "drone", "deathsquad", "lavaland")
+			if("teamantags")
+				joblist += list("operative", "revolutionary", "cultist", "servant of Ratvar", "abductor", "alien candidate")
+			if("convertantags")
+				joblist += list("revolutionary", "cultist", "servant of Ratvar", "alien candidate")
 			else
 				joblist += href_list["jobban3"]
 

code/modules/atmospherics/machinery/portable/canister.dm

@@ -217,7 +217,7 @@
 /obj/machinery/portable_atmospherics/canister/update_icon()
 	if(stat & BROKEN)
 		cut_overlays()
-		icon_state = "[initial(icon_state)]-1"
+		icon_state = "[icon_state]-1"
 		return
 
 	var/last_update = update

code/modules/clothing/glasses/_glasses.dm

@@ -168,7 +168,7 @@
 
 /obj/item/clothing/glasses/sunglasses
 	name = "sunglasses"
-	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks many flashes."
+	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Enhanced shielding blocks flashes."
 	icon_state = "sun"
 	item_state = "sunglasses"
 	darkness_view = 1
@@ -251,7 +251,7 @@
 	tint = 3			// to make them blind
 
 /obj/item/clothing/glasses/sunglasses/big
-	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks many flashes."
+	desc = "Strangely ancient technology used to help provide rudimentary eye cover. Larger than average enhanced shielding blocks flashes."
 	icon_state = "bigsunglasses"
 	item_state = "bigsunglasses"
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -100,10 +100,10 @@
 		to_chat(user, "<span class='notice'>You heat [name] with [I]!</span>")
 	..()
 
-/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, mob/thrower)
+/obj/item/reagent_containers/food/drinks/throw_impact(atom/target, datum/thrownthing/throwinfo)
 	. = ..()
 	if(!.) //if the bottle wasn't caught
-		smash(target, thrower, TRUE)
+		smash(target, throwinfo.thrower, TRUE)
 
 /obj/item/reagent_containers/food/drinks/proc/smash(atom/target, mob/thrower, ranged = FALSE)
 	if(!isGlass)

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -367,7 +367,7 @@
 			isGlass = FALSE
 	return
 
-/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,mob/thrower)
+/obj/item/reagent_containers/food/drinks/bottle/molotov/throw_impact(atom/target,datum/thrownthing/throwdata)
 	var/firestarter = 0
 	for(var/datum/reagent/R in reagents.reagent_list)
 		for(var/A in accelerants)

code/modules/jobs/job_exp.dm

@@ -132,7 +132,7 @@ GLOBAL_PROTECT(exp_to_update)
 	for(var/client/L in GLOB.clients)
 		if(L.is_afk())
 			continue
-		addtimer(CALLBACK(L,/client/proc/update_exp_list,mins,ann),10)
+		L.update_exp_list(mins,ann)
 
 /datum/controller/subsystem/blackbox/proc/update_exp_db()
 	SSdbcore.MassInsert(format_table_name("role_time"),GLOB.exp_to_update,TRUE)

code/modules/mapping/map_template.dm

@@ -49,8 +49,8 @@
 	SSair.setup_template_machinery(atmos_machines)
 
 /datum/map_template/proc/load_new_z()
-	var/x = round(world.maxx/2)
-	var/y = round(world.maxy/2)
+	var/x = round((world.maxx - width)/2)
+	var/y = round((world.maxy - height)/2)
 
 	var/list/bounds = maploader.load_map(file(mappath), x, y)
 	if(!bounds)

code/modules/power/cable.dm

@@ -76,6 +76,7 @@ By design, d1 is the smallest direction and d2 is the highest
 
 /obj/structure/cable/white
 	cable_color = "white"
+	color = "#ffffff"
 
 // the power cable object
 /obj/structure/cable/Initialize(mapload, param_color)
@@ -493,8 +494,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 /obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null)
 	. = ..()
-	if(new_amount) // MAXCOIL by default
-		amount = new_amount
 
 	var/list/cable_colors = GLOB.cable_colors
 	item_color = param_color || item_color || pick(cable_colors)

code/modules/projectiles/guns/energy/pulse.dm

@@ -20,7 +20,8 @@
 /obj/item/gun/energy/pulse/prize/Initialize()
 	. = ..()
 	GLOB.poi_list += src
-	var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(src)]"
+	var/turf/T = get_turf(src)
+	var/msg = "A pulse rifle prize has been created at [ADMIN_COORDJMP(T)]"
 
 	message_admins(msg)
 	log_game(msg)

code/modules/spells/spell_types/devil.dm

@@ -118,14 +118,15 @@
 				revert_cast()
 				return ..()
 		else
-			user.notransform = 1
+			user.notransform = TRUE
 			user.fakefire()
 			to_chat(src, "<span class='warning'>You begin to phase back into sinful flames.</span>")
 			if(do_mob(user,user,150))
 				user.infernalphaseout()
 			else
 				to_chat(user, "<span class='warning'>You must remain still while exiting.</span>")
-				user.ExtinguishMob()
+				user.notransform = FALSE
+				user.fakefireextinguish()
 		start_recharge()
 		return
 	revert_cast()