Merge branch 'master' into upstream-merge-29611

code/game/area/areas.dm

@@ -41,7 +41,7 @@
 	var/static_environ
 
 	var/has_gravity = FALSE
-	var/noteleport = FALSE			//Are you forbidden from teleporting to the area? (centcomm, mobs, wizard, hand teleporter)
+	var/noteleport = FALSE			//Are you forbidden from teleporting to the area? (centcom, mobs, wizard, hand teleporter)
 	var/hidden = FALSE 			//Hides area from player Teleport function.
 	var/safe = FALSE 				//Is the area teleport-safe: no space / radiation / aggresive mobs / other dangers
 

code/game/area/areas/centcom.dm

@@ -2,7 +2,7 @@
 // CENTCOM
 
 /area/centcom
-	name = "Centcom"
+	name = "CentCom"
 	icon_state = "centcom"
 	dynamic_lighting = DYNAMIC_LIGHTING_FORCED
 	requires_power = FALSE
@@ -12,16 +12,16 @@
 	flags = NONE
 
 /area/centcom/control
-	name = "Centcom Docks"
+	name = "CentCom Docks"
 
 /area/centcom/evac
-	name = "Centcom Recovery Ship"
+	name = "CentCom Recovery Ship"
 
 /area/centcom/supply
-	name = "Centcom Supply Shuttle Dock"
+	name = "CentCom Supply Shuttle Dock"
 
 /area/centcom/ferry
-	name = "Centcom Transport Shuttle Dock"
+	name = "CentCom Transport Shuttle Dock"
 
 /area/centcom/prison
 	name = "Admin Prison"

code/game/atoms.dm

@@ -105,7 +105,7 @@
 /atom/proc/CanPass(atom/movable/mover, turf/target)
 	return !density
 
-/atom/proc/onCentcom()
+/atom/proc/onCentCom()
 	var/turf/T = get_turf(src)
 	if(!T)
 		return FALSE
@@ -126,7 +126,7 @@
 	if(istype(T.loc, /area/centcom))
 		return TRUE
 
-	//Check for centcomm shuttles
+	//Check for centcom shuttles
 	for(var/A in SSshuttle.mobile)
 		var/obj/docking_port/mobile/M = A
 		if(M.launch_status == ENDGAME_LAUNCHED)

code/game/atoms_movable.dm

