Merge branch 'master' into w_class

Conflicts:
	code/game/objects/items/weapons/twohanded.dm

code/modules/modular_computers/NTNet/NTNRC/conversation.dm

@@ -1,6 +1,6 @@
 var/global/static/ntnrc_uid = 0
 
-/datum/ntnet_conversation/
+/datum/ntnet_conversation
 	var/id = null
 	var/title = "Untitled Conversation"
 	var/datum/computer_file/program/chatclient/operator // "Administrator" of this channel. Creator starts as channel's operator,

code/modules/modular_computers/NTNet/NTNet.dm

@@ -2,7 +2,7 @@ var/global/datum/ntnet/ntnet_global = new()
 
 
 // This is the NTNet datum. There can be only one NTNet datum in game at once. Modular computers read data from this.
-/datum/ntnet/
+/datum/ntnet
 	var/list/relays = list()
 	var/list/logs = list()
 	var/list/available_station_software = list()

code/modules/modular_computers/file_system/computer_file.dm

@@ -1,6 +1,6 @@
 var/global/file_uid = 0
 
-/datum/computer_file/
+/datum/computer_file
 	var/filename = "NewFile" 								// Placeholder. No spacebars
 	var/filetype = "XXX" 									// File full names are [filename].[filetype] so like NewFile.XXX in this case
 	var/size = 1											// File size in GQ. Integers only!