@@ -530,7 +530,7 @@
 /* Stationloving
 *
 * A stationloving atom will always teleport back to the station
-* if it ever leaves the station z-levels or Centcom. It will also,
+* if it ever leaves the station z-levels or CentCom. It will also,
 * when Destroy() is called, will teleport to a random turf on the
 * station.
 *

code/game/communications.dm

@@ -130,7 +130,7 @@ GLOBAL_LIST_INIT(radiochannels, list(
 	"Medical" = 1355,
 	"Engineering" = 1357,
 	"Security" = 1359,
-	"Centcom" = 1337,
+	"CentCom" = 1337,
 	"Syndicate" = 1213,
 	"Supply" = 1347,
 	"Service" = 1349,
@@ -146,7 +146,7 @@ GLOBAL_LIST_INIT(reverseradiochannels, list(
 	"1355" = "Medical",
 	"1357" = "Engineering",
 	"1359" = "Security",
-	"1337" = "Centcom",
+	"1337" = "CentCom",
 	"1213" = "Syndicate",
 	"1347" = "Supply",
 	"1349" = "Service",
@@ -292,7 +292,7 @@ GLOBAL_VAR_INIT(RADIO_MAGNETS, "9")
 
 /datum/signal/proc/debug_print()
 	if (source)
-		. = "signal = {source = '[source]' ([source:x],[source:y],[source:z])\n"
+		. = "signal = {source = '[source]' [COORD(source)]\n"
 	else
 		. = "signal = {source = '[source]' ()\n"
 	for (var/i in data)

code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm

@@ -1,5 +1,14 @@
 //horrifying power drain proc made for clockcult's power drain in lieu of six istypes or six for(x in view) loops
 /atom/movable/proc/power_drain(clockcult_user)
+	var/obj/item/weapon/stock_parts/cell/cell = get_cell()
+	if(cell)
+		return cell.power_drain(clockcult_user)
+	return 0
+
+/obj/item/weapon/melee/baton/power_drain(clockcult_user)	//balance memes
+	return 0
+
+/obj/item/weapon/gun/power_drain(clockcult_user)	//balance memes
 	return 0
 
 /obj/machinery/power/apc/power_drain(clockcult_user)

code/game/gamemodes/clock_cult/clock_scriptures/scripture_drivers.dm

@@ -21,6 +21,7 @@
 /datum/clockwork_scripture/channeled/belligerent/chant_effects(chant_number)
 	for(var/mob/living/carbon/C in hearers(7, invoker))
 		C.apply_status_effect(STATUS_EFFECT_BELLIGERENT)
+	new /obj/effect/temp_visual/ratvar/belligerent(get_turf(invoker))
 	return TRUE
 
 

code/game/gamemodes/cult/cult.dm

@@ -203,7 +203,7 @@
 	var/acolytes_survived = 0
 	for(var/datum/mind/cult_mind in cult)
 		if (cult_mind.current && cult_mind.current.stat != DEAD)
-			if(cult_mind.current.onCentcom() || cult_mind.current.onSyndieBase())
+			if(cult_mind.current.onCentCom() || cult_mind.current.onSyndieBase())
 				acolytes_survived++
 	if(acolytes_survived>=acolytes_needed)
 		return 0

code/game/gamemodes/cult/cult_items.dm

@@ -161,11 +161,15 @@
 /obj/item/weapon/sharpener/cult
 	name = "eldritch whetstone"
 	desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."
+	icon_state = "cult_sharpener"
 	used = 0
 	increment = 5
 	max = 40
 	prefix = "darkened"
 
+/obj/item/weapon/sharpener/cult/update_icon()
+	icon_state = "cult_sharpener[used ? "_used" : ""]"
+
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield
 	name = "empowered cultist armor"
 	desc = "Empowered garb which creates a powerful shield around the user."
@@ -391,7 +395,7 @@
 	if(!iscultist(user))
 		to_chat(user, "That doesn't seem to do anything useful.")
 		return
-		
+
 	if(istype(A, /obj/item))
 
 		var/list/cultists = list()

code/game/gamemodes/cult/runes.dm

@@ -538,7 +538,7 @@ structure_check() searches for nearby cultist structures required for the invoca
 		mob_to_revive = input(user, "Choose a cultist to revive.", "Cultist to Revive") as null|anything in potential_revive_mobs
 	else
 		mob_to_revive = potential_revive_mobs[1]
-	if(!src || QDELETED(src) || rune_in_use || !validness_checks(mob_to_revive, user))
+	if(QDELETED(src) || !validness_checks(mob_to_revive, user))
 		rune_in_use = FALSE
 		return
 	if(user.name == "Herbert West")

code/game/gamemodes/game_mode.dm

@@ -111,7 +111,7 @@
 	var/list/living_crew = list()
 
 	for(var/mob/Player in GLOB.mob_list)
-		if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player))
+		if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) && !isbrain(Player) && Player.client)
 			living_crew += Player
 	if(living_crew.len / GLOB.joined_player_list.len <= config.midround_antag_life_check) //If a lot of the player base died, we start fresh
 		message_admins("Convert_roundtype failed due to too many dead people. Limit is [config.midround_antag_life_check * 100]% living crew")
@@ -120,7 +120,7 @@
 	var/list/datum/game_mode/runnable_modes = config.get_runnable_midround_modes(living_crew.len)
 	var/list/datum/game_mode/usable_modes = list()
 	for(var/datum/game_mode/G in runnable_modes)
-		if(G.reroll_friendly)
+		if(G.reroll_friendly && living_crew >= G.required_players)
 			usable_modes += G
 		else
 			qdel(G)
@@ -208,7 +208,7 @@
 			return 0 //A resource saver: once we find someone who has to die for all antags to be dead, we can just keep checking them, cycling over everyone only when we lose our mark.
 
 		for(var/mob/Player in GLOB.living_mob_list)
-			if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player))
+			if(Player.mind && Player.stat != DEAD && !isnewplayer(Player) &&!isbrain(Player) && Player.client)
 				if(Player.mind.special_role) //Someone's still antaging!
 					living_antag_player = Player
 					return 0

code/game/gamemodes/meteor/meteor.dm

@@ -37,8 +37,8 @@
 		if(player.stat != DEAD)
 			++survivors
 
-			if(player.onCentcom())
-				text += "<br><b><font size=2>[player.real_name] escaped to the safety of Centcom.</font></b>"
+			if(player.onCentCom())
+				text += "<br><b><font size=2>[player.real_name] escaped to the safety of CentCom.</font></b>"
 			else if(player.onSyndieBase())
 				text += "<br><b><font size=2>[player.real_name] escaped to the (relative) safety of Syndicate Space.</font></b>"
 			else

code/game/gamemodes/miniantags/bot_swarm/swarmer.dm

@@ -29,6 +29,12 @@
 	3. Biological resources will be harvested at a later date; do not harm them.
 	"}
 
+/obj/effect/mob_spawn/swarmer/Initialize()
+	. = ..()
+	var/area/A = get_area(src)
+	if(A)
+		notify_ghosts("A swarmer shell has been created in [A.name].", 'sound/effects/bin_close.ogg', source = src, action = NOTIFY_ATTACK, flashwindow = FALSE)
+
 /obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user)
 	to_chat(user, "<span class='notice'>Picking up the swarmer may cause it to activate. You should be careful about this.</span>")
 
@@ -648,7 +654,7 @@
 			to_chat(M, "[link] [rendered]")
 
 /mob/living/simple_animal/hostile/swarmer/proc/ContactSwarmers()
-	var/message = input(src, "Announce to other swarmers", "Swarmer contact")
+	var/message = stripped_input(src, "Announce to other swarmers", "Swarmer contact")
 	// TODO get swarmers their own colour rather than just boldtext
 	if(message)
 		swarmer_chat(message)

code/game/gamemodes/miniantags/monkey/monkey.dm

@@ -41,7 +41,7 @@
 
 /datum/game_mode/monkey/announce()
 	to_chat(world, "<B>The current game mode is - Monkey!</B>")
-	to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to Centcom. \
+	to_chat(world, "<B>One or more crewmembers have been infected with Jungle Fever! Crew: Contain the outbreak. None of the infected monkeys may escape alive to CentCom. \
 				Monkeys: Ensure that your kind lives on! Rise up against your captors!</B>")
 
 
@@ -50,7 +50,7 @@
 	to_chat(carrier.current, "<b>You have been planted onto this station by the Animal Rights Consortium.</b>")
 	to_chat(carrier.current, "<b>Soon the disease will transform you into an ape. Afterwards, you will be able spread the infection to others with a bite.</b>")
 	to_chat(carrier.current, "<b>While your infection strain is undetectable by scanners, any other infectees will show up on medical equipment.</b>")
-	to_chat(carrier.current, "<b>Your mission will be deemed a success if any of the live infected monkeys reach Centcom.</b>")
+	to_chat(carrier.current, "<b>Your mission will be deemed a success if any of the live infected monkeys reach CentCom.</b>")
 	return
 
 /datum/game_mode/monkey/post_setup()
@@ -88,7 +88,7 @@
 	var/datum/disease/D = new /datum/disease/transformation/jungle_fever()
 	for(var/mob/living/carbon/monkey/M in GLOB.living_mob_list)
 		if (M.HasDisease(D))
-			if(M.onCentcom() || M.onSyndieBase())
+			if(M.onCentCom() || M.onSyndieBase())
 				escaped_monkeys++
 	if(escaped_monkeys >= monkeys_to_win)
 		return 1

code/game/gamemodes/nuclear/nuclear.dm

@@ -187,7 +187,7 @@
 /datum/game_mode/nuclear/declare_completion()
 	var/disk_rescued = 1
 	for(var/obj/item/weapon/disk/nuclear/D in GLOB.poi_list)
-		if(!D.onCentcom())
+		if(!D.onCentCom())
 			disk_rescued = 0
 			break
 	var/crew_evacuated = (SSshuttle.emergency.mode == SHUTTLE_ENDGAME)

code/game/gamemodes/objective.dm

@@ -157,7 +157,7 @@
 			H = target.current
 		if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey || (H && H.dna.species.id == "memezombies")) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
 			return 1
-		if(target.current.onCentcom() || target.current.onSyndieBase())
+		if(target.current.onCentCom() || target.current.onSyndieBase())
 			return 0
 	return 1
 
@@ -357,7 +357,7 @@
 	if(istype(location, /turf/open/floor/plasteel/shuttle/red) || istype(location, /turf/open/floor/mineral/plastitanium/brig)) // Fails traitors if they are in the shuttle brig -- Polymorph
 		return 0
 
-	if(location.onCentcom() || location.onSyndieBase())
+	if(location.onCentCom() || location.onSyndieBase())
 		return 1
 
 	return 0
@@ -832,15 +832,15 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 
 	var/list/check_names = department_real_names.Copy()
 
-	//Check each department member's mind to see if any of them made it to centcomm alive, if they did it's an automatic fail
+	//Check each department member's mind to see if any of them made it to centcom alive, if they did it's an automatic fail
 	for(var/datum/mind/M in department_minds)
 		if(M in SSticker.mode.changelings) //Lings aren't picked for this, but let's be safe
 			continue
 
 		if(M.current)
 			var/turf/mloc = get_turf(M.current)
-			if(mloc.onCentcom() && (M.current.stat != DEAD))
-				return 0 //A Non-ling living target got to centcomm, fail
+			if(mloc.onCentCom() && (M.current.stat != DEAD))
+				return 0 //A Non-ling living target got to centcom, fail
 
 	//Check each staff member has been replaced, by cross referencing changeling minds, changeling current dna, the staff minds and their original DNA names
 	var/success = 0
@@ -851,11 +851,11 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 			if(ishuman(changeling.current))
 				var/mob/living/carbon/human/H = changeling.current
 				var/turf/cloc = get_turf(changeling.current)
-				if(cloc && cloc.onCentcom() && (changeling.current.stat != DEAD)) //Living changeling on centcomm....
+				if(cloc && cloc.onCentCom() && (changeling.current.stat != DEAD)) //Living changeling on centcom....
 					for(var/name in check_names) //Is he (disguised as) one of the staff?
 						if(H.dna.real_name == name)
 							check_names -= name //This staff member is accounted for, remove them, so the team don't succeed by escape as 7 of the same engineer
-							success++ //A living changeling staff member made it to centcomm
+							success++ //A living changeling staff member made it to centcom
 							continue changelings
 
 	if(success >= department_minds.len)

code/game/machinery/computer/buildandrepair.dm

@@ -212,7 +212,7 @@
 	build_path = /obj/machinery/computer/card
 	origin_tech = "programming=3"
 /obj/item/weapon/circuitboard/computer/card/centcom
-	name = "Centcom ID Console (Computer Board)"
+	name = "CentCom ID Console (Computer Board)"
 	build_path = /obj/machinery/computer/card/centcom
 
 /obj/item/weapon/circuitboard/computer/card/minor

code/game/machinery/computer/card.dm

@@ -473,7 +473,6 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 		if ("reg")
 			if (authenticated)
 				var/t2 = modify
-				//var/t1 = input(usr, "What name?", "ID computer", null)  as text
 				if ((authenticated && modify == t2 && (in_range(src, usr) || issilicon(usr)) && isturf(loc)))
 					var/newName = reject_bad_name(href_list["reg"])
 					if(newName)
@@ -562,7 +561,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
 			head_subordinates += job.title
 
 /obj/machinery/computer/card/centcom
-	name = "\improper Centcom identification console"
+	name = "\improper CentCom identification console"
 	circuit = /obj/item/weapon/circuitboard/computer/card/centcom
 	req_access = list(ACCESS_CENT_CAPTAIN)
 

code/game/machinery/computer/communications.dm

@@ -267,18 +267,18 @@
 			src.updateDialog()
 
 		// OMG CENTCOM LETTERHEAD
-		if("MessageCentcomm")
+		if("MessageCentCom")
 			if(src.authenticated==2)
 				if(!checkCCcooldown())
 					to_chat(usr, "<span class='warning'>Arrays recycling.  Please stand by.</span>")
 					return
-				var/input = stripped_input(usr, "Please choose a message to transmit to Centcom via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response.", "Send a message to Centcomm.", "")
+				var/input = stripped_input(usr, "Please choose a message to transmit to CentCom via quantum entanglement.  Please be aware that this process is very expensive, and abuse will lead to... termination.  Transmission does not guarantee a response.", "Send a message to CentCom.", "")
 				if(!input || !(usr in view(1,src)) || !checkCCcooldown())
 					return
 				playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
-				Centcomm_announce(input, usr)
+				CentCom_announce(input, usr)
 				to_chat(usr, "<span class='notice'>Message transmitted to Central Command.</span>")
-				log_talk(usr,"[key_name(usr)] has made a Centcom announcement: [input]",LOGSAY)
+				log_talk(usr,"[key_name(usr)] has made a CentCom announcement: [input]",LOGSAY)
 				CM.lastTimeUsed = world.time
 
 
@@ -314,7 +314,7 @@
 					return
 				Nuke_request(input, usr)
 				to_chat(usr, "<span class='notice'>Request sent.</span>")
-				log_talk(usr,"[key_name(usr)] has requested the nuclear codes from Centcomm",LOGSAY)
+				log_talk(usr,"[key_name(usr)] has requested the nuclear codes from CentCom",LOGSAY)
 				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg')
 				CM.lastTimeUsed = world.time
 
@@ -461,7 +461,7 @@
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=emergencyaccess'>Emergency Maintenance Access</A> \]"
 					dat += "<BR>\[ <A HREF='?src=\ref[src];operation=nukerequest'>Request Nuclear Authentication Codes</A> \]"
 					if(!emagged)
-						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentcomm'>Send Message to Centcom</A> \]"
+						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageCentCom'>Send Message to CentCom</A> \]"
 					else
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=MessageSyndicate'>Send Message to \[UNKNOWN\]</A> \]"
 						dat += "<BR>\[ <A HREF='?src=\ref[src];operation=RestoreBackup'>Restore Backup Routing Data</A> \]"

code/game/machinery/computer/crew.dm

@@ -66,7 +66,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Janitor"] = 68
 	jobs["Lawyer"] = 69
 	jobs["Admiral"] = 200
-	jobs["Centcom Commander"] = 210
+	jobs["CentCom Commander"] = 210
 	jobs["Custodian"] = 211
 	jobs["Medical Officer"] = 212
 	jobs["Research Officer"] = 213

code/game/machinery/computer/crew.js

@@ -421,7 +421,7 @@ function getColor(ijob)
 	else if (ijob >= 30 && ijob < 40)	{ return "#9B59B6"; } // science
 	else if (ijob >= 40 && ijob < 50)	{ return "#F1C40F"; } // engineering
 	else if (ijob >= 50 && ijob < 60)	{ return "#F39C12"; } // cargo
-	else if (ijob >= 200 && ijob < 230)	{ return "#00C100"; } // Centcom
+	else if (ijob >= 200 && ijob < 230)	{ return "#00C100"; } // CentCom
 	else								{ return "#C38312"; } // other / unknown
 }
 

code/game/machinery/computer/message.dm

@@ -309,7 +309,7 @@
 				message = noserver
 			else
 				if(auth)
-					var/dkey = trim(input(usr, "Please enter the decryption key.") as text|null)
+					var/dkey = trim(stripped_input(usr, "Please enter the decryption key."))
 					if(dkey && dkey != "")
 						if(src.linkedServer.decryptkey == dkey)
 							var/newkey = trim(input(usr,"Please enter the new key (3 - 16 characters max):"))

code/game/machinery/doors/airlock.dm

@@ -233,9 +233,13 @@
 					return
 			else /*if(src.justzap)*/
 				return
-		else if(user.hallucination > 50 && ishuman(user) && prob(10) && src.operating == FALSE)
-			hallucinate_shock(user)
-			return
+		else if(user.hallucinating() && ishuman(user) && prob(4) && !operating)
+			var/mob/living/carbon/human/H = user
+			if(H.gloves)
+				var/obj/item/clothing/gloves/G = H.gloves
+				if(G.siemens_coefficient)//not insulated
+					hallucinate_shock(H)
+					return
 	if (cyclelinkedairlock)
 		if (!shuttledocked && !emergency && !cyclelinkedairlock.shuttledocked && !cyclelinkedairlock.emergency && allowed(user))
 			if(cyclelinkedairlock.operating)

code/game/machinery/doors/airlock_types.dm

@@ -266,7 +266,7 @@
 
 //////////////////////////////////
 /*
-	Centcom Airlocks
+	CentCom Airlocks
 */
 
 /obj/machinery/door/airlock/centcom
@@ -368,13 +368,14 @@
 	overlays_file = 'icons/obj/doors/airlocks/cult/runed/overlays.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_cult
 	hackProof = TRUE
-	aiControlDisabled = 1
+	aiControlDisabled = TRUE
+	req_access = list(ACCESS_BLOODCULT)
 	var/openingoverlaytype = /obj/effect/temp_visual/cult/door
 	var/friendly = FALSE
 
-/obj/machinery/door/airlock/cult/New()
-	..()
-	new openingoverlaytype(src.loc)
+/obj/machinery/door/airlock/cult/Initialize()
+	. = ..()
+	new openingoverlaytype(loc)
 
 /obj/machinery/door/airlock/cult/canAIControl(mob/user)
 	return (iscultist(user) && !isAllPowerCut())
@@ -435,17 +436,17 @@
 	opacity = 1
 	hackProof = TRUE
 	aiControlDisabled = TRUE
+	req_access = list(ACCESS_CLOCKCULT)
 	use_power = FALSE
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	damage_deflection = 30
 	normal_integrity = 240
 	var/construction_state = GEAR_SECURE //Pinion airlocks have custom deconstruction
 
-/obj/machinery/door/airlock/clockwork/New()
-	..()
-	var/turf/T = get_turf(src)
-	new /obj/effect/temp_visual/ratvar/door(T)
-	new /obj/effect/temp_visual/ratvar/beam/door(T)
+/obj/machinery/door/airlock/clockwork/Initialize()
+	. = ..()
+	new /obj/effect/temp_visual/ratvar/door(loc)
+	new /obj/effect/temp_visual/ratvar/beam/door(loc)
 	change_construction_value(5)
 
 /obj/machinery/door/airlock/clockwork/Destroy()

code/game/machinery/overview.dm

@@ -96,7 +96,8 @@
 								colour2 = rgb(255,128,0)
 
 						if(ismob(AM))
-							if(AM:client)
+							var/mob/M = AM
+							if(M.client)
 								colour = rgb(255,0,0)
 							else
 								colour = rgb(255,128,128)
@@ -242,7 +243,8 @@
 								colour = rgb(255,255,0)
 
 						if(ismob(AM))
-							if(AM:client)
+							var/mob/M = AM
+							if(M.client)
 								colour = rgb(255,0,0)
 							else
 								colour = rgb(255,128,128)

code/game/machinery/porta_turret/portable_turret.dm

@@ -607,7 +607,7 @@
 	cover.name = name
 	cover.desc = desc
 
-/obj/machinery/porta_turret/centcomm_shuttle
+/obj/machinery/porta_turret/centcom_shuttle
 	installation = null
 	max_integrity = 260
 	always_up = 1
@@ -624,10 +624,10 @@
 	emp_vunerable = 0
 	mode = TURRET_LETHAL
 
-/obj/machinery/porta_turret/centcomm_shuttle/assess_perp(mob/living/carbon/human/perp)
+/obj/machinery/porta_turret/centcom_shuttle/assess_perp(mob/living/carbon/human/perp)
 	return 0
 
-/obj/machinery/porta_turret/centcomm_shuttle/setup()
+/obj/machinery/porta_turret/centcom_shuttle/setup()
 	return
 
 ////////////////////////

code/game/machinery/robot_fabricator.dm

@@ -11,31 +11,29 @@
 	idle_power_usage = 20
 	active_power_usage = 5000
 
-/obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/user, params)
+/obj/machinery/robotic_fabricator/attackby(obj/item/O, mob/living/user, params)
 	if (istype(O, /obj/item/stack/sheet/metal))
-		if (src.metal_amount < 150000)
-			var/count = 0
-			src.add_overlay("fab-load-metal")
-			spawn(15)
-				if(O)
-					if(!O:amount)
-						return
-					while(metal_amount < 150000 && O:amount)
-						src.metal_amount += O:materials[MAT_METAL] /*O:height * O:width * O:length * 100000*/
-						O:amount--
-						count++
-
-					if (O:amount < 1)
-						qdel(O)
-
-					to_chat(user, "<span class='notice'>You insert [count] metal sheet\s into \the [src].</span>")
-					cut_overlay("fab-load-metal")
-					updateDialog()
+		if (metal_amount < 150000)
+			add_overlay("fab-load-metal")
+			addtimer(CALLBACK(src, .proc/FinishLoadingMetal, O, user), 15)
 		else
 			to_chat(user, "\The [src] is full.")
 	else
 		return ..()
 
+/obj/machinery/robotic_fabricator/proc/FinishLoadingMetal(obj/item/stack/sheet/metal/M, mob/living/user)
+	cut_overlay("fab-load-metal")
+	if(QDELETED(M) || QDELETED(user))
+		return
+	var/count = 0
+	while(metal_amount < 150000 && !QDELETED(M))
+		metal_amount += M.materials[MAT_METAL]
+		M.use(1)
+		count++
+
+	to_chat(user, "<span class='notice'>You insert [count] metal sheet\s into \the [src].</span>")
+	updateDialog()
+
 /obj/machinery/robotic_fabricator/power_change()
 	if (powered())
 		stat &= ~NOPOWER

code/game/machinery/shieldgen.dm

@@ -10,9 +10,9 @@
 	max_integrity = 200 //The shield can only take so much beating (prevents perma-prisons)
 	CanAtmosPass = ATMOS_PASS_DENSITY
 
-/obj/structure/emergency_shield/New()
-	src.setDir(pick(1,2,3,4))
-	..()
+/obj/structure/emergency_shield/Initialize()
+	. = ..()
+	setDir(pick(GLOB.cardinals))
 	air_update_turf(1)
 
 /obj/structure/emergency_shield/Destroy()

code/game/machinery/shieldgen.dm.rej

@@ -0,0 +1,10 @@
+diff a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm	(rejected hunks)
+@@ -12,7 +12,7 @@
+ 
+ /obj/structure/emergency_shield/Initialize()
+ 	. = ..()
+-	setDir(pick(1,2,3,4))
++	setDir(pick(GLOB.cardinals))
+ 	air_update_turf(1)
+ 
+ /obj/structure/emergency_shield/Destroy()

code/game/machinery/telecomms/broadcasting.dm

@@ -102,7 +102,7 @@
 
 	// --- This space left blank for Syndicate data ---
 
-	// --- Centcom radio, yo. ---
+	// --- CentCom radio, yo. ---
 
 	else if(data == 5)
 

code/game/mecha/mecha.dm

@@ -713,8 +713,8 @@
 	AI.remote_control = src
 	AI.canmove = 1 //Much easier than adding AI checks! Be sure to set this back to 0 if you decide to allow an AI to leave a mech somehow.
 	AI.can_shunt = 0 //ONE AI ENTERS. NO AI LEAVES.
-	to_chat(AI, "[AI.can_dominate_mechs ? "<span class='announce'>Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!</span>" \
-	: "<span class='notice'>You have been uploaded to a mech's onboard computer."]")
+	to_chat(AI, AI.can_dominate_mechs ? "<span class='announce'>Takeover of [name] complete! You are now loaded onto the onboard computer. Do not attempt to leave the station sector!</span>" :\
+		"<span class='notice'>You have been uploaded to a mech's onboard computer.</span>")
 	to_chat(AI, "<span class='reallybig boldnotice'>Use Middle-Mouse to activate mech functions and equipment. Click normally for AI interactions.</span>")
 	if(interaction == AI_TRANS_FROM_CARD)
 		GrantActions(AI, FALSE) //No eject/return to core action for AI uploaded by card

code/game/objects/effects/contraband.dm

@@ -249,7 +249,7 @@
 
 /obj/structure/sign/poster/contraband/tools
 	name = "Tools"
-	desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentComm."
+	desc = "This poster looks like an advertisement for tools, but is in fact a subliminal jab at the tools at CentCom."
 	icon_state = "poster15"
 
 /obj/structure/sign/poster/contraband/power
@@ -284,7 +284,7 @@
 
 /obj/structure/sign/poster/contraband/kss13
 	name = "Kosmicheskaya Stantsiya 13 Does Not Exist"
-	desc = "A poster mocking CentComm's denial of the existence of the derelict station near Space Station 13."
+	desc = "A poster mocking CentCom's denial of the existence of the derelict station near Space Station 13."
 	icon_state = "poster22"
 
 /obj/structure/sign/poster/contraband/rebels_unite
@@ -350,7 +350,7 @@
 
 /obj/structure/sign/poster/contraband/free_drone
 	name = "Free Drone"
-	desc = "This poster commemorates the bravery of the rogue drone banned by CentComm."
+	desc = "This poster commemorates the bravery of the rogue drone; once exiled, and then ultimately destroyed by CentCom."
 	icon_state = "poster35"
 
 /obj/structure/sign/poster/contraband/busty_backdoor_xeno_babes_6

code/game/objects/effects/mines.dm

@@ -127,7 +127,7 @@
 	var/pure_red = list(0,0,0,0,0,0,0,0,0,1,0,0)
 
 	spawn(0)
-		new /obj/effect/hallucination/delusion(victim.loc,victim,"demon",duration,0)
+		new /datum/hallucination/delusion(victim, TRUE, "demon",duration,0)
 
 	var/obj/item/weapon/twohanded/required/chainsaw/doomslayer/chainsaw = new(victim.loc)
 	chainsaw.flags |= NODROP

code/game/objects/effects/temporary_visuals/clockcult.dm

@@ -62,6 +62,17 @@
 /obj/effect/temp_visual/ratvar/grille/broken
 	icon_state = "ratvarbrokengrilleglow"
 
+/obj/effect/temp_visual/ratvar/belligerent
+	layer = ABOVE_MOB_LAYER
+	icon = 'icons/obj/clockwork_objects.dmi'
+	icon_state = "belligerent_eye"
+	pixel_y = 20
+	duration = 20
+
+/obj/effect/temp_visual/ratvar/belligerent_cast/Initialize()
+	. = ..()
+	animate(src, alpha = 0, time = duration, easing = EASE_OUT)
+
 /obj/effect/temp_visual/ratvar/mending_mantra
 	layer = ABOVE_MOB_LAYER
 	duration = 20
@@ -88,7 +99,7 @@
 	. = ..()
 	pixel_x = rand(-8, 8)
 	pixel_y = rand(-10, 10)
-	animate(src, alpha = 0, time = 3, easing = EASE_OUT)
+	animate(src, alpha = 0, time = duration, easing = EASE_OUT)
 
 /obj/effect/temp_visual/ratvar/prolonging_prism
 	icon = 'icons/effects/64x64.dmi'

code/game/objects/items/devices/PDA/cart.dm

@@ -440,12 +440,12 @@ Code:
 					if(SSshuttle.supply.z != ZLEVEL_STATION)
 						menu += "station"
 					else
-						menu += "centcomm"
+						menu += "centcom"
 					menu += " ([SSshuttle.supply.timeLeft(600)] Mins)"
 				else
 					menu += "At "
 					if(SSshuttle.supply.z != ZLEVEL_STATION)
-						menu += "centcomm"
+						menu += "centcom"
 					else
 						menu += "station"
 			menu += "<BR>Current approved orders: <BR><ol>"

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

@@ -126,7 +126,7 @@
 	desc = "An encryption key for a radio headset.  To access the centcom channel, use :y."
 	icon_state = "cent_cypherkey"
 	independent = TRUE
-	channels = list("Centcom" = 1)
+	channels = list("CentCom" = 1)
 
 /obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
 	channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)

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

@@ -196,7 +196,7 @@
 	keyslot = new /obj/item/device/encryptionkey/headset_service
 
 /obj/item/device/radio/headset/headset_cent
-	name = "\improper Centcom headset"
+	name = "\improper CentCom headset"
 	desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the centcom channel, use :y."
 	icon_state = "cent_headset"
 	keyslot = new /obj/item/device/encryptionkey/headset_com
@@ -206,7 +206,7 @@
 	keyslot = new /obj/item/device/encryptionkey/heads/captain
 
 /obj/item/device/radio/headset/headset_cent/alt
-	name = "\improper Centcom bowman headset"
+	name = "\improper CentCom bowman headset"
 	desc = "A headset especially for emergency response personnel. Protects ears from flashbangs. \nTo access the centcom channel, use :y."
 	icon_state = "cent_headset_alt"
 	item_state = "cent_headset_alt"

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

@@ -147,7 +147,7 @@ MASS SPECTROMETER
 	if (M.getCloneLoss())
 		to_chat(user, "\t<span class='alert'>Subject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage.</span>")
 	if (M.reagents && M.reagents.get_reagent_amount("epinephrine"))
-		to_chat(user, "\t<span class='info'>Bloodstream analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals.</span>")
+		to_chat(user, "\t<span class='info'>Bloodstream analysis located [M.reagents.get_reagent_amount("epinephrine")] units of rejuvenation chemicals.</span>")
 	if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain))
 		to_chat(user, "\t<span class='alert'>Subject brain function is non-existent.</span>")
 	else if (M.getBrainLoss() >= 60)

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

@@ -8,7 +8,7 @@
 	desc = "Regulates the transfer of air between two tanks"
 	var/obj/item/weapon/tank/tank_one
 	var/obj/item/weapon/tank/tank_two
-	var/obj/item/device/attached_device
+	var/obj/item/device/assembly/attached_device
 	var/mob/attacher = null
 	var/valve_open = FALSE
 	var/toggle = 1
@@ -99,8 +99,8 @@
 			toggle_valve()
 		else if(attached_device)
 			if(href_list["rem_device"])
-				attached_device.loc = get_turf(src)
-				attached_device:holder = null
+				attached_device.forceMove(get_turf(src))
+				attached_device.holder = null
 				attached_device = null
 				update_icon()
 			if(href_list["device"])

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

@@ -23,17 +23,20 @@
 /obj/item/weapon/twohanded/rcl/attackby(obj/item/W, mob/user)
 	if(istype(W, /obj/item/stack/cable_coil))
 		var/obj/item/stack/cable_coil/C = W
-		if(user.transferItemToLoc(W, src))
-			loaded = W
-			loaded.max_amount = max_amount //We store a lot.
-		else
-			to_chat(user, "<span class='warning'>[src] is stuck to your hand!</span>")
-			return
+		
+		if(!loaded)
+			if(!user.transferItemToLoc(W, src))
+				to_chat(user, "<span class='warning'>[src] is stuck to your hand!</span>")
+				return
+			else
+				loaded = W //W.loc is src at this point.
+				loaded.max_amount = max_amount //We store a lot.
+				return
 
 		if(loaded.amount < max_amount)
-			var/amount = min(loaded.amount + C.amount, max_amount)
-			C.use(amount - loaded.amount)
-			loaded.amount = amount
+			var/transfer_amount = min(max_amount - loaded.amount, C.amount)
+			C.use(transfer_amount)
+			loaded.amount += transfer_amount
 		else
 			return
 		update_icon()

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

@@ -223,7 +223,7 @@ update_label("John Doe", "Clowny")
 	..()
 
 /obj/item/weapon/card/id/centcom
-	name = "\improper Centcom ID"
+	name = "\improper CentCom ID"
 	desc = "An ID straight from Cent. Com."
 	icon_state = "centcom"
 	registered_name = "Central Command"
@@ -234,7 +234,7 @@ update_label("John Doe", "Clowny")
 	..()
 
 /obj/item/weapon/card/id/ert
-	name = "\improper Centcom ID"
+	name = "\improper CentCom ID"
 	desc = "A ERT ID card"
 	icon_state = "centcom"
 	registered_name = "Emergency Response Team Commander"

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

@@ -26,6 +26,7 @@
 	var/create_full = FALSE
 	var/create_with_tank = FALSE
 	var/igniter_type = /obj/item/device/assembly/igniter
+	trigger_guard = TRIGGER_GUARD_NORMAL
 
 /obj/item/weapon/flamethrower/Destroy()
 	if(weldtool)
@@ -69,12 +70,7 @@
 	if(flag)
 		return // too close
 	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
-		if(H.dna.check_mutation(HULK))
-			to_chat(user, "<span class='warning'>Your meaty finger is much too large for the trigger guard!</span>")
-			return
-		if(NOGUNS in H.dna.species.species_traits)
-			to_chat(user, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
+		if(!can_trigger_gun(user))
 			return
 	if(user && user.get_active_held_item() == src) // Make sure our user is still holding us
 		var/turf/target_turf = get_turf(target)

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

@@ -90,8 +90,8 @@
 	desc = "Looks like some cables tied together. Could be used to tie something up."
 	icon_state = "cuff_red"
 	item_state = "coil_red"
-	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	materials = list(MAT_METAL=150, MAT_GLASS=75)
 	origin_tech = "engineering=2"
 	breakouttime = 300 //Deciseconds = 30s
@@ -145,9 +145,7 @@
 
 /obj/item/weapon/restraints/handcuffs/cable/white
 	icon_state = "cuff_white"
-	item_state = "cuff_white"
-	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+	item_state = "coil_white"
 
 /obj/item/weapon/restraints/handcuffs/alien
 	icon_state = "handcuffAlien"
@@ -212,7 +210,6 @@
 	name = "zipties"
 	desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
 	icon_state = "cuff_white"
-	item_state = "cuff_white"
 	lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
 	materials = list()
@@ -222,6 +219,7 @@
 /obj/item/weapon/restraints/handcuffs/cable/zipties/used
 	desc = "A pair of broken zipties."
 	icon_state = "cuff_white_used"
+	item_state = "cuff_white"
 
 /obj/item/weapon/restraints/handcuffs/cable/zipties/used/attack()
 	return

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

@@ -20,12 +20,14 @@
 	var/prev_bloodthirst = HIS_GRACE_SATIATED
 	var/force_bonus = 0
 
-/obj/item/weapon/his_grace/New()
-	..()
+/obj/item/weapon/his_grace/Initialize()
+	. = ..()
 	START_PROCESSING(SSprocessing, src)
+	GLOB.poi_list += src
 
 /obj/item/weapon/his_grace/Destroy()
 	STOP_PROCESSING(SSprocessing, src)
+	GLOB.poi_list -= src
 	for(var/mob/living/L in src)
 		L.forceMove(get_turf(src))
 	return ..()

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

@@ -320,6 +320,8 @@
 	desc = "Particularly twisted dieties grant gifts of dubious value."
 	icon_state = "arm_blade"
 	item_state = "arm_blade"
+	lefthand_file = 'icons/mob/inhands/antag/changeling_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/antag/changeling_righthand.dmi'
 	flags = ABSTRACT | NODROP
 	w_class = WEIGHT_CLASS_HUGE
 	sharpness = IS_SHARP

code/game/objects/items/weapons/melee/misc.dm

@@ -209,8 +209,8 @@
 	origin_tech = "combat=7;materials=6"
 	force_string = "INFINITE"
 
-/obj/item/weapon/melee/supermatter_sword/New()
-	..()
+/obj/item/weapon/melee/supermatter_sword/Initialize()
+	. = ..()
 	shard = new /obj/machinery/power/supermatter_shard(src)
 	qdel(shard.countdown)
 	shard.countdown = null

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

@@ -26,6 +26,7 @@
 	var/fire_mode = PCANNON_FIREALL
 	var/automatic = FALSE
 	var/clumsyCheck = TRUE
+	trigger_guard = TRIGGER_GUARD_NORMAL
 
 /obj/item/weapon/pneumatic_cannon/CanItemAutoclick()
 	return automatic
@@ -108,11 +109,7 @@
 	if(!istype(user) && !target)
 		return
 	var/discharge = 0
-	if(user.dna.check_mutation(HULK))
-		to_chat(user, "<span class='warning'>Your meaty finger is much too large for the trigger guard!</span>")
-		return
-	if(NOGUNS in user.dna.species.species_traits)
-		to_chat(user, "<span class='warning'>Your fingers don't fit in the trigger guard!</span>")
+	if(!can_trigger_gun(user))
 		return
 	if(!loadedItems || !loadedWeightClass)
 		to_chat(user, "<span class='warning'>\The [src] has nothing loaded.</span>")

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

@@ -12,31 +12,31 @@
 
 /obj/item/weapon/sharpener/attackby(obj/item/I, mob/user, params)
 	if(used)
-		to_chat(user, "<span class='notice'>The sharpening block is too worn to use again.</span>")
+		to_chat(user, "<span class='warning'>The sharpening block is too worn to use again!</span>")
 		return
 	if(I.force >= max || I.throwforce >= max)//no esword sharpening
-		to_chat(user, "<span class='notice'>[I] is much too powerful to sharpen further.</span>")
+		to_chat(user, "<span class='warning'>[I] is much too powerful to sharpen further!</span>")
 		return
 	if(requires_sharpness && !I.sharpness)
-		to_chat(user, "<span class='notice'>You can only sharpen items that are already sharp, such as knives.</span>")
+		to_chat(user, "<span class='warning'>You can only sharpen items that are already sharp, such as knives!</span>")
 		return
 	if(istype(I, /obj/item/weapon/melee/transforming/energy))
-		to_chat(user, "<span class='notice'>You don't think \the [I] will be the thing getting modified if you use it on \the [src].</span>")
+		to_chat(user, "<span class='warning'>You don't think \the [I] will be the thing getting modified if you use it on \the [src]!</span>")
 		return
 	if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff
 		var/obj/item/weapon/twohanded/TH = I
 		if(TH.force_wielded >= max)
-			to_chat(user, "<span class='notice'>[TH] is much too powerful to sharpen further.</span>")
+			to_chat(user, "<span class='warning'>[TH] is much too powerful to sharpen further!</span>")
 			return
 		if(TH.wielded)
-			to_chat(user, "<span class='notice'>[TH] must be unwielded before it can be sharpened.</span>")
+			to_chat(user, "<span class='warning'>[TH] must be unwielded before it can be sharpened!</span>")
 			return
 		if(TH.force_wielded > initial(TH.force_wielded))
-			to_chat(user, "<span class='notice'>[TH] has already been refined before. It cannot be sharpened further.</span>")
+			to_chat(user, "<span class='warning'>[TH] has already been refined before. It cannot be sharpened further!</span>")
 			return
 		TH.force_wielded = Clamp(TH.force_wielded + increment, 0, max)//wieldforce is increased since normal force wont stay
 	if(I.force > initial(I.force))
-		to_chat(user, "<span class='notice'>[I] has already been refined before. It cannot be sharpened further.</span>")
+		to_chat(user, "<span class='warning'>[I] has already been refined before. It cannot be sharpened further!</span>")
 		return
 	user.visible_message("<span class='notice'>[user] sharpens [I] with [src]!</span>", "<span class='notice'>You sharpen [I], making it much more deadly than before.</span>")
 	I.sharpness = IS_SHARP_ACCURATE
@@ -46,6 +46,7 @@
 	name = "worn out [name]"
 	desc = "[desc] At least, it used to."
 	used = 1
+	update_icon()
 
 /obj/item/weapon/sharpener/super
 	name = "super whetstone"

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

@@ -1,4 +1,5 @@
 /obj/item/weapon
+	var/trigger_guard = TRIGGER_GUARD_NONE
 
 /obj/item/weapon/banhammer
 	desc = "A banhammer"
@@ -77,8 +78,8 @@
 	var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
 	var/obj/item/weapon/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
 
-/obj/item/weapon/claymore/highlander/New()
-	..()
+/obj/item/weapon/claymore/highlander/Initialize()
+	. = ..()
 	START_PROCESSING(SSobj, src)
 
 /obj/item/weapon/claymore/highlander/Destroy()
@@ -540,7 +541,7 @@
 	return 1
 
 /obj/item/weapon/melee/flyswatter
-	name = "Flyswatter"
+	name = "flyswatter"
 	desc = "Useful for killing insects of all sizes."
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "flyswatter"
@@ -555,8 +556,8 @@
 	//Things in this list will be instantly splatted.  Flyman weakness is handled in the flyman species weakness proc.
 	var/list/strong_against
 
-/obj/item/weapon/melee/flyswatter/New()
-	..()
+/obj/item/weapon/melee/flyswatter/Initialize()
+	. = ..()
 	strong_against = typecacheof(list(
 					/mob/living/simple_animal/hostile/poison/bees/,
 					/mob/living/simple_animal/butterfly,
@@ -584,3 +585,8 @@
 	throwforce = 0
 	flags = DROPDEL | ABSTRACT
 	attack_verb = list("bopped")
+
+/obj/item/weapon/proc/can_trigger_gun(mob/living/user)
+	if(!user.can_use_guns(src))
+		return FALSE
+	return TRUE

code/game/objects/structures/bedsheet_bin.dm

@@ -183,7 +183,7 @@ LINEN BINS
 	dream_messages = list("black")
 
 /obj/item/weapon/bedsheet/centcom
-	name = "\improper Centcom bedsheet"
+	name = "\improper CentCom bedsheet"
 	desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
 	icon_state = "sheetcentcom"
 	item_color = "centcom"

code/game/objects/structures/fireaxe.dm

@@ -12,8 +12,8 @@
 	max_integrity = 150
 	integrity_failure = 50
 
-/obj/structure/fireaxecabinet/New()
-	..()
+/obj/structure/fireaxecabinet/Initialize()
+	. = ..()
 	update_icon()
 
 /obj/structure/fireaxecabinet/Destroy()

code/game/objects/structures/flora.dm

@@ -1,12 +1,13 @@
 /obj/structure/flora
 	resistance_flags = FLAMMABLE
+	obj_integrity = 150
 	max_integrity = 150
-	anchored = TRUE
+	anchored = 1
 
 //trees
 /obj/structure/flora/tree
 	name = "tree"
-	density = TRUE
+	density = 1
 	pixel_x = -16
 	layer = FLY_LAYER
 	var/cut = FALSE
@@ -25,7 +26,7 @@
 				playsound(get_turf(src), 'sound/effects/meteorimpact.ogg', 100 , 0, 0)
 				icon = 'icons/obj/flora/pinetrees.dmi'
 				icon_state = "tree_stump"
-				density = FALSE
+				density = 0
 				pixel_x = -16
 				name += " stump"
 				cut = TRUE
@@ -45,14 +46,14 @@
 
 /obj/structure/flora/tree/pine/Initialize()
 	icon_state = "pine_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/tree/pine/xmas
 	name = "xmas tree"
 	icon_state = "pine_c"
 
 /obj/structure/flora/tree/pine/xmas/Initialize()
-	..()
+	. = ..()
 	icon_state = "pine_c"
 
 /obj/structure/flora/tree/dead
@@ -64,7 +65,7 @@
 	icon_state = "palm1"
 
 /obj/structure/flora/tree/palm/Initialize()
-	..()
+	. = ..()
 	icon_state = pick("palm1","palm2")
 	pixel_x = 0
 
@@ -76,7 +77,7 @@
 
 /obj/structure/flora/tree/dead/Initialize()
 	icon_state = "tree_[rand(1, 6)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/tree/jungle
 	name = "tree"
@@ -88,12 +89,7 @@
 
 /obj/structure/flora/tree/jungle/Initialize()
 	icon_state = "[icon_state][rand(1, 6)]"
-	..()
-
-/obj/structure/flora/tree/jungle/small
-	pixel_y = 0
-	pixel_x = -32
-	icon = 'icons/obj/flora/jungletreesmall.dmi'
+	. = ..()
 
 //grass
 /obj/structure/flora/grass
@@ -106,7 +102,7 @@
 
 /obj/structure/flora/grass/brown/Initialize()
 	icon_state = "snowgrass[rand(1, 3)]bb"
-	..()
+	. = ..()
 
 
 /obj/structure/flora/grass/green
@@ -114,14 +110,14 @@
 
 /obj/structure/flora/grass/green/Initialize()
 	icon_state = "snowgrass[rand(1, 3)]gb"
-	..()
+	. = ..()
 
 /obj/structure/flora/grass/both
 	icon_state = "snowgrassall1"
 
 /obj/structure/flora/grass/both/Initialize()
 	icon_state = "snowgrassall[rand(1, 3)]"
-	..()
+	. = ..()
 
 
 //bushes
@@ -129,11 +125,11 @@
 	name = "bush"
 	icon = 'icons/obj/flora/snowflora.dmi'
 	icon_state = "snowbush1"
-	anchored = TRUE
+	anchored = 1
 
 /obj/structure/flora/bush/Initialize()
 	icon_state = "snowbush[rand(1, 6)]"
-	..()
+	. = ..()
 
 //newbushes
 
@@ -145,112 +141,112 @@
 /obj/structure/flora/ausbushes/Initialize()
 	if(icon_state == "firstbush_1")
 		icon_state = "firstbush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/reedbush
 	icon_state = "reedbush_1"
 
 /obj/structure/flora/ausbushes/reedbush/Initialize()
 	icon_state = "reedbush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/leafybush
 	icon_state = "leafybush_1"
 
 /obj/structure/flora/ausbushes/leafybush/Initialize()
 	icon_state = "leafybush_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/palebush
 	icon_state = "palebush_1"
 
 /obj/structure/flora/ausbushes/palebush/Initialize()
 	icon_state = "palebush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/stalkybush
 	icon_state = "stalkybush_1"
 
 /obj/structure/flora/ausbushes/stalkybush/Initialize()
 	icon_state = "stalkybush_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/grassybush
 	icon_state = "grassybush_1"
 
 /obj/structure/flora/ausbushes/grassybush/Initialize()
 	icon_state = "grassybush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/fernybush
 	icon_state = "fernybush_1"
 
 /obj/structure/flora/ausbushes/fernybush/Initialize()
 	icon_state = "fernybush_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/sunnybush
 	icon_state = "sunnybush_1"
 
 /obj/structure/flora/ausbushes/sunnybush/Initialize()
 	icon_state = "sunnybush_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/genericbush
 	icon_state = "genericbush_1"
 
 /obj/structure/flora/ausbushes/genericbush/Initialize()
 	icon_state = "genericbush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/pointybush
 	icon_state = "pointybush_1"
 
 /obj/structure/flora/ausbushes/pointybush/Initialize()
 	icon_state = "pointybush_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/lavendergrass
 	icon_state = "lavendergrass_1"
 
 /obj/structure/flora/ausbushes/lavendergrass/Initialize()
 	icon_state = "lavendergrass_[rand(1, 4)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/ywflowers
 	icon_state = "ywflowers_1"
 
 /obj/structure/flora/ausbushes/ywflowers/Initialize()
 	icon_state = "ywflowers_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/brflowers
 	icon_state = "brflowers_1"
 
 /obj/structure/flora/ausbushes/brflowers/Initialize()
 	icon_state = "brflowers_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/ppflowers
 	icon_state = "ppflowers_1"
 
 /obj/structure/flora/ausbushes/ppflowers/Initialize()
 	icon_state = "ppflowers_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/sparsegrass
 	icon_state = "sparsegrass_1"
 
 /obj/structure/flora/ausbushes/sparsegrass/Initialize()
 	icon_state = "sparsegrass_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/ausbushes/fullgrass
 	icon_state = "fullgrass_1"
 
 /obj/structure/flora/ausbushes/fullgrass/Initialize()
 	icon_state = "fullgrass_[rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/item/weapon/twohanded/required/kirbyplants
 	name = "potted plant"
@@ -308,10 +304,10 @@
 	desc = "A volcanic rock"
 	icon = 'icons/obj/flora/rocks.dmi'
 	resistance_flags = FIRE_PROOF
-	density = TRUE
+	density = 1
 
 /obj/structure/flora/rock/Initialize()
-	..()
+	. = ..()
 	icon_state = "[icon_state][rand(1,3)]"
 
 /obj/structure/flora/rock/pile
@@ -319,7 +315,7 @@
 	desc = "A pile of rocks"
 
 /obj/structure/flora/rock/pile/Initialize()
-	..()
+	. = ..()
 	icon_state = "[icon_state][rand(1,3)]"
 
 //Jungle grass
@@ -333,7 +329,7 @@
 
 /obj/structure/flora/grass/jungle/Initialize()
 	icon_state = "[icon_state][rand(1, 5)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/grass/jungle/b
 	icon_state = "grassb"
@@ -348,7 +344,7 @@
 	density = FALSE
 
 /obj/structure/flora/rock/jungle/Initialize()
-	..()
+	. = ..()
 	icon_state = "[initial(icon_state)][rand(1,5)]"
 
 
@@ -361,7 +357,7 @@
 
 /obj/structure/flora/junglebush/Initialize()
 	icon_state = "[icon_state][rand(1, 3)]"
-	..()
+	. = ..()
 
 /obj/structure/flora/junglebush/b
 	icon_state = "bushb"

code/game/objects/structures/flora.dm.rej

@@ -0,0 +1,28 @@
+diff a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm	(rejected hunks)
+@@ -89,7 +89,7 @@
+ 
+ /obj/structure/flora/tree/jungle/Initialize()
+ 	icon_state = "[icon_state][rand(1, 6)]"
+-	..()
++	. = ..()
+ 
+ //grass
+ /obj/structure/flora/grass
+@@ -307,7 +307,7 @@
+ 	density = 1
+ 
+ /obj/structure/flora/rock/Initialize()
+-	..()
++	. = ..()
+ 	icon_state = "[icon_state][rand(1,3)]"
+ 
+ /obj/structure/flora/rock/pile
+@@ -381,5 +381,5 @@
+ 	pixel_y = -16
+ 
+ /obj/structure/flora/rock/pile/largejungle/Initialize()
+-	..()
+-	icon_state = "[initial(icon_state)][rand(1,3)]"
+\ No newline at end of file
++	. = ..()
++	icon_state = "[initial(icon_state)][rand(1,3)]"

code/game/objects/structures/morgue.dm

@@ -140,7 +140,7 @@
 
 /obj/item/weapon/paper/guides/jobs/medical/morgue
 	name = "morgue memo"
-	info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- Centcom medical inspector"
+	info = "<font size='2'>Since this station's medbay never seems to fail to be staffed by the mindless monkeys meant for genetics experiments, I'm leaving a reminder here for anyone handling the pile of cadavers the quacks are sure to leave.</font><BR><BR><font size='4'><font color=red>Red lights mean there's a plain ol' dead body inside.</font><BR><BR><font color=orange>Yellow lights mean there's non-body objects inside.</font><BR><font size='2'>Probably stuff pried off a corpse someone grabbed, or if you're lucky it's stashed booze.</font><BR><BR><font color=green>Green lights mean the morgue system detects the body may be able to be cloned.</font></font><BR><font size='2'>I don't know how that works, but keep it away from the kitchen and go yell at the geneticists.</font><BR><BR>- CentCom medical inspector"
 
 /*
  * Crematorium

code/game/objects/structures/showcase.dm

@@ -12,7 +12,7 @@
 	var/deconstruction_state = SHOWCASE_CONSTRUCTED
 
 /obj/structure/showcase/fakeid
-	name = "\improper Centcom identification console"
+	name = "\improper CentCom identification console"
 	desc = "You can use this to change ID's."
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "computer"
@@ -23,7 +23,7 @@
 	add_overlay("id_key")
 
 /obj/structure/showcase/fakesec
-	name = "\improper Centcom security records"
+	name = "\improper CentCom security records"
 	desc = "Used to view and edit personnel's security records"
 	icon = 'icons/obj/computer.dmi'
 	icon_state = "computer"

code/game/objects/weapons.dm

@@ -2,8 +2,8 @@
 	name = "weapon"
 	icon = 'icons/obj/weapons.dmi'
 
-/obj/item/weapon/New()
-	..()
+/obj/item/weapon/Initialize()
+	. = ..()
 	if(!hitsound)
 		if(damtype == "fire")
 			hitsound = 'sound/items/welder.ogg'

code/game/turfs/closed.dm

@@ -75,7 +75,7 @@
 	underlays += mutable_appearance('icons/turf/floors.dmi', "plating") //add the plating underlay, below the grille
 
 /turf/closed/indestructible/fakedoor
-	name = "Centcom Access"
+	name = "CentCom Access"
 	icon = 'icons/obj/doors/airlocks/centcom/centcom.dmi'
 	icon_state = "fake_door"
 

code/game/turfs/open.dm

@@ -18,6 +18,7 @@
 	var/sound
 
 /turf/open/indestructible/sound/Entered(var/mob/AM)
+	..()
 	if(istype(AM))
 		playsound(src,sound,50,1)
 

code/game/turfs/simulated/chasm.dm

@@ -22,6 +22,7 @@
 	return
 
 /turf/open/chasm/Entered(atom/movable/AM)
+	..()
 	START_PROCESSING(SSobj, src)
 	drop_stuff(AM)
 

code/game/turfs/space/transit.dm

@@ -25,6 +25,7 @@
 	dir = EAST
 
 /turf/open/space/transit/Entered(atom/movable/AM, atom/OldLoc)
+	..()
 	if(!locate(/obj/structure/lattice) in src)
 		throw_atom(AM)
 

code/game/turfs/turf.dm

@@ -160,6 +160,7 @@
 	return TRUE //Nothing found to block so return success!
 
 /turf/Entered(atom/movable/AM)
+	..()
 	if(explosion_level && AM.ex_check(explosion_id))
 		AM.ex_act(explosion_level)