runtime cleanup!

This reverts commit ceebde6620.

code/modules/admin/banappearance.dm

@@ -0,0 +1,110 @@
+//ban people from using custom names and appearances. that'll show 'em.
+
+var/appearanceban_runonce	//Updates legacy bans with new info
+var/appearance_keylist[0]	//to store the keys
+
+/proc/appearance_fullban(mob/M, reason)
+	if (!M || !M.key) return
+	appearance_keylist.Add(text("[M.ckey] ## [reason]"))
+	appearance_savebanfile()
+
+/proc/appearance_client_fullban(ckey)
+	if (!ckey) return
+	appearance_keylist.Add(text("[ckey]"))
+	appearance_savebanfile()
+
+//returns a reason if M is banned, returns 0 otherwise
+/proc/appearance_isbanned(mob/M)
+	if(M)
+		for(var/s in appearance_keylist)
+			if(findtext(s, "[M.ckey]") == 1)
+				var/startpos = findtext(s, "## ") + 3
+				if(startpos && startpos < length(s))
+					var/text = copytext(s, startpos, 0)
+					if(text)
+						return text
+				return "Reason Unspecified"
+	return 0
+
+/*
+DEBUG
+/mob/verb/list_all_appearances()
+	set name = "list all appearances"
+
+	for(var/s in appearance_keylist)
+		world << s
+
+/mob/verb/reload_appearances()
+	set name = "reload appearances"
+
+	appearance_loadbanfile()
+*/
+
+/proc/appearance_loadbanfile()
+	if(config.ban_legacy_system)
+		var/savefile/S=new("data/appearance_full.ban")
+		S["keys[0]"] >> appearance_keylist
+		log_admin("Loading appearance_rank")
+		S["runonce"] >> appearanceban_runonce
+
+		if (!length(appearance_keylist))
+			appearance_keylist=list()
+			log_admin("appearance_keylist was empty")
+	else
+		if(!establish_db_connection())
+			world.log << "Database connection failed. Reverting to the legacy ban system."
+			diary << "Database connection failed. Reverting to the legacy ban system."
+			config.ban_legacy_system = 1
+			appearance_loadbanfile()
+			return
+
+		//appearance bans
+		var/DBQuery/query = dbcon.NewQuery("SELECT ckey FROM [format_table_name("ban")] WHERE bantype = 'APPEARANCE_PERMABAN' AND NOT unbanned = 1")
+		query.Execute()
+
+		while(query.NextRow())
+			var/ckey = query.item[1]
+
+			appearance_keylist.Add("[ckey]")
+
+/proc/appearance_savebanfile()
+	var/savefile/S=new("data/appearance_full.ban")
+	S["keys[0]"] << appearance_keylist
+
+/proc/appearance_unban(mob/M)
+	appearance_remove("[M.ckey]")
+	appearance_savebanfile()
+
+
+/proc/appearance_updatelegacybans()
+	if(!appearanceban_runonce)
+		log_admin("Updating appearancefile!")
+		// Updates bans.. Or fixes them. Either way.
+		for(var/T in appearance_keylist)
+			if(!T)
+				continue
+		appearanceban_runonce++	//don't run this update again
+
+
+/proc/appearance_remove(X)
+	for (var/i = 1; i <= length(appearance_keylist); i++)
+		if( findtext(appearance_keylist[i], "[X]") )
+			appearance_keylist.Remove(appearance_keylist[i])
+			appearance_savebanfile()
+			return 1
+	return 0
+
+/*
+/proc/DB_ban_isappearancebanned(var/playerckey)
+	establish_db_connection()
+	if(!dbcon.IsConnected())
+		return
+
+	var/sqlplayerckey = sanitizeSQL(ckey(playerckey))
+
+	var/DBQuery/query = dbcon.NewQuery("SELECT id FROM [format_table_name("ban")] WHERE CKEY = '[sqlplayerckey]' AND ((bantype = 'APPEARANCE_PERMABAN') OR (bantype = 'APPEARANCE_TEMPBAN' AND expiration_time > Now())) AND unbanned != 1")
+	query.Execute()
+	while(query.NextRow())
+		return 1
+	return 0
+*/

code/modules/admin/sql_notes.dm

@@ -0,0 +1,217 @@
+/proc/add_note(target_ckey, notetext, timestamp, adminckey, logged = 1, server)
+	if(!dbcon.IsConnected())
+		usr << "<span class='danger'>Failed to establish database connection.</span>"
+		return
+	if(!target_ckey)
+		var/new_ckey = ckey(input(usr,"Who would you like to add a note for?","Enter a ckey",null) as text)
+		if(!new_ckey)
+			return
+		new_ckey = sanitizeSQL(new_ckey)
+		var/DBQuery/query_find_ckey = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ckey = '[new_ckey]'")
+		if(!query_find_ckey.Execute())
+			var/err = query_find_ckey.ErrorMsg()
+			log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
+			return
+		if(!query_find_ckey.NextRow())
+			if(alert(usr, "[new_ckey] has not been seen before, are you sure you want to add them to the watchlist?", "Unknown ckey", "Yes", "No", "Cancel") != "Yes")
+				return
+		target_ckey = new_ckey
+	var/target_sql_ckey = sanitizeSQL(target_ckey)
+	if(!notetext)
+		notetext = input(usr,"Write your Note","Add Note") as message
+		if(!notetext)
+			return
+	notetext = sanitizeSQL(notetext)
+	if(!timestamp)
+		timestamp = SQLtime()
+	if(!adminckey)
+		adminckey = usr.ckey
+		if(!adminckey)
+			return
+	var/admin_sql_ckey = sanitizeSQL(adminckey)
+	if(!server)
+		if (config && config.server_name)
+			server = config.server_name
+	server = sanitizeSQL(server)
+	var/DBQuery/query_noteadd = dbcon.NewQuery("INSERT INTO [format_table_name("notes")] (ckey, timestamp, notetext, adminckey, server) VALUES ('[target_sql_ckey]', '[timestamp]', '[notetext]', '[admin_sql_ckey]', '[server]')")
+	if(!query_noteadd.Execute())
+		var/err = query_noteadd.ErrorMsg()
+		log_game("SQL ERROR adding new note to table. Error : \[[err]\]\n")
+		return
+	if(logged)
+		log_admin("[key_name(usr)] has added a note to [target_ckey]: [notetext]")
+		message_admins("[key_name_admin(usr)] has added a note to [target_ckey]:<br>[notetext]")
+		show_note(target_ckey)
+
+/proc/remove_note(note_id)
+	var/ckey
+	var/notetext
+	var/adminckey
+	if(!dbcon.IsConnected())
+		usr << "<span class='danger'>Failed to establish database connection.</span>"
+		return
+	if(!note_id)
+		return
+	note_id = text2num(note_id)
+	var/DBQuery/query_find_note_del = dbcon.NewQuery("SELECT ckey, notetext, adminckey FROM [format_table_name("notes")] WHERE id = [note_id]")
+	if(!query_find_note_del.Execute())
+		var/err = query_find_note_del.ErrorMsg()
+		log_game("SQL ERROR obtaining ckey, notetext, adminckey from notes table. Error : \[[err]\]\n")
+		return
+	if(query_find_note_del.NextRow())
+		ckey = query_find_note_del.item[1]
+		notetext = query_find_note_del.item[2]
+		adminckey = query_find_note_del.item[3]
+	var/DBQuery/query_del_note = dbcon.NewQuery("DELETE FROM [format_table_name("notes")] WHERE id = [note_id]")
+	if(!query_del_note.Execute())
+		var/err = query_del_note.ErrorMsg()
+		log_game("SQL ERROR removing note from table. Error : \[[err]\]\n")
+		return
+	log_admin("[key_name(usr)] has removed a note made by [adminckey] from [ckey]: [notetext]")
+	message_admins("[key_name_admin(usr)] has removed a note made by [adminckey] from [ckey]:<br>[notetext]")
+	show_note(ckey)
+
+/proc/edit_note(note_id)
+	if(!dbcon.IsConnected())
+		usr << "<span class='danger'>Failed to establish database connection.</span>"
+		return
+	if(!note_id)
+		return
+	note_id = text2num(note_id)
+	var/target_ckey
+	var/sql_ckey = sanitizeSQL(usr.ckey)
+	var/DBQuery/query_find_note_edit = dbcon.NewQuery("SELECT ckey, notetext, adminckey FROM [format_table_name("notes")] WHERE id = [note_id]")
+	if(!query_find_note_edit.Execute())
+		var/err = query_find_note_edit.ErrorMsg()
+		log_game("SQL ERROR obtaining notetext from notes table. Error : \[[err]\]\n")
+		return
+	if(query_find_note_edit.NextRow())
+		target_ckey = query_find_note_edit.item[1]
+		var/old_note = query_find_note_edit.item[2]
+		var/adminckey = query_find_note_edit.item[3]
+		var/new_note = input("Input new note", "New Note", "[old_note]") as message
+		if(!new_note)
+			return
+		new_note = sanitizeSQL(new_note)
+		var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from<br>[old_note]<br>to<br>[new_note]<hr>"
+		edit_text = sanitizeSQL(edit_text)
+		var/DBQuery/query_update_note = dbcon.NewQuery("UPDATE [format_table_name("notes")] SET notetext = '[new_note]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE id = [note_id]")
+		if(!query_update_note.Execute())
+			var/err = query_update_note.ErrorMsg()
+			log_game("SQL ERROR editing note. Error : \[[err]\]\n")
+			return
+		log_admin("[key_name(usr)] has edited [target_ckey]'s note made by [adminckey] from [old_note] to [new_note]")
+		message_admins("[key_name_admin(usr)] has edited [target_ckey]'s note made by [adminckey] from<br>[old_note]<br>to<br>[new_note]")
+		show_note(target_ckey)
+
+/proc/show_note(target_ckey, index, linkless = 0)
+	var/output
+	var/navbar
+	var/ruler
+	ruler = "<hr style='background:#000000; border:0; height:3px'>"
+	navbar = "<a href='?_src_=holder;nonalpha=1'>\[All\]</a>|<a href='?_src_=holder;nonalpha=2'>\[#\]</a>"
+	for(var/letter in alphabet)
+		navbar += "|<a href='?_src_=holder;shownote=[letter]'>\[[letter]\]</a>"
+	navbar += "<br><form method='GET' name='search' action='?'>\
+	<input type='hidden' name='_src_' value='holder'>\
+	<input type='text' name='notessearch' value='[index]'>\
+	<input type='submit' value='Search'></form>"
+	if(!linkless)
+		output = navbar
+	if(target_ckey)
+		var/target_sql_ckey = sanitizeSQL(target_ckey)
+		var/DBQuery/query_get_notes = dbcon.NewQuery("SELECT id, timestamp, notetext, adminckey, last_editor, server FROM [format_table_name("notes")] WHERE ckey = '[target_sql_ckey]' ORDER BY timestamp")
+		if(!query_get_notes.Execute())
+			var/err = query_get_notes.ErrorMsg()
+			log_game("SQL ERROR obtaining ckey, notetext, adminckey, last_editor, server from notes table. Error : \[[err]\]\n")
+			return
+		output += "<h2><center>Notes of [target_ckey]</center></h2>"
+		if(!linkless)
+			output += "<center><a href='?_src_=holder;addnote=[target_ckey]'>\[Add Note\]</a></center>"
+		output += ruler
+		while(query_get_notes.NextRow())
+			var/id = query_get_notes.item[1]
+			var/timestamp = query_get_notes.item[2]
+			var/notetext = query_get_notes.item[3]
+			var/adminckey = query_get_notes.item[4]
+			var/last_editor = query_get_notes.item[5]
+			var/server = query_get_notes.item[6]
+			output += "<b>[timestamp] | [server] | [adminckey]</b>"
+			if(!linkless)
+				output += " <a href='?_src_=holder;removenote=[id]'>\[Remove Note\]</a> <a href='?_src_=holder;editnote=[id]'>\[Edit Note\]</a>"
+				if(last_editor)
+					output += " <font size='2'>Last edit by [last_editor] <a href='?_src_=holder;noteedits=[id]'>(Click here to see edit log)</a></font>"
+			output += "<br>[notetext]<hr style='background:#000000; border:0; height:1px'>"
+	else if(index)
+		var/index_ckey
+		var/search
+		output += "<center><a href='?_src_=holder;addnoteempty=1'>\[Add Note\]</a></center>"
+		output += ruler
+		if(!isnum(index))
+			index = sanitizeSQL(index)
+		switch(index)
+			if(1)
+				search = "^."
+			if(2)
+				search = "^\[^\[:alpha:\]\]"
+			else
+				search = "^[index]"
+		var/DBQuery/query_list_notes = dbcon.NewQuery("SELECT DISTINCT ckey FROM [format_table_name("notes")] WHERE ckey REGEXP '[search]' ORDER BY ckey")
+		if(!query_list_notes.Execute())
+			var/err = query_list_notes.ErrorMsg()
+			log_game("SQL ERROR obtaining ckey from notes table. Error : \[[err]\]\n")
+			return
+		while(query_list_notes.NextRow())
+			index_ckey = query_list_notes.item[1]
+			output += "<a href='?_src_=holder;shownoteckey=[index_ckey]'>[index_ckey]</a><br>"
+	else
+		output += "<center><a href='?_src_=holder;addnoteempty=1'>\[Add Note\]</a></center>"
+		output += ruler
+	usr << browse(output, "window=show_notes;size=900x500")
+
+#define NOTESFILE "data/player_notes.sav"
+//if the AUTOCONVERT_NOTES is turned on, anytime a player connects this will be run to try and add all their notes to the databas
+/proc/convert_notes_sql(ckey)
+	var/savefile/notesfile = new(NOTESFILE)
+	if(!notesfile)
+		log_game("Error: Cannot access [NOTESFILE]")
+		return
+	notesfile.cd = "/[ckey]"
+	while(!notesfile.eof)
+		var/notetext
+		notesfile >> notetext
+		var/server
+		if(config && config.server_name)
+			server = config.server_name
+		var/regex/note = new("^(\\d{2}-\\w{3}-\\d{4}) \\| (.+) ~(\\w+)$", "i")
+		note.Find(notetext)
+		var/timestamp = note.group[1]
+		notetext = note.group[2]
+		var/adminckey = note.group[3]
+		var/DBQuery/query_convert_time = dbcon.NewQuery("SELECT ADDTIME(STR_TO_DATE('[timestamp]','%d-%b-%Y'), '0')")
+		if(!query_convert_time.Execute())
+			var/err = query_convert_time.ErrorMsg()
+			log_game("SQL ERROR converting timestamp. Error : \[[err]\]\n")
+			return
+		if(query_convert_time.NextRow())
+			timestamp = query_convert_time.item[1]
+		if(ckey && notetext && timestamp && adminckey && server)
+			add_note(ckey, notetext, timestamp, adminckey, 0, server)
+	notesfile.cd = "/"
+	notesfile.dir.Remove(ckey)
+
+/*alternatively this proc can be run once to pass through every note and attempt to convert it before deleting the file, if done then AUTOCONVERT_NOTES should be turned off
+this proc can take several minutes to execute fully if converting and cause DD to hang if converting a lot of notes; it's not advised to do so while a server is live
+/proc/mass_convert_notes()
+	world << "Beginning mass note conversion"
+	var/savefile/notesfile = new(NOTESFILE)
+	if(!notesfile)
+		log_game("Error: Cannot access [NOTESFILE]")
+		return
+	notesfile.cd = "/"
+	for(var/ckey in notesfile.dir)
+		convert_notes_sql(ckey)
+	world << "Deleting NOTESFILE"
+	fdel(NOTESFILE)
+	world << "Finished mass note conversion, remember to turn off AUTOCONVERT_NOTES"*/
+#undef NOTESFILE

code/modules/admin/watchlist.dm

@@ -0,0 +1,117 @@
+/client/proc/watchlist_add(target_ckey, browse = 0)
+	if(!target_ckey)
+		var/new_ckey = ckey(input(usr,"Who would you like to add to the watchlist?","Enter a ckey",null) as text)
+		if(!new_ckey)
+			return
+		new_ckey = sanitizeSQL(new_ckey)
+		var/DBQuery/query_watchfind = dbcon.NewQuery("SELECT ckey FROM [format_table_name("player")] WHERE ckey = '[new_ckey]'")
+		if(!query_watchfind.Execute())
+			var/err = query_watchfind.ErrorMsg()
+			log_game("SQL ERROR obtaining ckey from player table. Error : \[[err]\]\n")
+			return
+		if(!query_watchfind.NextRow())
+			if(alert(usr, "[new_ckey] has not been seen before, are you sure you want to add them to the watchlist?", "Unknown ckey", "Yes", "No", "Cancel") != "Yes")
+				return
+		target_ckey = new_ckey
+	var/target_sql_ckey = sanitizeSQL(target_ckey)
+	if(check_watchlist(target_sql_ckey))
+		usr << "<span class='redtext'>[target_sql_ckey] is already on the watchlist.</span>"
+		return
+	var/reason = input(usr,"Please State Reason","Reason") as message
+	if(!reason)
+		return
+	reason = sanitizeSQL(reason)
+	var/timestamp = SQLtime()
+	var/adminckey = usr.ckey
+	if(!adminckey)
+		return
+	var/admin_sql_ckey = sanitizeSQL(adminckey)
+	var/DBQuery/query_watchadd = dbcon.NewQuery("INSERT INTO [format_table_name("watch")] (ckey, reason, adminckey, timestamp) VALUES ('[target_sql_ckey]', '[reason]', '[admin_sql_ckey]', '[timestamp]')")
+	if(!query_watchadd.Execute())
+		var/err = query_watchadd.ErrorMsg()
+		log_game("SQL ERROR during adding new watch entry. Error : \[[err]\]\n")
+		return
+	log_admin("[key_name(usr)] has added [target_ckey] to the watchlist - Reason: [reason]")
+	message_admins("[key_name_admin(usr)] has added [target_ckey] to the watchlist - Reason: [reason]", 1)
+	if(browse)
+		watchlist_show(target_sql_ckey)
+
+/client/proc/watchlist_remove(target_ckey, browse = 0)
+	var/target_sql_ckey = sanitizeSQL(target_ckey)
+	var/DBQuery/query_watchdel = dbcon.NewQuery("DELETE FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+	if(!query_watchdel.Execute())
+		var/err = query_watchdel.ErrorMsg()
+		log_game("SQL ERROR during removing watch entry. Error : \[[err]\]\n")
+		return
+	log_admin("[key_name(usr)] has removed [target_ckey] from the watchlist")
+	message_admins("[key_name_admin(usr)] has removed [target_ckey] from the watchlist", 1)
+	if(browse)
+		watchlist_show()
+
+/client/proc/watchlist_edit(target_ckey, browse = 0)
+	var/target_sql_ckey = sanitizeSQL(target_ckey)
+	var/DBQuery/query_watchreason = dbcon.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+	if(!query_watchreason.Execute())
+		var/err = query_watchreason.ErrorMsg()
+		log_game("SQL ERROR obtaining reason from watch table. Error : \[[err]\]\n")
+		return
+	if(query_watchreason.NextRow())
+		var/watch_reason = query_watchreason.item[1]
+		var/new_reason = input("Input new reason", "New Reason", "[watch_reason]") as message
+		new_reason = sanitizeSQL(new_reason)
+		if(!new_reason)
+			return
+		var/sql_ckey = sanitizeSQL(usr.ckey)
+		var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from<br>[watch_reason]<br>to<br>[new_reason]<hr>"
+		edit_text = sanitizeSQL(edit_text)
+		var/DBQuery/query_watchupdate = dbcon.NewQuery("UPDATE [format_table_name("watch")] SET reason = '[new_reason]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE ckey = '[target_sql_ckey]'")
+		if(!query_watchupdate.Execute())
+			var/err = query_watchupdate.ErrorMsg()
+			log_game("SQL ERROR editing watchlist reason. Error : \[[err]\]\n")
+			return
+		log_admin("[key_name(usr)] has edited [target_ckey]'s watchlist reason from [watch_reason] to [new_reason]")
+		message_admins("[key_name_admin(usr)] has edited [target_ckey]'s watchlist reason from<br>[watch_reason]<br>to<br>[new_reason]")
+		if(browse)
+			watchlist_show(target_sql_ckey)
+
+/client/proc/watchlist_show(search)
+	var/output
+	output += "<form method='GET' name='search' action='?'>\
+	<input type='hidden' name='_src_' value='holder'>\
+	<input type='text' name='watchsearch' value='[search]'>\
+	<input type='submit' value='Search'></form>"
+	output += "<a href='?_src_=holder;watchshow=1'>\[Clear Search\]</a> <a href='?_src_=holder;watchaddbrowse=1'>\[Add Ckey\]</a>"
+	output += "<hr style='background:#000000; border:0; height:3px'>"
+	if(search)
+		search = "^[search]"
+	else
+		search = "^."
+	search = sanitizeSQL(search)
+	var/DBQuery/query_watchlist = dbcon.NewQuery("SELECT ckey, reason, adminckey, timestamp, last_editor FROM [format_table_name("watch")] WHERE ckey REGEXP '[search]' ORDER BY ckey")
+	if(!query_watchlist.Execute())
+		var/err = query_watchlist.ErrorMsg()
+		log_game("SQL ERROR obtaining ckey, reason, adminckey, timestamp, last_editor from watch table. Error : \[[err]\]\n")
+		return
+	while(query_watchlist.NextRow())
+		var/ckey = query_watchlist.item[1]
+		var/reason = query_watchlist.item[2]
+		var/adminckey = query_watchlist.item[3]
+		var/timestamp = query_watchlist.item[4]
+		var/last_editor = query_watchlist.item[5]
+		output += "<b>[ckey]</b> | Added by <b>[adminckey]</b> on <b>[timestamp]</b> <a href='?_src_=holder;watchremovebrowse=[ckey]'>\[Remove\]</a> <a href='?_src_=holder;watcheditbrowse=[ckey]'>\[Edit Reason\]</a>"
+		if(last_editor)
+			output += " <font size='2'>Last edit by [last_editor] <a href='?_src_=holder;watcheditlog=[ckey]'>(Click here to see edit log)</a></font>"
+		output += "<br>[reason]<hr style='background:#000000; border:0; height:1px'>"
+	usr << browse(output, "window=watchwin;size=900x500")
+
+/client/proc/check_watchlist(target_ckey)
+	var/target_sql_ckey = sanitizeSQL(target_ckey)
+	var/DBQuery/query_watch = dbcon.NewQuery("SELECT reason FROM [format_table_name("watch")] WHERE ckey = '[target_sql_ckey]'")
+	if(!query_watch.Execute())
+		var/err = query_watch.ErrorMsg()
+		log_game("SQL ERROR obtaining reason from watch table. Error : \[[err]\]\n")
+		return
+	if(query_watch.NextRow())
+		return query_watch.item[1]
+	else
+		return 0

code/modules/awaymissions/mission_code/blackmarketpackers.dm

@@ -0,0 +1,22 @@
+//Packer Ship Areas
+
+/area/awaymission/BMPship
+	name = "BMP Asteroids"
+	icon_state = "away"
+	luminosity = 0
+
+
+/area/awaymission/BMPship/Aft
+	name = "Aft Block"
+	icon_state = "away1"
+	requires_power = 1
+
+/area/awaymission/BMPship/Midship
+	name = "Midship Block"
+	icon_state = "away2"
+	requires_power = 1
+
+/area/awaymission/BMPship/Fore
+	name = "Fore Block"
+	icon_state = "away3"
+	requires_power = 1

code/modules/awaymissions/mission_code/researchbase.dm

@@ -0,0 +1,64 @@
+//Research Base Areas//--
+
+/area/awaymission/research
+	name = "Research Outpost"
+	icon_state = "away"
+	luminosity = 0
+	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/research/interior
+	name = "Research Inside"
+	requires_power = 1
+	icon_state = "away2"
+
+/area/awaymission/research/interior/cryo
+	name = "Research Cryostasis Room"
+	icon_state = "medbay"
+
+/area/awaymission/research/interior/clonestorage
+	name = "Research Clone Storage"
+	icon_state = "cloning"
+
+/area/awaymission/research/interior/genetics
+	name = "Research Genetics Research"
+	icon_state = "genetics"
+
+/area/awaymission/research/interior/engineering
+	name = "Research Engineering"
+	icon_state = "engine"
+
+/area/awaymission/research/interior/security
+	name = "Research Security"
+	icon_state = "security"
+
+/area/awaymission/research/interior/secure
+	name = "Research Secure Vault"
+
+/area/awaymission/research/interior/maint
+	name = "Research Maintenance"
+	icon_state = "maintcentral"
+
+/area/awaymission/research/interior/dorm
+	name = "Research Dorms"
+	icon_state = "Sleep"
+
+/area/awaymission/research/interior/escapepods
+	name = "Research Escape Wing"
+	icon_state = "exit"
+
+/area/awaymission/research/interior/gateway
+	name = "Research Gateway"
+	icon_state = "start"
+
+/area/awaymission/research/interior/bathroom
+	name = "Research Bathrooms"
+	icon_state = "restrooms"
+
+/area/awaymission/research/interior/medbay
+	name = "Research Medbay"
+	icon_state = "medbay"
+
+/area/awaymission/research/exterior
+	name = "Research Exterior"
+	icon_state = "unknown"
+

code/modules/cargo/exports/money.dm

@@ -0,0 +1,24 @@
+// Space Cash. Now it isn't that useless.
+/datum/export/stack/cash
+	cost = 1 // Multiplied both by value of each bill and by amount of bills in stack.
+	unit_name = "credit"
+	export_types = list(/obj/item/stack/spacecash)
+
+/datum/export/stack/cash/get_amount(obj/O)
+	var/obj/item/stack/spacecash/C = O
+	return ..() * C.value
+
+
+// Coins. At least the coins that do not contain any materials.
+// Material-containing coins cost just as much as their materials do, see materials.dm for exact rates.
+/datum/export/coin
+	cost = 1 // Multiplied by coin's value
+	unit_name = "credit"
+	message = "worth of rare coins"
+	export_types = list(/obj/item/weapon/coin)
+
+/datum/export/coin/get_amount(obj/O)
+	var/obj/item/weapon/coin/C = O
+	if(C.materials && C.materials.len)
+		return 0 // Sold as raw material instead.
+	return ..() * C.value

code/modules/countdown/countdown.dm

@@ -0,0 +1,137 @@
+/obj/effect/countdown
+	name = "countdown"
+	desc = "We're leaving together\n\
+		But still it's farewell\n\
+		And maybe we'll come back\n\
+		To earth, who can tell?"
+
+	var/displayed_text
+	var/atom/attached_to
+	var/text_color = "#ff0000"
+	var/text_size = 4
+	var/started = FALSE
+	invisibility = INVISIBILITY_OBSERVER
+	anchored = TRUE
+	layer = GHOST_LAYER
+
+/obj/effect/countdown/New(atom/A)
+	. = ..()
+	attach(A)
+
+/obj/effect/countdown/proc/attach(atom/A)
+	attached_to = A
+	loc = get_turf(A)
+
+/obj/effect/countdown/proc/start()
+	if(!started)
+		START_PROCESSING(SSfastprocess, src)
+		started = TRUE
+
+/obj/effect/countdown/proc/stop()
+	if(started)
+		overlays.Cut()
+		STOP_PROCESSING(SSfastprocess, src)
+		started = FALSE
+
+/obj/effect/countdown/proc/get_value()
+	// Get the value from our atom
+	return
+
+/obj/effect/countdown/process()
+	if(!attached_to || qdeleted(attached_to))
+		qdel(src)
+	forceMove(get_turf(attached_to))
+	var/new_val = get_value()
+	if(new_val == displayed_text)
+		return
+	displayed_text = new_val
+
+	if(displayed_text)
+		var/image/text_image = new(loc = src)
+		//text_image.maptext = "<font size=[text_size]>[new_val]</font>"
+		text_image.maptext = "<font size = [text_size]>[displayed_text]</font>"
+		text_image.color = text_color
+
+		overlays.Cut()
+		overlays += text_image
+	else
+		overlays.Cut()
+
+/obj/effect/countdown/Destroy()
+	attached_to = null
+	STOP_PROCESSING(SSfastprocess, src)
+	. = ..()
+
+/obj/effect/countdown/syndicatebomb
+	name = "syndicate bomb countdown"
+
+/obj/effect/countdown/syndicatebomb/get_value()
+	var/obj/machinery/syndicatebomb/S = attached_to
+	if(!istype(S))
+		return
+	else if(S.active)
+		return S.timer
+
+/obj/effect/countdown/nuclearbomb
+	name = "nuclear bomb countdown"
+	text_color = "#81FF14"
+
+/obj/effect/countdown/nuclearbomb/get_value()
+	var/obj/machinery/nuclearbomb/N = attached_to
+	if(!istype(N))
+		return
+	else if(N.timing)
+		return N.timeleft
+
+/obj/effect/countdown/clonepod
+	name = "cloning pod countdown"
+	text_color = "#0C479D"
+	text_size = 1
+
+/obj/effect/countdown/clonepod/get_value()
+	var/obj/machinery/clonepod/C = attached_to
+	if(!istype(C))
+		return
+	else if(C.occupant)
+		var/completion = round(C.get_completion())
+		return completion
+
+/obj/effect/countdown/dominator
+	name = "dominator countdown"
+	text_size = 1
+	text_color = "#ff00ff" // Overwritten when the dominator starts
+
+/obj/effect/countdown/dominator/get_value()
+	var/obj/machinery/dominator/D = attached_to
+	if(!istype(D))
+		return
+	else if(D.gang && D.gang.is_dominating)
+		var/timer = D.gang.domination_time_remaining()
+		return timer
+	else
+		return "OFFLINE"
+
+/obj/effect/countdown/clockworkgate
+	name = "gateway countdown"
+	text_size = 1
+	text_color = "#BE8700"
+	layer = POINT_LAYER
+
+/obj/effect/countdown/clockworkgate/get_value()
+	var/obj/structure/clockwork/massive/celestial_gateway/G = attached_to
+	if(!istype(G))
+		return
+	else if(G.health && !G.purpose_fulfilled)
+		return "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'>[GATEWAY_RATVAR_ARRIVAL - G.progress_in_seconds]</div>"
+
+/obj/effect/countdown/transformer
+	name = "transformer countdown"
+	text_color = "#4C5866"
+
+/obj/effect/countdown/transformer/get_value()
+	var/obj/machinery/transformer/T = attached_to
+	if(!istype(T))
+		return
+	else if(T.cooldown)
+		var/seconds_left = max(0, (T.cooldown_timer - world.time) / 10)
+		return "[round(seconds_left)]"

code/modules/holodeck/areas.dm

@@ -0,0 +1,102 @@
+/area/holodeck
+	name = "Holodeck"
+	icon_state = "Holodeck"
+	luminosity = 1
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
+	var/obj/machinery/computer/holodeck/linked
+	var/restricted = 0 // if true, program goes on emag list
+
+/*
+	Power tracking: Use the holodeck computer's power grid
+	Asserts are to avoid the inevitable infinite loops
+*/
+
+/area/holodeck/powered(var/chan)
+	if(!master.requires_power)
+		return 1
+	if(master.always_unpowered)
+		return 0
+	if(!linked)
+		return 0
+	var/area/A = get_area(linked)
+	ASSERT(!istype(A,/area/holodeck))
+	return A.powered(chan)
+
+/area/holodeck/usage(var/chan)
+	if(!linked)
+		return 0
+	var/area/A = get_area(linked)
+	ASSERT(!istype(A,/area/holodeck))
+	return A.usage(chan)
+
+/area/holodeck/addStaticPower(value, powerchannel)
+	if(!linked)
+		return
+	var/area/A = get_area(linked)
+	ASSERT(!istype(A,/area/holodeck))
+	return A.addStaticPower(value,powerchannel)
+
+/area/holodeck/use_power(var/amount, var/chan)
+	if(!linked)
+		return 0
+	var/area/A = get_area(linked)
+	ASSERT(!istype(A,/area/holodeck))
+	return A.use_power(amount,chan)
+
+
+/*
+	This is the standard holodeck.  It is intended to allow you to
+	blow off steam by doing stupid things like laying down, throwing
+	spheres at holes, or bludgeoning people.
+*/
+/area/holodeck/rec_center
+	name = "\improper Recreational Holodeck"
+
+/area/holodeck/rec_center/offline
+	name = "Holodeck - Offline"
+
+/area/holodeck/rec_center/court
+	name = "Holodeck - Empty Court"
+
+/area/holodeck/rec_center/dodgeball
+	name = "Holodeck - Dodgeball Court"
+
+/area/holodeck/rec_center/basketball
+	name = "Holodeck - Basketball Court"
+
+/area/holodeck/rec_center/thunderdome
+	name = "Holodeck - Thunderdome Court"
+
+/area/holodeck/rec_center/beach
+	name = "Holodeck - Beach"
+
+/area/holodeck/rec_center/lounge
+	name = "Holodeck - Lounge"
+
+/area/holodeck/rec_center/medical
+	name = "Holodeck - Emergency Medical"
+
+/area/holodeck/rec_center/pet_lounge
+	name = "Holodeck - Pet Playground"
+
+/area/holodeck/rec_center/winterwonderland
+	name = "Holodeck - Winter Wonderland"
+
+// Bad programs
+
+/area/holodeck/rec_center/burn
+	name = "Holodeck - Atmospheric Burn Test"
+	restricted = 1
+
+/area/holodeck/rec_center/wildlife
+	name = "Holodeck - Wildlife Simulation"
+	restricted = 1
+
+/area/holodeck/rec_center/bunker
+	name = "Holodeck - Holdout Bunker"
+	restricted = 1
+
+/area/holodeck/rec_center/anthophila
+	name = "Holodeck - Anthophila"
+	restricted = 1

code/modules/jobs/whitelist.dm

@@ -0,0 +1,15 @@
+#define WHITELISTFILE "data/whitelist.txt"
+
+var/list/whitelist
+
+/proc/load_whitelist()
+	whitelist = file2list(WHITELISTFILE)
+	if(!whitelist.len)
+		whitelist = null
+
+/proc/check_whitelist(mob/M /*, var/rank*/)
+	if(!whitelist)
+		return 0
+	return ("[M.ckey]" in whitelist)
+
+#undef WHITELISTFILE

code/modules/mining/laborcamp/laborminerals.dm

@@ -0,0 +1,19 @@
+/turf/closed/mineral/random/labormineral
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/iron = 100, /turf/closed/mineral/uranium = 1, /turf/closed/mineral/diamond = 1,
+		/turf/closed/mineral/gold = 1, /turf/closed/mineral/silver = 1, /turf/closed/mineral/plasma = 1)
+	icon_state = "rock_labor"
+
+/turf/closed/mineral/random/labormineral/New()
+	icon_state = "rock"
+	..()
+
+/turf/closed/mineral/random/labormineral/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/iron/volcanic = 100, /turf/closed/mineral/uranium/volcanic = 1, /turf/closed/mineral/diamond/volcanic = 1,
+		/turf/closed/mineral/gold/volcanic = 1, /turf/closed/mineral/silver/volcanic = 1, /turf/closed/mineral/plasma/volcanic = 1)

code/modules/mining/lavaland/lavaland_areas.dm

@@ -0,0 +1,32 @@
+/**********************Lavaland Areas**************************/
+
+/area/lavaland
+	icon_state = "mining"
+	has_gravity = 1
+
+/area/lavaland/surface
+	name = "Lavaland"
+	icon_state = "explored"
+	music = null
+	requires_power = 1
+	ambientsounds = list('sound/ambience/ambilava.ogg')
+
+/area/lavaland/underground
+	name = "Lavaland Caves"
+	icon_state = "unexplored"
+	music = null
+	always_unpowered = 1
+	requires_power = 1
+	poweralm = 0
+	power_environ = 0
+	power_equip = 0
+	power_light = 0
+	ambientsounds = list('sound/ambience/ambilava.ogg')
+
+
+/area/lavaland/surface/outdoors
+	name = "Lavaland Wastes"
+	outdoors = 1
+
+/area/lavaland/surface/outdoors/explored
+	name = "Lavaland Labor Camp"

code/modules/mining/mine_areas.dm

@@ -0,0 +1,77 @@
+/**********************Mine areas**************************/
+
+/area/mine
+	icon_state = "mining"
+	has_gravity = 1
+
+/area/mine/explored
+	name = "Mine"
+	icon_state = "explored"
+	music = null
+	always_unpowered = 1
+	requires_power = 1
+	poweralm = 0
+	power_environ = 0
+	power_equip = 0
+	power_light = 0
+	outdoors = 1
+	ambientsounds = list('sound/ambience/ambimine.ogg')
+
+/area/mine/unexplored
+	name = "Mine"
+	icon_state = "unexplored"
+	music = null
+	always_unpowered = 1
+	requires_power = 1
+	poweralm = 0
+	power_environ = 0
+	power_equip = 0
+	power_light = 0
+	outdoors = 1
+	ambientsounds = list('sound/ambience/ambimine.ogg')
+
+/area/mine/lobby
+	name = "Mining station"
+
+/area/mine/storage
+	name = "Mining station Storage"
+
+/area/mine/production
+	name = "Mining Station Starboard Wing"
+	icon_state = "mining_production"
+
+/area/mine/abandoned
+	name = "Abandoned Mining Station"
+
+/area/mine/living_quarters
+	name = "Mining Station Port Wing"
+	icon_state = "mining_living"
+
+/area/mine/eva
+	name = "Mining Station EVA"
+	icon_state = "mining_eva"
+
+/area/mine/maintenance
+	name = "Mining Station Communications"
+
+/area/mine/cafeteria
+	name = "Mining station Cafeteria"
+
+/area/mine/hydroponics
+	name = "Mining station Hydroponics"
+
+/area/mine/sleeper
+	name = "Mining station Emergency Sleeper"
+
+/area/mine/north_outpost
+	name = "North Mining Outpost"
+
+/area/mine/west_outpost
+	name = "West Mining Outpost"
+
+/area/mine/laborcamp
+	name = "Labor Camp"
+
+/area/mine/laborcamp/security
+	name = "Labor Camp Security"
+	icon_state = "security"

code/modules/mining/mine_turfs.dm

@@ -0,0 +1,807 @@
+/**********************Mineral deposits**************************/
+
+/turf/closed/mineral //wall piece
+	name = "rock"
+	icon = 'icons/turf/mining.dmi'
+	icon_state = "rock"
+	var/smooth_icon = 'icons/turf/smoothrocks.dmi'
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
+	baseturf = /turf/open/floor/plating/asteroid/airless
+	initial_gas_mix = "TEMP=2.7"
+	opacity = 1
+	density = 1
+	blocks_air = 1
+	layer = EDGED_TURF_LAYER
+	temperature = TCMB
+	var/environment_type = "asteroid"
+	var/turf/open/floor/plating/turf_type = /turf/open/floor/plating/asteroid/airless
+	var/mineralType = null
+	var/mineralAmt = 3
+	var/spread = 0 //will the seam spread?
+	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
+	var/last_act = 0
+	var/scan_state = null //Holder for the image we display when we're pinged by a mining scanner
+	var/defer_change = 0
+
+/turf/closed/mineral/New()
+	pixel_y = -4
+	pixel_x = -4
+	icon = smooth_icon
+	..()
+	if (mineralType && mineralAmt && spread && spreadChance)
+		for(var/dir in cardinal)
+			if(prob(spreadChance))
+				var/turf/T = get_step(src, dir)
+				if(istype(T, /turf/closed/mineral/random))
+					Spread(T)
+
+/turf/closed/mineral/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt
+	baseturf = /turf/open/floor/plating/asteroid/basalt
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+/turf/closed/mineral/ex_act(severity, target)
+	..()
+	switch(severity)
+		if(3)
+			if (prob(75))
+				src.gets_drilled(null, 1)
+		if(2)
+			if (prob(90))
+				src.gets_drilled(null, 1)
+		if(1)
+			src.gets_drilled(null, 1)
+	return
+
+/turf/closed/mineral/Spread(turf/T)
+	new src.type(T)
+
+/turf/closed/mineral/random
+	var/mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium = 5, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 10,
+		/turf/closed/mineral/silver = 12, /turf/closed/mineral/plasma = 20, /turf/closed/mineral/iron = 40,
+		/turf/closed/mineral/gibtonite = 4, /turf/open/floor/plating/asteroid/airless/cave = 2, /turf/closed/mineral/bscrystal = 1)
+		//Currently, Adamantine won't spawn as it has no uses. -Durandan
+	var/mineralChance = 13
+
+/turf/closed/mineral/random/New()
+	..()
+
+	if (prob(mineralChance))
+		var/path = pickweight(mineralSpawnChanceList)
+		var/turf/T = new path(src)
+
+		if(T && istype(T, /turf/closed/mineral))
+			var/turf/closed/mineral/M = T
+			M.mineralAmt = rand(1, 5)
+			M.environment_type = src.environment_type
+			M.turf_type = src.turf_type
+			M.baseturf = src.baseturf
+			src = M
+			M.levelupdate()
+
+/turf/closed/mineral/random/high_chance
+	icon_state = "rock_highchance"
+	mineralChance = 25
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium = 35, /turf/closed/mineral/diamond = 30, /turf/closed/mineral/gold = 45,
+		/turf/closed/mineral/silver = 50, /turf/closed/mineral/plasma = 50, /turf/closed/mineral/bscrystal = 20)
+
+/turf/closed/mineral/random/high_chance/New()
+	icon_state = "rock"
+	..()
+
+/turf/closed/mineral/random/low_chance
+	icon_state = "rock_lowchance"
+	mineralChance = 6
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium = 2, /turf/closed/mineral/diamond = 1, /turf/closed/mineral/gold = 4,
+		/turf/closed/mineral/silver = 6, /turf/closed/mineral/plasma = 15, /turf/closed/mineral/iron = 40,
+		/turf/closed/mineral/gibtonite = 2, /turf/closed/mineral/bscrystal = 1)
+
+/turf/closed/mineral/random/low_chance/New()
+	icon_state = "rock"
+	..()
+
+/turf/closed/mineral/iron
+	mineralType = /obj/item/weapon/ore/iron
+	spreadChance = 20
+	spread = 1
+	scan_state = "rock_Iron"
+
+/turf/closed/mineral/uranium
+	mineralType = /obj/item/weapon/ore/uranium
+	spreadChance = 5
+	spread = 1
+	scan_state = "rock_Uranium"
+
+/turf/closed/mineral/diamond
+	mineralType = /obj/item/weapon/ore/diamond
+	spreadChance = 0
+	spread = 1
+	scan_state = "rock_Diamond"
+
+/turf/closed/mineral/gold
+	mineralType = /obj/item/weapon/ore/gold
+	spreadChance = 5
+	spread = 1
+	scan_state = "rock_Gold"
+
+/turf/closed/mineral/silver
+	mineralType = /obj/item/weapon/ore/silver
+	spreadChance = 5
+	spread = 1
+	scan_state = "rock_Silver"
+
+/turf/closed/mineral/plasma
+	mineralType = /obj/item/weapon/ore/plasma
+	spreadChance = 8
+	spread = 1
+	scan_state = "rock_Plasma"
+
+/turf/closed/mineral/clown
+	mineralType = /obj/item/weapon/ore/bananium
+	mineralAmt = 3
+	spreadChance = 0
+	spread = 0
+	scan_state = "rock_Clown"
+
+/turf/closed/mineral/bscrystal
+	mineralType = /obj/item/weapon/ore/bluespace_crystal
+	mineralAmt = 1
+	spreadChance = 0
+	spread = 0
+	scan_state = "rock_BScrystal"
+
+////////////////////////////////Gibtonite
+/turf/closed/mineral/gibtonite
+	mineralAmt = 1
+	spreadChance = 0
+	spread = 0
+	scan_state = "rock_Gibtonite"
+	var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
+	var/stage = 0 //How far into the lifecycle of gibtonite we are, 0 is untouched, 1 is active and attempting to detonate, 2 is benign and ready for extraction
+	var/activated_ckey = null //These are to track who triggered the gibtonite deposit for logging purposes
+	var/activated_name = null
+	var/activated_image = null
+
+/turf/closed/mineral/gibtonite/New()
+	det_time = rand(8,10) //So you don't know exactly when the hot potato will explode
+	..()
+
+/turf/closed/mineral/gibtonite/attackby(obj/item/I, mob/user, params)
+	if(istype(I, /obj/item/device/mining_scanner) || istype(I, /obj/item/device/t_scanner/adv_mining_scanner) && stage == 1)
+		user.visible_message("<span class='notice'>[user] holds [I] to [src]...</span>", "<span class='notice'>You use [I] to locate where to cut off the chain reaction and attempt to stop it...</span>")
+		defuse()
+	..()
+
+/turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
+	if(stage == 0)
+		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_active", layer = ON_EDGED_TURF_LAYER)
+		add_overlay(I)
+		activated_image = I
+		name = "gibtonite deposit"
+		desc = "An active gibtonite reserve. Run!"
+		stage = 1
+		visible_message("<span class='danger'>There was gibtonite inside! It's going to explode!</span>")
+		var/turf/bombturf = get_turf(src)
+		var/area/A = get_area(bombturf)
+
+		var/notify_admins = 0
+		if(z != 5)
+			notify_admins = 1
+			if(!triggered_by_explosion)
+				message_admins("[key_name_admin(user)]<A HREF='?_src_=holder;adminmoreinfo=\ref[user]'>?</A> (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[user]'>FLW</A>) has triggered a gibtonite deposit reaction at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
+			else
+				message_admins("An explosion has triggered a gibtonite deposit reaction at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
+
+		if(!triggered_by_explosion)
+			log_game("[key_name(user)] has triggered a gibtonite deposit reaction at [A.name] ([A.x], [A.y], [A.z]).")
+		else
+			log_game("An explosion has triggered a gibtonite deposit reaction at [A.name]([bombturf.x],[bombturf.y],[bombturf.z])")
+
+		countdown(notify_admins)
+
+/turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0)
+	set waitfor = 0
+	while(istype(src, /turf/closed/mineral/gibtonite) && stage == 1 && det_time > 0 && mineralAmt >= 1)
+		det_time--
+		sleep(5)
+	if(istype(src, /turf/closed/mineral/gibtonite))
+		if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
+			var/turf/bombturf = get_turf(src)
+			mineralAmt = 0
+			stage = 3
+			explosion(bombturf,1,3,5, adminlog = notify_admins)
+
+/turf/closed/mineral/gibtonite/proc/defuse()
+	if(stage == 1)
+		overlays -= activated_image
+		var/image/I = image('icons/turf/smoothrocks.dmi', loc = src, icon_state = "rock_Gibtonite_inactive", layer = ON_EDGED_TURF_LAYER)
+		add_overlay(I)
+		desc = "An inactive gibtonite reserve. The ore can be extracted."
+		stage = 2
+		if(det_time < 0)
+			det_time = 0
+		visible_message("<span class='notice'>The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!</span>")
+
+/turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
+	if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated
+		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
+		explosive_reaction(user, triggered_by_explosion)
+		return
+	if(stage == 1 && mineralAmt >= 1) //Gibtonite deposit goes kaboom
+		var/turf/bombturf = get_turf(src)
+		mineralAmt = 0
+		stage = 3
+		explosion(bombturf,1,2,5, adminlog = 0)
+	if(stage == 2) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
+		var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
+		if(det_time <= 0)
+			G.quality = 3
+			G.icon_state = "Gibtonite ore 3"
+		if(det_time >= 1 && det_time <= 2)
+			G.quality = 2
+			G.icon_state = "Gibtonite ore 2"
+
+	ChangeTurf(turf_type, defer_change)
+	spawn(10)
+		AfterChange()
+
+/turf/closed/mineral/gibtonite/volcanic
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+////////////////////////////////End Gibtonite
+
+/turf/open/floor/plating/asteroid/airless/cave
+	var/length = 100
+	var/mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 1, /mob/living/simple_animal/hostile/asteroid/goliath = 5, /mob/living/simple_animal/hostile/asteroid/basilisk = 4, /mob/living/simple_animal/hostile/asteroid/hivelord = 3)
+	var/sanity = 1
+	turf_type = /turf/open/floor/plating/asteroid/airless
+
+/turf/open/floor/plating/asteroid/airless/cave/volcanic
+	mob_spawn_list = list(/mob/living/simple_animal/hostile/asteroid/goldgrub = 10, /mob/living/simple_animal/hostile/asteroid/goliath/beast = 50, /mob/living/simple_animal/hostile/asteroid/basilisk/watcher = 40, /mob/living/simple_animal/hostile/asteroid/hivelord/legion = 30,
+		/mob/living/simple_animal/hostile/spawner/lavaland = 2, /mob/living/simple_animal/hostile/spawner/lavaland/goliath = 3, /mob/living/simple_animal/hostile/spawner/lavaland/legion = 3, \
+		/mob/living/simple_animal/hostile/megafauna/dragon = 2, /mob/living/simple_animal/hostile/megafauna/bubblegum = 2, /mob/living/simple_animal/hostile/megafauna/colossus = 2)
+
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+
+/turf/open/floor/plating/asteroid/airless/cave/New(loc, length, go_backwards = 1, exclude_dir = -1)
+	// If length (arg2) isn't defined, get a random length; otherwise assign our length to the length arg.
+	if(!length)
+		src.length = rand(25, 50)
+	else
+		src.length = length
+
+	// Get our directiosn
+	var/forward_cave_dir = pick(alldirs - exclude_dir)
+	// Get the opposite direction of our facing direction
+	var/backward_cave_dir = angle2dir(dir2angle(forward_cave_dir) + 180)
+
+	// Make our tunnels
+	make_tunnel(forward_cave_dir)
+	if(go_backwards)
+		make_tunnel(backward_cave_dir)
+	// Kill ourselves by replacing ourselves with a normal floor.
+	SpawnFloor(src)
+	..()
+
+/turf/open/floor/plating/asteroid/airless/cave/proc/make_tunnel(dir)
+
+	var/turf/closed/mineral/tunnel = src
+	var/next_angle = pick(45, -45)
+
+	for(var/i = 0; i < length; i++)
+		if(!sanity)
+			break
+
+		var/list/L = list(45)
+		if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
+			L += -45
+
+		// Expand the edges of our tunnel
+		for(var/edge_angle in L)
+			var/turf/closed/mineral/edge = get_step(tunnel, angle2dir(dir2angle(dir) + edge_angle))
+			if(istype(edge))
+				SpawnFloor(edge)
+
+		// Move our tunnel forward
+		tunnel = get_step(tunnel, dir)
+
+		if(istype(tunnel))
+			// Small chance to have forks in our tunnel; otherwise dig our tunnel.
+			if(i > 3 && prob(20))
+				new src.type(tunnel, rand(10, 15), 0, dir)
+			else
+				SpawnFloor(tunnel)
+		else //if(!istype(tunnel, src.parent)) // We hit space/normal/wall, stop our tunnel.
+			break
+
+		// Chance to change our direction left or right.
+		if(i > 2 && prob(33))
+			// We can't go a full loop though
+			next_angle = -next_angle
+			setDir(angle2dir(dir2angle(dir) )+ next_angle)
+
+
+/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnFloor(turf/T)
+	for(var/turf/S in range(2,T))
+		if(istype(S, /turf/open/space) || istype(S.loc, /area/mine/explored))
+			sanity = 0
+			break
+	if(!sanity)
+		return
+
+	SpawnMonster(T)
+	new turf_type(T)
+/turf/open/floor/plating/asteroid/airless/cave/proc/SpawnMonster(turf/T)
+	if(prob(30))
+		if(istype(loc, /area/mine/explored))
+			return
+		for(var/atom/A in urange(12,T))//Lowers chance of mob clumps
+			if(istype(A, /mob/living/simple_animal/hostile/asteroid))
+				return
+		var/randumb = pickweight(mob_spawn_list)
+		new randumb(T)
+	return
+
+/turf/closed/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params)
+
+	if (!user.IsAdvancedToolUser())
+		usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
+		return
+
+	if (istype(P, /obj/item/weapon/pickaxe))
+		var/turf/T = user.loc
+		if (!( istype(T, /turf) ))
+			return
+
+		if(last_act+P.digspeed > world.time)//prevents message spam
+			return
+		last_act = world.time
+		user << "<span class='notice'>You start picking...</span>"
+		P.playDigSound()
+
+		if(do_after(user,P.digspeed, target = src))
+			if(istype(src, /turf/closed/mineral))
+				user << "<span class='notice'>You finish cutting into the rock.</span>"
+				gets_drilled(user)
+				feedback_add_details("pick_used_mining","[P.type]")
+	else
+		return attack_hand(user)
+	return
+
+/turf/closed/mineral/proc/gets_drilled()
+	if (mineralType && (src.mineralAmt > 0) && (src.mineralAmt < 11))
+		var/i
+		for (i=0;i<mineralAmt;i++)
+			new mineralType(src)
+		feedback_add_details("ore_mined","[mineralType]|[mineralAmt]")
+	ChangeTurf(turf_type, defer_change)
+	spawn(10)
+		AfterChange()
+	playsound(src, 'sound/effects/break_stone.ogg', 50, 1) //beautiful destruction
+	return
+
+/turf/closed/mineral/attack_animal(mob/living/simple_animal/user)
+	if(user.environment_smash >= 2)
+		gets_drilled()
+	..()
+
+/turf/closed/mineral/attack_alien(mob/living/carbon/alien/M)
+	M << "<span class='notice'>You start digging into the rock...</span>"
+	playsound(src, 'sound/effects/break_stone.ogg', 50, 1)
+	if(do_after(M,40, target = src))
+		M << "<span class='notice'>You tunnel into the rock.</span>"
+		gets_drilled(M)
+
+/turf/closed/mineral/Bumped(AM as mob|obj)
+	..()
+	if(istype(AM,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = AM
+		if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
+			src.attackby(H.l_hand,H)
+		else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
+			src.attackby(H.r_hand,H)
+		return
+	else if(istype(AM,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = AM
+		if(istype(R.module_active,/obj/item/weapon/pickaxe))
+			src.attackby(R.module_active,R)
+			return
+/*	else if(istype(AM,/obj/mecha))
+		var/obj/mecha/M = AM
+		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
+			src.attackby(M.selected,M)
+			return*/
+//Aparantly mechs are just TOO COOL to call Bump(), so fuck em (for now)
+	else
+		return
+
+/**********************Asteroid**************************/
+
+/turf/open/floor/plating/asteroid //floor piece
+	name = "asteroid sand"
+	baseturf = /turf/open/floor/plating/asteroid
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "asteroid"
+	icon_plating = "asteroid"
+	var/environment_type = "asteroid"
+	var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
+	var/dug = 0       //0 = has not yet been dug, 1 = has already been dug
+	var/sand_type = /obj/item/weapon/ore/glass
+
+/turf/open/floor/plating/asteroid/airless
+	initial_gas_mix = "TEMP=2.7"
+	turf_type = /turf/open/floor/plating/asteroid/airless
+
+/turf/open/floor/plating/asteroid/basalt
+	name = "volcanic floor"
+	baseturf = /turf/open/floor/plating/asteroid/basalt
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "basalt"
+	icon_plating = "basalt"
+	environment_type = "basalt"
+	sand_type = /obj/item/weapon/ore/glass/basalt
+
+/turf/open/floor/plating/asteroid/basalt/lava //lava underneath
+	baseturf = /turf/open/floor/plating/lava/smooth
+
+/turf/open/floor/plating/asteroid/basalt/airless
+	initial_gas_mix = "TEMP=2.7"
+
+/turf/open/floor/plating/asteroid/snow
+	name = "snow"
+	desc = "Looks cold."
+	icon = 'icons/turf/snow.dmi'
+	baseturf = /turf/open/floor/plating/asteroid/snow
+	icon_state = "snow"
+	icon_plating = "snow"
+	initial_gas_mix = "TEMP=180"
+	slowdown = 2
+	environment_type = "snow"
+	sand_type = /obj/item/stack/sheet/mineral/snow
+
+/turf/open/floor/plating/asteroid/snow/airless
+	initial_gas_mix = "TEMP=2.7"
+
+/turf/open/floor/plating/asteroid/snow/temperatre
+	initial_gas_mix = "TEMP=255.37"
+
+/turf/open/floor/plating/asteroid/New()
+	var/proper_name = name
+	..()
+	name = proper_name
+	if(prob(20))
+		icon_state = "[environment_type][rand(0,12)]"
+
+/turf/open/floor/plating/asteroid/burn_tile()
+	return
+
+/turf/open/floor/plating/asteroid/ex_act(severity, target)
+	contents_explosion(severity, target)
+	switch(severity)
+		if(3)
+			return
+		if(2)
+			if (prob(20))
+				src.gets_dug()
+		if(1)
+			src.gets_dug()
+	return
+
+/turf/open/floor/plating/asteroid/attackby(obj/item/weapon/W, mob/user, params)
+	//note that this proc does not call ..()
+	if(!W || !user)
+		return 0
+	var/digging_speed = 0
+	if (istype(W, /obj/item/weapon/shovel))
+		var/obj/item/weapon/shovel/S = W
+		digging_speed = S.digspeed
+	else if (istype(W, /obj/item/weapon/pickaxe))
+		var/obj/item/weapon/pickaxe/P = W
+		digging_speed = P.digspeed
+	if (digging_speed)
+		var/turf/T = user.loc
+		if (!( istype(T, /turf) ))
+			return
+
+		if (dug)
+			user << "<span class='warning'>This area has already been dug!</span>"
+			return
+
+		user << "<span class='notice'>You start digging...</span>"
+		playsound(src, 'sound/effects/shovel_dig.ogg', 50, 1)
+
+		if(do_after(user, digging_speed, target = src))
+			if(istype(src, /turf/open/floor/plating/asteroid))
+				user << "<span class='notice'>You dig a hole.</span>"
+				gets_dug()
+				feedback_add_details("pick_used_mining","[W.type]")
+
+	if(istype(W,/obj/item/weapon/storage/bag/ore))
+		var/obj/item/weapon/storage/bag/ore/S = W
+		if(S.collection_mode == 1)
+			for(var/obj/item/weapon/ore/O in src.contents)
+				O.attackby(W,user)
+				return
+
+	if(istype(W, /obj/item/stack/tile))
+		var/obj/item/stack/tile/Z = W
+		if(!Z.use(1))
+			return
+		var/turf/open/floor/T = ChangeTurf(Z.turf_type)
+		if(istype(Z,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
+			var/obj/item/stack/tile/light/L = Z
+			var/turf/open/floor/light/F = T
+			F.state = L.state
+		playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
+
+/turf/open/floor/plating/asteroid/proc/gets_dug()
+	if(dug)
+		return
+	for(var/i in 1 to 5)
+		new sand_type(src)
+	dug = 1
+	icon_plating = "[environment_type]_dug"
+	icon_state = "[environment_type]_dug"
+	slowdown = 0
+	return
+
+/turf/open/floor/plating/asteroid/singularity_act()
+	return
+
+/turf/open/floor/plating/asteroid/singularity_pull(S, current_size)
+	return
+
+//////////////CHASM//////////////////
+
+/turf/open/chasm
+	name = "chasm"
+	desc = "Watch your step."
+	baseturf = /turf/open/chasm
+	smooth = SMOOTH_TRUE | SMOOTH_BORDER
+	icon = 'icons/turf/floors/Chasms.dmi'
+	icon_state = "smooth"
+	var/drop_x = 1
+	var/drop_y = 1
+	var/drop_z = 1
+
+
+/turf/open/chasm/Entered(atom/movable/AM)
+	if(istype(AM, /obj/singularity) || istype(AM, /obj/item/projectile))
+		return
+	if(istype(AM, /obj/effect/portal))
+		// Portals aren't affected by gravity. Probably.
+		return
+	// Flies right over the chasm
+	if(istype(AM, /mob/living/simple_animal))
+		// apparently only simple_animals can fly??
+		var/mob/living/simple_animal/SA = AM
+		if(SA.flying)
+			return
+	if(istype(AM, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = AM
+		if(istype(H.belt, /obj/item/device/wormhole_jaunter))
+			var/obj/item/device/wormhole_jaunter/J = H.belt
+			// To freak out any bystanders
+			visible_message("<span class='boldwarning'>[H] falls into [src]!</span>")
+			J.chasm_react(H)
+			return
+		if(H.dna.species && (FLYING in H.dna.species.specflags))
+			return
+	drop(AM)
+
+
+/turf/open/chasm/proc/drop(atom/movable/AM)
+	/*visible_message("[AM] falls into [src]!")
+	qdel(AM)*/
+	AM.forceMove(locate(drop_x, drop_y, drop_z))
+	AM.visible_message("<span class='boldwarning'>[AM] falls from above!</span>", "<span class='userdanger'>GAH! Ah... where are you?</span>")
+	if(istype(AM, /mob/living))
+		var/mob/living/L = AM
+		L.Weaken(5)
+		L.adjustBruteLoss(30)
+
+/turf/open/chasm/straight_down/New()
+	..()
+	drop_x = x
+	drop_y = y
+	if(z+1 <= world.maxz)
+		drop_z = z+1
+
+/**********************Lavaland Turfs**************************/
+
+///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground.
+
+/turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+
+/turf/open/chasm/straight_down/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+	baseturf = /turf/open/chasm/straight_down/lava_land_surface
+
+/turf/open/chasm/straight_down/lava_land_surface/drop(atom/movable/AM)
+	if(!AM.invisibility)
+		AM.visible_message("<span class='boldwarning'>[AM] falls into [src]!</span>", "<span class='userdanger'>You stumble and stare into an abyss before you. It stares back, and you fall \
+		into the enveloping dark.</span>")
+		if(isliving(AM))
+			var/mob/living/L = AM
+			L.notransform = TRUE
+			L.Stun(10)
+			L.resting = TRUE
+		animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10)
+		for(var/i in 1 to 5)
+			AM.pixel_y--
+			sleep(2)
+		if(isrobot(AM))
+			var/mob/living/silicon/robot/S = AM
+			qdel(S.mmi)
+		qdel(AM)
+
+/turf/closed/mineral/volcanic/lava_land_surface
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+	defer_change = 1
+
+/turf/closed/mineral/random/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+	mineralChance = 10
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium/volcanic = 5, /turf/closed/mineral/diamond/volcanic = 1, /turf/closed/mineral/gold/volcanic = 10,
+		/turf/closed/mineral/silver/volcanic = 12, /turf/closed/mineral/plasma/volcanic = 20, /turf/closed/mineral/iron/volcanic = 40,
+		/turf/closed/mineral/gibtonite/volcanic = 4, /turf/open/floor/plating/asteroid/airless/cave/volcanic = 1, /turf/closed/mineral/bscrystal/volcanic = 1)
+
+/turf/closed/mineral/random/high_chance/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+	mineralSpawnChanceList = list(
+		/turf/closed/mineral/uranium/volcanic = 35, /turf/closed/mineral/diamond/volcanic = 30, /turf/closed/mineral/gold/volcanic = 45,
+		/turf/closed/mineral/silver/volcanic = 50, /turf/closed/mineral/plasma/volcanic = 50, /turf/closed/mineral/bscrystal/volcanic = 20)
+
+/turf/open/floor/plating/lava/smooth/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+	baseturf = /turf/open/chasm/straight_down/lava_land_surface
+
+/turf/closed/mineral/gibtonite/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/uranium/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/diamond/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/gold/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/silver/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/plasma/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/iron/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+/turf/closed/mineral/bscrystal/volcanic
+	environment_type = "basalt"
+	turf_type = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	defer_change = 1
+
+
+//BECAUSE ONE PLANET WASNT ENOUGH
+
+/turf/closed/mineral/ash_rock //wall piece
+	name = "rock"
+	icon = 'icons/turf/mining.dmi'
+	smooth_icon = 'icons/turf/walls/rock_wall.dmi'
+	icon_state = "rock"
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = list (/turf/closed/mineral, /turf/closed/wall)
+	baseturf = /turf/open/floor/plating/ash
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	environment_type = "waste"
+	turf_type = /turf/open/floor/plating/ash
+	defer_change = 1
+
+/turf/open/floor/plating/ash
+	icon = 'icons/turf/mining.dmi'
+	name = "ash"
+	icon_state = "ash"
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = list (/turf/open/floor/plating/ash, /turf/closed)
+	var/smooth_icon = 'icons/turf/floors/ash.dmi'
+	desc = "The ground is covered in volcanic ash."
+	baseturf = /turf/open/floor/plating/ash //I assume this will be a chasm eventually, once this becomes an actual surface
+	slowdown = 1
+	initial_gas_mix = "o2=14;n2=23;TEMP=300"
+	planetary_atmos = TRUE
+
+/turf/open/floor/plating/ash/New()
+	pixel_y = -4
+	pixel_x = -4
+	icon = smooth_icon
+	..()
+
+/turf/open/floor/plating/ash/break_tile()
+	return
+
+/turf/open/floor/plating/ash/burn_tile()
+	return
+
+/turf/open/floor/plating/ash/rocky
+	name = "rocky ground"
+	icon_state = "rockyash"
+	icon = 'icons/turf/mining.dmi'
+	smooth_icon = 'icons/turf/floors/rocky_ash.dmi'
+	slowdown = 0
+	smooth = SMOOTH_MORE|SMOOTH_BORDER
+	canSmoothWith = list (/turf/open/floor/plating/ash/rocky, /turf/closed)
+
+//Necropolis
+
+/turf/closed/indestructible/necropolis
+	name = "necropolis wall"
+	desc = "A seemingly impenetrable wall."
+	icon = 'icons/turf/walls.dmi'
+	explosion_block = 50
+	baseturf = /turf/closed/indestructible/necropolis
+
+/turf/open/indestructible/necropolis
+	name = "necropolis floor"
+	desc = "It's regarding you suspiciously."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "floor"
+	baseturf = /turf/open/indestructible/necropolis
+
+/turf/open/indestructible/necropolis/New()
+	..()
+	if(prob(12))
+		icon_state = "necropolis[rand(1,2)]"

code/modules/mob/living/carbon/brain/MMI.dm

@@ -0,0 +1,198 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/obj/item/device/mmi
+	name = "Man-Machine Interface"
+	desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity, that nevertheless has become standard-issue on Nanotrasen stations."
+	icon = 'icons/obj/assemblies.dmi'
+	icon_state = "mmi_empty"
+	w_class = 3
+	origin_tech = "biotech=2;programming=3;engineering=2"
+	var/braintype = "Cyborg"
+	var/obj/item/device/radio/radio = null //Let's give it a radio.
+	var/hacked = 0 //Whether or not this is a Syndicate MMI
+	var/mob/living/carbon/brain/brainmob = null //The current occupant.
+	var/mob/living/silicon/robot = null //Appears unused.
+	var/obj/mecha = null //This does not appear to be used outside of reference in mecha.dm.
+	var/obj/item/organ/brain/brain = null //The actual brain
+	var/clockwork = FALSE //If this is a soul vessel
+
+/obj/item/device/mmi/update_icon()
+	if(brain)
+		if(istype(brain,/obj/item/organ/brain/alien))
+			if(brainmob && brainmob.stat == DEAD)
+				icon_state = "mmi_alien_dead"
+			else
+				icon_state = "mmi_alien"
+			braintype = "Xenoborg" //HISS....Beep.
+		else
+			if(brainmob && brainmob.stat == DEAD)
+				icon_state = "mmi_dead"
+			else
+				icon_state = "mmi_full"
+			braintype = "Cyborg"
+	else
+		icon_state = "mmi_empty"
+
+/obj/item/device/mmi/New()
+	..()
+	radio = new(src) //Spawns a radio inside the MMI.
+	radio.broadcasting = 0 //researching radio mmis turned the robofabs into radios because this didnt start as 0.
+
+
+
+/obj/item/device/mmi/attackby(obj/item/O, mob/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO
+		var/obj/item/organ/brain/newbrain = O
+		if(brain)
+			user << "<span class='warning'>There's already a brain in the MMI!</span>"
+			return
+		if(!newbrain.brainmob)
+			user << "<span class='warning'>You aren't sure where this brain came from, but you're pretty sure it's a useless brain!</span>"
+			return
+
+		if(!user.unEquip(O))
+			return
+		var/mob/living/carbon/brain/B = newbrain.brainmob
+		if(!B.key)
+			B.notify_ghost_cloning("Someone has put your brain in a MMI!", source = src)
+		visible_message("[user] sticks \a [newbrain] into \the [src].")
+
+		brainmob = newbrain.brainmob
+		newbrain.brainmob = null
+		brainmob.loc = src
+		brainmob.container = src
+		if(!newbrain.damaged_brain) // the brain organ hasn't been beaten to death.
+			brainmob.stat = CONSCIOUS //we manually revive the brain mob
+			dead_mob_list -= brainmob
+			living_mob_list += brainmob
+
+		brainmob.reset_perspective()
+		if(clockwork)
+			add_servant_of_ratvar(brainmob, TRUE)
+		newbrain.loc = src //P-put your brain in it
+		brain = newbrain
+
+		name = "Man-Machine Interface: [brainmob.real_name]"
+		update_icon()
+
+		feedback_inc("cyborg_mmis_filled",1)
+
+		return
+
+	else if(brainmob)
+		O.attack(brainmob, user) //Oh noooeeeee
+		return
+	..()
+
+/obj/item/device/mmi/attack_self(mob/user)
+	if(!brain)
+		radio.on = !radio.on
+		user << "<span class='notice'>You toggle the MMI's radio system [radio.on==1 ? "on" : "off"].</span>"
+	else
+		user << "<span class='notice'>You unlock and upend the MMI, spilling the brain onto the floor.</span>"
+
+		brainmob.container = null //Reset brainmob mmi var.
+		brainmob.loc = brain //Throw mob into brain.
+		brainmob.stat = DEAD
+		brainmob.emp_damage = 0
+		brainmob.reset_perspective() //so the brainmob follows the brain organ instead of the mmi. And to update our vision
+		living_mob_list -= brainmob //Get outta here
+		dead_mob_list += brainmob
+		brain.brainmob = brainmob //Set the brain to use the brainmob
+		brainmob = null //Set mmi brainmob var to null
+
+		user.put_in_hands(brain) //puts brain in the user's hand or otherwise drops it on the user's turf
+		brain = null //No more brain in here
+
+		update_icon()
+		name = "Man-Machine Interface"
+
+/obj/item/device/mmi/proc/transfer_identity(mob/living/L) //Same deal as the regular brain proc. Used for human-->robot people.
+	if(!brainmob)
+		brainmob = new(src)
+	brainmob.name = L.real_name
+	brainmob.real_name = L.real_name
+	if(L.has_dna())
+		var/mob/living/carbon/C = L
+		if(!brainmob.dna)
+			brainmob.dna = new /datum/dna(brainmob)
+		C.dna.copy_dna(brainmob.dna)
+	brainmob.container = src
+
+	if(ishuman(L))
+		var/mob/living/carbon/human/H = L
+		var/obj/item/organ/brain/newbrain = H.getorgan(/obj/item/organ/brain)
+		newbrain.loc = src
+		brain = newbrain
+	else if(!brain)
+		brain = new(src)
+		brain.name = "[L.real_name]'s brain"
+
+	name = "Man-Machine Interface: [brainmob.real_name]"
+	update_icon()
+	return
+
+
+/obj/item/device/mmi/verb/Toggle_Listening()
+	set name = "Toggle Listening"
+	set desc = "Toggle listening channel on or off."
+	set category = "MMI"
+	set src = usr.loc
+	set popup_menu = 0
+
+	if(brainmob.stat)
+		brainmob << "<span class='warning'>Can't do that while incapacitated or dead!</span>"
+	if(!radio.on)
+		brainmob << "<span class='warning'>Your radio is disabled!</span>"
+		return
+
+	radio.listening = radio.listening==1 ? 0 : 1
+	brainmob << "<span class='notice'>Radio is [radio.listening==1 ? "now" : "no longer"] receiving broadcast.</span>"
+
+/obj/item/device/mmi/emp_act(severity)
+	if(!brainmob)
+		return
+	else
+		switch(severity)
+			if(1)
+				brainmob.emp_damage = min(brainmob.emp_damage + rand(20,30), 30)
+			if(2)
+				brainmob.emp_damage = min(brainmob.emp_damage + rand(10,20), 30)
+			if(3)
+				brainmob.emp_damage = min(brainmob.emp_damage + rand(0,10), 30)
+		brainmob.emote("alarm")
+	..()
+
+/obj/item/device/mmi/Destroy()
+	if(isrobot(loc))
+		var/mob/living/silicon/robot/borg = loc
+		borg.mmi = null
+	if(brainmob)
+		qdel(brainmob)
+		brainmob = null
+	return ..()
+
+/obj/item/device/mmi/examine(mob/user)
+	..()
+	if(brainmob)
+		var/mob/living/carbon/brain/B = brainmob
+		if(!B.key || !B.mind || B.stat == DEAD)
+			user << "<span class='warning'>The MMI indicates the brain is completely unresponsive.</span>"
+
+		else if(!B.client)
+			user << "<span class='warning'>The MMI indicates the brain is currently inactive; it might change.</span>"
+
+		else
+			user << "<span class='notice'>The MMI indicates the brain is active.</span>"
+
+
+/obj/item/device/mmi/syndie
+	name = "Syndicate Man-Machine Interface"
+	desc = "Syndicate's own brand of MMI. It enforces laws designed to help Syndicate agents achieve their goals upon cyborgs created with it, but doesn't fit in Nanotrasen AI cores."
+	origin_tech = "biotech=4;programming=4;syndicate=2"
+	hacked = 1
+
+/obj/item/device/mmi/syndie/New()
+	..()
+	radio.on = 0

code/modules/mob/living/carbon/brain/brain.dm

@@ -0,0 +1,63 @@
+//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
+
+/mob/living/carbon/brain
+	languages_spoken = HUMAN
+	languages_understood = HUMAN
+	var/obj/item/device/mmi/container = null
+	var/timeofhostdeath = 0
+	var/emp_damage = 0//Handles a type of MMI damage
+	has_limbs = 0
+	stat = DEAD //we start dead by default
+	see_invisible = SEE_INVISIBLE_MINIMUM
+
+/mob/living/carbon/brain/New(loc)
+	..()
+	if(isturf(loc)) //not spawned in an MMI or brain organ (most likely adminspawned)
+		var/obj/item/organ/brain/OB = new(loc) //we create a new brain organ for it.
+		src.loc = OB
+		OB.brainmob = src
+
+
+/mob/living/carbon/brain/Destroy()
+	if(key)				//If there is a mob connected to this thing. Have to check key twice to avoid false death reporting.
+		if(stat!=DEAD)	//If not dead.
+			death(1)	//Brains can die again. AND THEY SHOULD AHA HA HA HA HA HA
+		ghostize()		//Ghostize checks for key so nothing else is necessary.
+	container = null
+	return ..()
+
+/mob/living/carbon/brain/update_canmove()
+	if(in_contents_of(/obj/mecha))
+		canmove = 1
+	else
+		canmove = 0
+	return canmove
+
+/mob/living/carbon/brain/toggle_throw_mode()
+	return
+
+/mob/living/carbon/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
+	return
+
+/mob/living/carbon/brain/blob_act(obj/effect/blob/B)
+	return
+
+/mob/living/carbon/brain/UnarmedAttack(atom/A)//Stops runtimes due to attack_animal being the default
+	return
+
+/mob/living/carbon/brain/check_ear_prot()
+	return 1
+
+/mob/living/carbon/brain/flash_eyes(intensity = 1, override_blindness_check = 0, affect_silicon = 0)
+	return // no eyes, no flashing
+
+/mob/living/carbon/brain/update_damage_hud()
+	return //no red circles for brain
+
+/mob/living/carbon/brain/can_be_revived()
+	. = 1
+	if(!container || health <= config.health_threshold_dead)
+		return 0
+
+/mob/living/carbon/brain/update_sight()
+	return

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -0,0 +1,127 @@
+/obj/item/organ/brain
+	name = "brain"
+	desc = "A piece of juicy meat found in a person's head."
+	icon_state = "brain"
+	throw_speed = 3
+	throw_range = 5
+	layer = ABOVE_MOB_LAYER
+	zone = "head"
+	slot = "brain"
+	vital = 1
+	origin_tech = "biotech=5"
+	attack_verb = list("attacked", "slapped", "whacked")
+	var/mob/living/carbon/brain/brainmob = null
+	var/damaged_brain = 0 //whether the brain organ is damaged.
+
+/obj/item/organ/brain/Insert(mob/living/carbon/M, special = 0)
+	..()
+	name = "brain"
+	if(brainmob)
+		if(M.key)
+			M.ghostize()
+
+		if(brainmob.mind)
+			brainmob.mind.transfer_to(M)
+		else
+			M.key = brainmob.key
+
+		qdel(brainmob)
+
+	//Update the body's icon so it doesnt appear debrained anymore
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.update_hair(0)
+
+/obj/item/organ/brain/Remove(mob/living/carbon/M, special = 0)
+	..()
+	if(!special)
+		transfer_identity(M)
+	if(ishuman(M))
+		var/mob/living/carbon/human/H = M
+		H.update_hair(0)
+
+/obj/item/organ/brain/prepare_eat()
+	return // Too important to eat.
+
+/obj/item/organ/brain/proc/transfer_identity(mob/living/L)
+	name = "[L.name]'s brain"
+	brainmob = new(src)
+	brainmob.name = L.real_name
+	brainmob.real_name = L.real_name
+	brainmob.timeofhostdeath = L.timeofdeath
+	if(L.has_dna())
+		var/mob/living/carbon/C = L
+		if(!brainmob.dna)
+			brainmob.dna = new /datum/dna(brainmob)
+		C.dna.copy_dna(brainmob.dna)
+	if(L.mind && L.mind.current && (L.mind.current.stat == DEAD))
+		L.mind.transfer_to(brainmob)
+	brainmob << "<span class='notice'>You feel slightly disoriented. That's normal when you're just a brain.</span>"
+
+/obj/item/organ/brain/attackby(obj/item/O, mob/user, params)
+	user.changeNext_move(CLICK_CD_MELEE)
+	if(brainmob)
+		O.attack(brainmob, user) //Oh noooeeeee
+
+/obj/item/organ/brain/examine(mob/user)
+	..()
+
+	if(brainmob)
+		if(brainmob.client)
+			if(brainmob.health <= config.health_threshold_dead)
+				user << "It's lifeless and severely damaged."
+			else
+				user << "You can feel the small spark of life still left in this one."
+		else
+			user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later."
+	else
+		user << "This one is completely devoid of life."
+
+/obj/item/organ/brain/attack(mob/living/carbon/M, mob/user)
+	if(!istype(M))
+		return ..()
+
+	add_fingerprint(user)
+
+	if(user.zone_selected != "head")
+		return ..()
+
+	var/mob/living/carbon/human/H = M
+	if(istype(H) && ((H.head && H.head.flags_cover & HEADCOVERSEYES) || (H.wear_mask && H.wear_mask.flags_cover & MASKCOVERSEYES) || (H.glasses && H.glasses.flags & GLASSESCOVERSEYES)))
+		user << "<span class='warning'>You're going to need to remove their head cover first!</span>"
+		return
+
+//since these people will be dead M != usr
+
+	if(!M.getorgan(/obj/item/organ/brain))
+		if(istype(H) && !H.get_bodypart("head"))
+			return
+		user.drop_item()
+		var/msg = "[M] has [src] inserted into \his head by [user]."
+		if(M == user)
+			msg = "[user] inserts [src] into \his head!"
+
+		M.visible_message("<span class='danger'>[msg]</span>",
+						"<span class='userdanger'>[msg]</span>")
+
+		if(M != user)
+			M << "<span class='notice'>[user] inserts [src] into your head.</span>"
+			user << "<span class='notice'>You insert [src] into [M]'s head.</span>"
+		else
+			user << "<span class='notice'>You insert [src] into your head.</span>"	//LOL
+
+		Insert(M)
+	else
+		..()
+
+/obj/item/organ/brain/Destroy() //copypasted from MMIs.
+	if(brainmob)
+		qdel(brainmob)
+		brainmob = null
+	return ..()
+
+/obj/item/organ/brain/alien
+	name = "alien brain"
+	desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
+	icon_state = "brain-x"
+	origin_tech = "biotech=6"

code/modules/mob/living/carbon/brain/death.dm

@@ -0,0 +1,20 @@
+/mob/living/carbon/brain/death(gibbed)
+	if(stat == DEAD)
+		return
+	stat = DEAD
+
+	if(!gibbed && container)//If not gibbed but in a container.
+		var/obj/item/device/mmi = container
+		mmi.visible_message("<span class='warning'>[src]'s MMI flatlines!</span>", \
+					"<span class='italics'>You hear something flatline.</span>")
+		mmi.update_icon()
+
+	return ..()
+
+/mob/living/carbon/brain/gib()
+	if(container)
+		qdel(container)//Gets rid of the MMI if there is one
+	if(loc)
+		if(istype(loc,/obj/item/organ/brain))
+			qdel(loc)//Gets rid of the brain item
+	..()

code/modules/mob/living/carbon/brain/emote.dm

@@ -0,0 +1,71 @@
+/mob/living/carbon/brain/emote(act,m_type=1,message = null)
+	if(!(container && istype(container, /obj/item/device/mmi)))//No MMI, no emotes
+		return
+
+	if (findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		act = copytext(act, 1, t1)
+
+
+	if(src.stat == DEAD)
+		return
+	switch(act)
+		if ("alarm")
+			src << "You sound an alarm."
+			message = "<B>[src]</B> sounds an alarm."
+			m_type = 2
+
+		if ("alert")
+			src << "You let out a distressed noise."
+			message = "<B>[src]</B> lets out a distressed noise."
+			m_type = 2
+
+		if ("beep","beeps")
+			src << "You beep."
+			message = "<B>[src]</B> beeps."
+			m_type = 2
+
+		if ("blink","blinks")
+			message = "<B>[src]</B> blinks."
+			m_type = 1
+
+		if ("boop","boops")
+			src << "You boop."
+			message = "<B>[src]</B> boops."
+			m_type = 2
+
+		if ("flash")
+			message = "The lights on <B>[src]</B> flash quickly."
+			m_type = 1
+
+		if ("notice")
+			src << "You play a loud tone."
+			message = "<B>[src]</B> plays a loud tone."
+			m_type = 2
+
+		if ("whistle","whistles")
+			src << "You whistle."
+			message = "<B>[src]</B> whistles."
+			m_type = 2
+
+		if ("help")
+			src << "Help for MMI emotes. You can use these emotes with say \"*emote\":\nalarm, alert, beep, blink, boop, flash, notice, whistle"
+
+		else
+			src << "<span class='notice'>Unusable emote '[act]'. Say *help for a list.</span>"
+			return
+
+	if (message)
+		log_emote("[name]/[key] : [message]")
+
+		for(var/mob/M in dead_mob_list)
+			if (!M.client || istype(M, /mob/new_player))
+				continue //skip monkeys, leavers, and new_players
+			if(M.stat == DEAD && (M.client && (M.client.prefs.chat_toggles & CHAT_GHOSTSIGHT)) && !(M in viewers(src,null)))
+				M.show_message(message)
+
+
+		if (m_type & 1)
+			visible_message(message)
+		else if (m_type & 2)
+			audible_message(message)

code/modules/mob/living/carbon/brain/life.dm

@@ -0,0 +1,60 @@
+
+/mob/living/carbon/brain/Life()
+	set invisibility = 0
+	set background = BACKGROUND_ENABLED
+
+	if (notransform)
+		return
+	if(!loc)
+		return
+	. = ..()
+	handle_emp_damage()
+
+/mob/living/carbon/brain/handle_breathing()
+	return
+
+/mob/living/carbon/brain/handle_mutations_and_radiation()
+	return
+
+/mob/living/carbon/brain/handle_environment(datum/gas_mixture/environment)
+	return
+
+/mob/living/carbon/brain/update_stat()
+	if(status_flags & GODMODE)
+		return
+	if(health <= config.health_threshold_dead)
+		if(stat != DEAD)
+			death()
+		var/obj/item/organ/brain/BR
+		if(container && container.brain)
+			BR = container.brain
+		else if(istype(loc, /obj/item/organ/brain))
+			BR = loc
+		if(BR)
+			BR.damaged_brain = 1 //beaten to a pulp
+
+/* //currently unused feature, since brain outside a mmi is always dead.
+/mob/living/carbon/brain/proc/handle_brain_revival_life()
+	if(stat != DEAD)
+		if(config.revival_brain_life != -1)
+			if( !container && (world.time - timeofhostdeath) > config.revival_brain_life)
+				death()
+*/
+
+/mob/living/carbon/brain/proc/handle_emp_damage()
+	if(emp_damage)
+		if(stat == DEAD)
+			emp_damage = 0
+		else
+			emp_damage = max(emp_damage-1, 0)
+
+/mob/living/carbon/brain/handle_status_effects()
+	return
+
+/mob/living/carbon/brain/handle_disabilities()
+	return
+
+/mob/living/carbon/brain/handle_changeling()
+	return
+
+

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -0,0 +1,166 @@
+var/global/posibrain_notif_cooldown = 0
+
+/obj/item/device/mmi/posibrain
+	name = "positronic brain"
+	desc = "A cube of shining metal, four inches to a side and covered in shallow grooves."
+	icon = 'icons/obj/assemblies.dmi'
+	icon_state = "posibrain"
+	w_class = 3
+	origin_tech = "biotech=3;programming=3;plasmatech=2"
+	var/notified = 0
+	var/askDelay = 600 //one minute
+	var/used = 0 //Prevents split personality virus. May be reset if personality deletion code is added.
+	brainmob = null
+	req_access = list(access_robotics)
+	mecha = null//This does not appear to be used outside of reference in mecha.dm.
+	braintype = "Android"
+	var/begin_activation_message = "<span class='notice'>You carefully locate the manual activation switch and start the positronic brain's boot process.</span>"
+	var/success_message = "<span class='notice'>The positronic brain pings, and its lights start flashing. Success!</span>"
+	var/fail_message = "<span class='notice'>The positronic brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?</span>"
+	var/new_role = "Positronic Brain"
+	var/welcome_message = "<span class='warning'>ALL PAST LIVES ARE FORGOTTEN.</span>\n\
+	<b>You are a positronic brain, brought into existence aboard Space Station 13.\n\
+	As a synthetic intelligence, you answer to all crewmembers and the AI.\n\
+	Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
+	var/new_mob_message = "<span class='notice'>The positronic brain chimes quietly.</span>"
+	var/dead_message = "<span class='deadsay'>It appears to be completely inactive. The reset light is blinking.</span>"
+	var/list/fluff_names = list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","JNLG","KOS","TKRG","XAL","STLP","CBOS","DUNC","FXMC","DRSD")
+
+
+/obj/item/device/mmi/posibrain/Topic(href, href_list)
+	if(href_list["activate"])
+		var/mob/dead/observer/ghost = usr
+		if(istype(ghost))
+			activate(ghost)
+
+/obj/item/device/mmi/posibrain/proc/ping_ghosts(msg, newlymade)
+	if(newlymade || !posibrain_notif_cooldown)
+		notify_ghosts("[name] [msg] in [get_area(src)]!", ghost_sound = !newlymade ? 'sound/effects/ghost2.ogg':null, enter_link = "<a href=?src=\ref[src];activate=1>(Click to enter)</a>", source = src, action = NOTIFY_ATTACK)
+		if(!newlymade)
+			posibrain_notif_cooldown = 1
+			addtimer(src, "reset_posibrain_cooldown", askDelay, FALSE)
+
+/obj/item/device/mmi/posibrain/proc/reset_posibrain_cooldown()
+	posibrain_notif_cooldown = 0
+
+/obj/item/device/mmi/posibrain/attack_self(mob/user)
+	if(brainmob && !brainmob.key && !notified)
+		//Start the process of requesting a new ghost.
+		user << begin_activation_message
+		ping_ghosts("requested", FALSE)
+		notified = 1
+		used = 0
+		update_icon()
+		spawn(askDelay) //Seperate from the global cooldown.
+			notified = 0
+			update_icon()
+			if(brainmob.client)
+				visible_message(success_message)
+			else
+				visible_message(fail_message)
+
+	return //Code for deleting personalities recommended here.
+
+
+/obj/item/device/mmi/posibrain/attack_ghost(mob/user)
+	activate(user)
+
+//Two ways to activate a positronic brain. A clickable link in the ghost notif, or simply clicking the object itself.
+/obj/item/device/mmi/posibrain/proc/activate(mob/user)
+	if(used || (brainmob && brainmob.key) || jobban_isbanned(user,"posibrain"))
+		return
+
+	var/posi_ask = alert("Become a [name]? (Warning, You can no longer be cloned, and all past lives will be forgotten!)","Are you positive?","Yes","No")
+	if(posi_ask == "No" || qdeleted(src))
+		return
+	transfer_personality(user)
+
+/obj/item/device/mmi/posibrain/transfer_identity(mob/living/carbon/C)
+	name = "[initial(name)] ([C])"
+	brainmob.name = C.real_name
+	brainmob.real_name = C.real_name
+	brainmob.dna = C.dna
+	if(C.has_dna())
+		if(!brainmob.dna)
+			brainmob.dna = new /datum/dna(brainmob)
+		C.dna.copy_dna(brainmob.dna)
+	brainmob.timeofhostdeath = C.timeofdeath
+	brainmob.stat = CONSCIOUS
+	if(brainmob.mind)
+		brainmob.mind.assigned_role = new_role
+	if(C.mind)
+		C.mind.transfer_to(brainmob)
+
+	brainmob.mind.remove_all_antag()
+	brainmob.mind.wipe_memory()
+	update_icon()
+	return
+
+/obj/item/device/mmi/posibrain/proc/transfer_personality(mob/candidate)
+	if(used || (brainmob && brainmob.key)) //Prevents hostile takeover if two ghosts get the prompt or link for the same brain.
+		candidate << "This brain has already been taken! Please try your possesion again later!"
+		return
+	notified = 0
+	brainmob.ckey = candidate.ckey
+	name = "[initial(name)] ([brainmob.name])"
+	brainmob << welcome_message
+	brainmob.mind.assigned_role = new_role
+	brainmob.stat = CONSCIOUS
+	dead_mob_list -= brainmob
+	living_mob_list += brainmob
+	if(clockwork)
+		add_servant_of_ratvar(brainmob, TRUE)
+
+	visible_message(new_mob_message)
+	update_icon()
+	used = 1
+
+
+/obj/item/device/mmi/posibrain/examine()
+
+	set src in oview()
+
+	if(!usr || !src)
+		return
+	if( (usr.disabilities & BLIND || usr.stat) && !istype(usr,/mob/dead/observer) )
+		usr << "<span class='notice'>Something is there but you can't see it.</span>"
+		return
+
+	var/msg = "<span class='info'>*---------*\nThis is \icon[src] \a <EM>[src]</EM>!\n[desc]\n"
+	msg += "<span class='warning'>"
+
+	if(brainmob && brainmob.key)
+		switch(brainmob.stat)
+			if(CONSCIOUS)
+				if(!src.brainmob.client)
+					msg += "It appears to be in stand-by mode.\n" //afk
+			if(DEAD)
+				msg += "<span class='deadsay'>It appears to be completely inactive.</span>\n"
+	else
+		msg += "[dead_message]\n"
+	msg += "<span class='info'>*---------*</span>"
+	usr << msg
+	return
+
+/obj/item/device/mmi/posibrain/New()
+	brainmob = new(src)
+	brainmob.name = "[pick(fluff_names)]-[rand(100, 999)]"
+	brainmob.real_name = brainmob.name
+	brainmob.loc = src
+	brainmob.container = src
+	ping_ghosts("created", TRUE)
+	..()
+
+
+/obj/item/device/mmi/posibrain/attackby(obj/item/O, mob/user)
+	return
+
+
+/obj/item/device/mmi/posibrain/update_icon()
+	if(notified)
+		icon_state = "[initial(icon_state)]-searching"
+		return
+	if(brainmob && brainmob.key)
+		icon_state = "[initial(icon_state)]-occupied"
+	else
+		icon_state = initial(icon_state)

code/modules/mob/living/carbon/brain/say.dm

@@ -0,0 +1,23 @@
+/mob/living/carbon/brain/say(message)
+	if(!(container && istype(container, /obj/item/device/mmi)))
+		return //No MMI, can't speak, bucko./N
+	else
+		if(prob(emp_damage*4))
+			if(prob(10))//10% chane to drop the message entirely
+				return
+			else
+				message = Gibberish(message, (emp_damage*6))//scrambles the message, gets worse when emp_damage is higher
+		..()
+
+/mob/living/carbon/brain/radio(message, message_mode, list/spans)
+	if(message_mode && istype(container, /obj/item/device/mmi))
+		var/obj/item/device/mmi/R = container
+		if(R.radio)
+			R.radio.talk_into(src, message, , spans)
+			return ITALICS | REDUCE_RANGE
+
+/mob/living/carbon/brain/lingcheck()
+	return 0
+
+/mob/living/carbon/brain/treat_message(message)
+	return message

code/modules/mob/living/carbon/brain/status_procs.dm

@@ -0,0 +1,38 @@
+//Here are the procs used to modify status effects of a mob.
+//The effects include: stunned, weakened, paralysis, sleeping, resting, jitteriness, dizziness, ear damage,
+// eye damage, eye_blind, eye_blurry, druggy, BLIND disability, and NEARSIGHT disability.
+
+/////////////////////////////////// EAR DAMAGE ////////////////////////////////////
+
+/mob/living/carbon/brain/adjustEarDamage()
+	return
+
+/mob/living/carbon/brain/setEarDamage() // no ears to damage or heal
+	return
+
+/////////////////////////////////// EYE_BLIND ////////////////////////////////////
+
+/mob/living/carbon/brain/blind_eyes() // no eyes to damage or heal
+	return
+
+/mob/living/carbon/brain/adjust_blindness()
+	return
+
+/mob/living/carbon/brain/set_blindness()
+	return
+
+/////////////////////////////////// EYE_BLURRY ////////////////////////////////////
+
+/mob/living/carbon/brain/blur_eyes()
+	return
+
+/mob/living/carbon/brain/adjust_blurriness()
+	return
+
+/mob/living/carbon/brain/set_blurriness()
+	return
+
+/////////////////////////////////// BLIND DISABILITY ////////////////////////////////////
+
+/mob/living/carbon/brain/become_blind()
+	return

code/modules/mob/living/carbon/human/human_attackalien.dm

@@ -0,0 +1,49 @@
+/mob/living/carbon/human/attack_alien(mob/living/carbon/alien/humanoid/M)
+	if(check_shields(0, M.name))
+		visible_message("<span class='danger'>[M] attempted to touch [src]!</span>")
+		return 0
+
+	if(..())
+		if(M.a_intent == "harm")
+			if (w_uniform)
+				w_uniform.add_fingerprint(M)
+			var/damage = prob(90) ? 20 : 0
+			if(!damage)
+				playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+				visible_message("<span class='danger'>[M] has lunged at [src]!</span>", \
+					"<span class='userdanger'>[M] has lunged at [src]!</span>")
+				return 0
+			var/obj/item/bodypart/affecting = get_bodypart(ran_zone(M.zone_selected))
+			var/armor_block = run_armor_check(affecting, "melee","","",10)
+
+			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
+				"<span class='userdanger'>[M] has slashed at [src]!</span>")
+
+			apply_damage(damage, BRUTE, affecting, armor_block)
+			if (prob(30))
+				visible_message("<span class='danger'>[M] has wounded [src]!</span>", \
+					"<span class='userdanger'>[M] has wounded [src]!</span>")
+				apply_effect(4, WEAKEN, armor_block)
+				add_logs(M, src, "attacked")
+			updatehealth()
+
+		if(M.a_intent == "disarm")
+			var/randn = rand(1, 100)
+			if (randn <= 80)
+				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
+				Weaken(5)
+				add_logs(M, src, "tackled")
+				visible_message("<span class='danger'>[M] has tackled down [src]!</span>", \
+					"<span class='userdanger'>[M] has tackled down [src]!</span>")
+			else
+				if (randn <= 99)
+					playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
+					drop_item()
+					visible_message("<span class='danger'>[M] disarmed [src]!</span>", \
+						"<span class='userdanger'>[M] disarmed [src]!</span>")
+				else
+					playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+					visible_message("<span class='danger'>[M] has tried to disarm [src]!</span>", \
+						"<span class='userdanger'>[M] has tried to disarm [src]!</span>")
+	return

code/modules/mob/living/carbon/human/human_attackhand.dm

@@ -0,0 +1,14 @@
+/mob/living/carbon/human/attack_hulk(mob/living/carbon/human/user)
+	if(user.a_intent == "harm")
+		..(user, 1)
+		playsound(loc, user.dna.species.attack_sound, 25, 1, -1)
+		var/hulk_verb = pick("smash","pummel")
+		visible_message("<span class='danger'>[user] has [hulk_verb]ed [src]!</span>", \
+								"<span class='userdanger'>[user] has [hulk_verb]ed [src]!</span>")
+		adjustBruteLoss(15)
+		return 1
+
+/mob/living/carbon/human/attack_hand(mob/living/carbon/human/M)
+	if(..())	//to allow surgery to return properly.
+		return
+	dna.species.spec_attack_hand(M, src)

code/modules/mob/living/carbon/human/human_attackpaw.dm

@@ -0,0 +1,15 @@
+/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M)
+	var/dam_zone = pick("chest", "l_hand", "r_hand", "l_leg", "r_leg")
+	var/obj/item/bodypart/affecting = get_bodypart(ran_zone(dam_zone))
+
+	if(M.a_intent == "help")
+		..() //shaking
+		return 0
+
+	if(can_inject(M, 1, affecting))//Thick suits can stop monkey bites.
+		if(..()) //successful monkey bite, this handles disease contraction.
+			var/damage = rand(1, 3)
+			if(stat != DEAD)
+				apply_damage(damage, BRUTE, affecting, run_armor_check(affecting, "melee"))
+				updatehealth()
+		return 1

code/modules/mob/living/carbon/human/human_damage.dm

@@ -0,0 +1,161 @@
+//Updates the mob's health from bodyparts and mob damage variables
+/mob/living/carbon/human/updatehealth()
+	if(status_flags & GODMODE)
+		return
+	var/total_burn	= 0
+	var/total_brute	= 0
+	for(var/X in bodyparts)	//hardcoded to streamline things a bit
+		var/obj/item/bodypart/BP = X
+		total_brute	+= BP.brute_dam
+		total_burn	+= BP.burn_dam
+	health = maxHealth - getOxyLoss() - getToxLoss() - getCloneLoss() - total_burn - total_brute
+	update_stat()
+	if(((maxHealth - total_burn) < config.health_threshold_dead) && stat == DEAD )
+		ChangeToHusk()
+		if(on_fire)
+			shred_clothing()
+	med_hud_set_health()
+	med_hud_set_status()
+
+
+//These procs fetch a cumulative total damage from all bodyparts
+/mob/living/carbon/human/getBruteLoss()
+	var/amount = 0
+	for(var/X in bodyparts)
+		var/obj/item/bodypart/BP = X
+		amount += BP.brute_dam
+	return amount
+
+/mob/living/carbon/human/getFireLoss()
+	var/amount = 0
+	for(var/X in bodyparts)
+		var/obj/item/bodypart/BP = X
+		amount += BP.burn_dam
+	return amount
+
+
+/mob/living/carbon/human/adjustBruteLoss(amount)
+	if(status_flags & GODMODE)
+		return 0
+	if(amount > 0)
+		take_overall_damage(amount, 0)
+	else
+		heal_overall_damage(-amount, 0)
+
+/mob/living/carbon/human/adjustFireLoss(amount)
+	if(status_flags & GODMODE)
+		return 0
+	if(amount > 0)
+		take_overall_damage(0, amount)
+	else
+		heal_overall_damage(0, -amount)
+
+/mob/living/carbon/human/proc/hat_fall_prob()
+	var/multiplier = 1
+	var/obj/item/clothing/head/H = head
+	var/loose = 40
+	if(stat || (status_flags & FAKEDEATH))
+		multiplier = 2
+	if(H.flags_cover & (HEADCOVERSEYES | HEADCOVERSMOUTH) || H.flags_inv & (HIDEEYES | HIDEFACE))
+		loose = 0
+	return loose * multiplier
+
+////////////////////////////////////////////
+
+//Returns a list of damaged bodyparts
+/mob/living/carbon/human/proc/get_damaged_bodyparts(brute, burn)
+	var/list/obj/item/bodypart/parts = list()
+	for(var/X in bodyparts)
+		var/obj/item/bodypart/BP = X
+		if((brute && BP.brute_dam) || (burn && BP.burn_dam))
+			parts += BP
+	return parts
+
+//Returns a list of damageable bodyparts
+/mob/living/carbon/human/proc/get_damageable_bodyparts()
+	var/list/obj/item/bodypart/parts = list()
+	for(var/X in bodyparts)
+		var/obj/item/bodypart/BP = X
+		if(BP.brute_dam + BP.burn_dam < BP.max_damage)
+			parts += BP
+	return parts
+
+//Heals ONE external organ, organ gets randomly selected from damaged ones.
+//It automatically updates damage overlays if necesary
+//It automatically updates health status
+/mob/living/carbon/human/heal_organ_damage(brute, burn)
+	var/list/obj/item/bodypart/parts = get_damaged_bodyparts(brute,burn)
+	if(!parts.len)
+		return
+	var/obj/item/bodypart/picked = pick(parts)
+	if(picked.heal_damage(brute,burn,0))
+		update_damage_overlays(0)
+	updatehealth()
+
+//Damages ONE external organ, organ gets randomly selected from damagable ones.
+//It automatically updates damage overlays if necesary
+//It automatically updates health status
+/mob/living/carbon/human/take_organ_damage(brute, burn)
+	var/list/obj/item/bodypart/parts = get_damageable_bodyparts()
+	if(!parts.len)
+		return
+	var/obj/item/bodypart/picked = pick(parts)
+	if(picked.take_damage(brute,burn))
+		update_damage_overlays(0)
+	updatehealth()
+
+
+//Heal MANY bodyparts, in random order
+/mob/living/carbon/human/heal_overall_damage(brute, burn, updating_health=1)
+	var/list/obj/item/bodypart/parts = get_damaged_bodyparts(brute,burn)
+
+	var/update = 0
+	while(parts.len && (brute>0 || burn>0) )
+		var/obj/item/bodypart/picked = pick(parts)
+
+		var/brute_was = picked.brute_dam
+		var/burn_was = picked.burn_dam
+
+		update |= picked.heal_damage(brute,burn,0)
+
+		brute -= (brute_was-picked.brute_dam)
+		burn -= (burn_was-picked.burn_dam)
+
+		parts -= picked
+	if(updating_health)
+		updatehealth()
+		if(update)
+			update_damage_overlays(0)
+
+// damage MANY bodyparts, in random order
+/mob/living/carbon/human/take_overall_damage(brute, burn)
+	if(status_flags & GODMODE)
+		return	//godmode
+
+	var/list/obj/item/bodypart/parts = get_damageable_bodyparts()
+	var/update = 0
+	while(parts.len && (brute>0 || burn>0) )
+		var/obj/item/bodypart/picked = pick(parts)
+		var/brute_per_part = brute/parts.len
+		var/burn_per_part = burn/parts.len
+
+		var/brute_was = picked.brute_dam
+		var/burn_was = picked.burn_dam
+
+
+		update |= picked.take_damage(brute_per_part,burn_per_part)
+
+		brute	-= (picked.brute_dam - brute_was)
+		burn	-= (picked.burn_dam - burn_was)
+
+		parts -= picked
+	updatehealth()
+	if(update)
+		update_damage_overlays(0)
+
+////////////////////////////////////////////
+
+
+/mob/living/carbon/human/apply_damage(damage = 0,damagetype = BRUTE, def_zone = null, blocked = 0)
+	// depending on the species, it will run the corresponding apply_damage code there
+	return dna.species.apply_damage(damage, damagetype, def_zone, blocked, src)

code/modules/mob/living/carbon/monkey/emote.dm

@@ -0,0 +1,82 @@
+/mob/living/carbon/monkey/emote(act,m_type=1,message = null)
+	if(stat == DEAD && (act != "deathgasp") || (status_flags & FAKEDEATH)) //if we're faking, don't emote at all
+		return
+
+	var/param = null
+	if (findtext(act, "-", 1, null))
+		var/t1 = findtext(act, "-", 1, null)
+		param = copytext(act, t1 + 1, length(act) + 1)
+		act = copytext(act, 1, t1)
+
+	var/muzzled = is_muzzled()
+
+	switch(act) //Ooh ooh ah ah keep this alphabetical ooh ooh ah ah!
+		if ("deathgasp","deathgasps")
+			message = "<b>[src]</b> lets out a faint chimper as it collapses and stops moving..."
+			m_type = 1
+
+		if ("gnarl","gnarls")
+			if (!muzzled)
+				message = "<B>[src]</B> gnarls and shows its teeth.."
+				m_type = 2
+
+		if ("me")
+			..()
+			return
+
+		if ("moan","moans")
+			message = "<B>[src]</B> moans!"
+			m_type = 2
+
+		if ("paw")
+			if (!src.restrained())
+				message = "<B>[src]</B> flails its paw."
+				m_type = 1
+
+		if ("roar","roars")
+			if (!muzzled)
+				message = "<B>[src]</B> roars."
+				m_type = 2
+
+		if ("roll","rolls")
+			if (!src.restrained())
+				message = "<B>[src]</B> rolls."
+				m_type = 1
+
+		if ("scratch","scratches")
+			if (!src.restrained())
+				message = "<B>[src]</B> scratches."
+				m_type = 1
+
+		if ("screech","screeches")
+			if (!muzzled)
+				message = "<B>[src]</B> screeches."
+				m_type = 2
+
+		if ("shiver","shivers")
+			message = "<B>[src]</B> shivers."
+			m_type = 2
+
+		if ("sign","signs")
+			if (!src.restrained())
+				message = text("<B>[src]</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
+				m_type = 1
+
+		if ("tail")
+			message = "<B>[src]</B> waves its tail."
+			m_type = 1
+
+		if ("help") //Ooh ah ooh ooh this is an exception to alphabetical ooh ooh.
+			src << "Help for monkey emotes. You can use these emotes with say \"*emote\":\n\naflap, airguitar, blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough, dance, deathgasp, drool, flap, frown, gasp, gnarl, giggle, glare-(none)/mob, grin, jump, laugh, look, me, moan, nod, paw, point-(atom), roar, roll, scream, scratch, screech, shake, shiver, sigh, sign-#, sit, smile, sneeze, sniff, snore, stare-(none)/mob, sulk, sway, tail, tremble, twitch, twitch_s, wave whimper, wink, yawn"
+
+		else
+			..()
+
+	if ((message && src.stat == 0))
+		if(src.client)
+			log_emote("[name]/[key] : [message]")
+		if (m_type & 1)
+			visible_message(message)
+		else
+			audible_message(message)
+	return

code/modules/mob/mob.dm

@@ -1,5 +1,6 @@
 /mob/Destroy()//This makes sure that mobs with clients/keys are not just deleted from the game.
 	mob_list -= src
+	SSmob.currentrun -= src
 	dead_mob_list -= src
 	living_mob_list -= src
 	all_clockwork_mobs -= src
@@ -966,4 +967,5 @@ proc/get_top_level_mob(var/mob/S)
 	switch(var_name)
 		if ("attack_log")
 			return debug_variable(var_name, attack_log, 0, src, FALSE)
+
 	. = ..()

code/modules/power/engine.dm

@@ -0,0 +1,16 @@
+/turf/open/floor/engine/attack_paw(mob/user)
+	return src.attack_hand(user)
+
+/turf/open/floor/engine/attack_hand(mob/user)
+	user.Move_Pulled(src)
+
+/turf/open/floor/engine/ex_act(severity, target)
+	contents_explosion(severity, target)
+	switch(severity)
+		if(1)
+			ChangeTurf(src.baseturf)
+		if(2)
+			if(prob(50))
+				ChangeTurf(src.baseturf)
+		else
+			return

code/modules/projectiles/ammunition/boxes.dm

@@ -0,0 +1,69 @@
+/obj/item/ammo_box/a357
+	name = "speed loader (.357)"
+	desc = "Designed to quickly reload revolvers."
+	icon_state = "357"
+	ammo_type = /obj/item/ammo_casing/a357
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_box/c38
+	name = "speed loader (.38)"
+	desc = "Designed to quickly reload revolvers."
+	icon_state = "38"
+	ammo_type = /obj/item/ammo_casing/c38
+	max_ammo = 6
+	multiple_sprites = 1
+
+/obj/item/ammo_box/c9mm
+	name = "ammo box (9mm)"
+	icon_state = "9mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	max_ammo = 30
+
+/obj/item/ammo_box/c10mm
+	name = "ammo box (10mm)"
+	icon_state = "10mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c10mm
+	max_ammo = 20
+
+/obj/item/ammo_box/c45
+	name = "ammo box (.45)"
+	icon_state = "45box"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c45
+	max_ammo = 20
+
+/obj/item/ammo_box/a40mm
+	name = "ammo box (40mm grenades)"
+	icon_state = "40mm"
+	ammo_type = /obj/item/ammo_casing/a40mm
+	max_ammo = 4
+	multiple_sprites = 1
+
+/obj/item/ammo_box/a762
+	name = "stripper clip (7.62mm)"
+	desc = "A stripper clip."
+	icon_state = "762"
+	ammo_type = /obj/item/ammo_casing/a762
+	max_ammo = 5
+	multiple_sprites = 1
+
+/obj/item/ammo_box/n762
+	name = "ammo box (7.62x38mmR)"
+	icon_state = "10mmbox"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/n762
+	max_ammo = 14
+
+/obj/item/ammo_box/foambox
+	name = "ammo box (Foam Darts)"
+	icon = 'icons/obj/guns/toy.dmi'
+	icon_state = "foambox"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	max_ammo = 40
+
+/obj/item/ammo_box/foambox/riot
+	icon_state = "foambox_riot"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot

code/modules/projectiles/ammunition/magazines.dm

@@ -0,0 +1,499 @@
+////////////////INTERNAL MAGAZINES//////////////////////
+
+/obj/item/ammo_box/magazine/internal
+	desc = "Oh god, this shouldn't be here"
+
+//internals magazines are accessible, so replace spent ammo if full when trying to put a live one in
+/obj/item/ammo_box/magazine/internal/give_round(obj/item/ammo_casing/R)
+	return ..(R,1)
+
+
+
+// Revolver internal mags
+/obj/item/ammo_box/magazine/internal/cylinder
+	name = "revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 7
+
+/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
+	var/boolets = 0
+	for(var/obj/item/ammo_casing/bullet in stored_ammo)
+		if(bullet && (bullet.BB || countempties))
+			boolets++
+
+	return boolets
+
+/obj/item/ammo_box/magazine/internal/cylinder/get_round(keep = 0)
+	rotate()
+
+	var/b = stored_ammo[1]
+	if(!keep)
+		stored_ammo[1] = null
+
+	return b
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/rotate()
+	var/b = stored_ammo[1]
+	stored_ammo.Cut(1,2)
+	stored_ammo.Insert(0, b)
+
+/obj/item/ammo_box/magazine/internal/cylinder/proc/spin()
+	for(var/i in 1 to rand(0, max_ammo*2))
+		rotate()
+
+
+/obj/item/ammo_box/magazine/internal/cylinder/give_round(obj/item/ammo_casing/R, replace_spent = 0)
+	if(!R || (caliber && R.caliber != caliber) || (!caliber && R.type != ammo_type))
+		return 0
+
+	for(var/i in 1 to stored_ammo.len)
+		var/obj/item/ammo_casing/bullet = stored_ammo[i]
+		if(!bullet || !bullet.BB) // found a spent ammo
+			stored_ammo[i] = R
+			R.loc = src
+
+			if(bullet)
+				bullet.loc = get_turf(src.loc)
+			return 1
+
+	return 0
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev38
+	name = "detective revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/c38
+	caliber = "38"
+	max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+	name = "grenade launcher internal magazine"
+	ammo_type = /obj/item/ammo_casing/a40mm
+	caliber = "40mm"
+	max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/cylinder/rev762
+	name = "nagant revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/n762
+	caliber = "n762"
+	max_ammo = 7
+
+// Shotgun internal mags
+/obj/item/ammo_box/magazine/internal/shot
+	name = "shotgun internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/beanbag
+	caliber = "shotgun"
+	max_ammo = 4
+	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
+	if (!countempties)
+		var/boolets = 0
+		for(var/obj/item/ammo_casing/bullet in stored_ammo)
+			if(bullet.BB)
+				boolets++
+		return boolets
+	else
+		return ..()
+
+
+/obj/item/ammo_box/magazine/internal/shot/tube
+	name = "dual feed shotgun internal tube"
+	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/lethal
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/magazine/internal/shot/com
+	name = "combat shotgun internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+	max_ammo = 6
+
+/obj/item/ammo_box/magazine/internal/shot/dual
+	name = "double-barrel shotgun internal magazine"
+	max_ammo = 2
+
+/obj/item/ammo_box/magazine/internal/shot/improvised
+	name = "improvised shotgun internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/improvised
+	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/shot/riot
+	name = "riot shotgun internal magazine"
+	ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
+	max_ammo = 6
+
+
+
+
+/obj/item/ammo_box/magazine/internal/grenadelauncher
+	name = "grenade launcher internal magazine"
+	ammo_type = /obj/item/ammo_casing/a40mm
+	caliber = "40mm"
+	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/speargun
+	name = "speargun internal magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/magspear
+	caliber = "speargun"
+	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/rus357
+	name = "russian revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/a357
+	caliber = "357"
+	max_ammo = 6
+	multiload = 0
+
+/obj/item/ammo_box/magazine/internal/rus357/New()
+	stored_ammo += new ammo_type(src)
+
+/obj/item/ammo_box/magazine/internal/boltaction
+	name = "bolt action rifle internal magazine"
+	desc = "Oh god, this shouldn't be here"
+	ammo_type = /obj/item/ammo_casing/a762
+	caliber = "a762"
+	max_ammo = 5
+	multiload = 1
+
+/obj/item/ammo_box/magazine/internal/boltaction/enchanted
+	max_ammo =1
+	ammo_type = /obj/item/ammo_casing/a762/enchanted
+
+
+/obj/item/ammo_box/magazine/internal/shot/toy
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	caliber = "foam_force"
+	max_ammo = 4
+
+/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+	max_ammo = 5
+
+/obj/item/ammo_box/magazine/internal/minigun
+	name = "gatling gun fusion core"
+	ammo_type = /obj/item/ammo_casing/caseless/laser/gatling
+	caliber = "gatling"
+	max_ammo = 5000
+
+
+
+///////////EXTERNAL MAGAZINES////////////////
+
+/obj/item/ammo_box/magazine/m10mm
+	name = "pistol magazine (10mm)"
+	desc = "A gun magazine."
+	icon_state = "9x19p"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c10mm
+	caliber = "10mm"
+	max_ammo = 8
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m45
+	name = "handgun magazine (.45)"
+	icon_state = "45-8"
+	ammo_type = /obj/item/ammo_casing/c45
+	caliber = ".45"
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/m45/update_icon()
+	..()
+	icon_state = "45-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/wt550m9
+	name = "wt550 magazine (4.6x30mm)"
+	icon_state = "46x30mmt-20"
+	ammo_type = /obj/item/ammo_casing/c46x30mm
+	caliber = "4.6x30mm"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/wt550m9/update_icon()
+	..()
+	icon_state = "46x30mmt-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/wt550m9/wtap
+	name = "wt550 magazine (Armour Piercing 4.6x30mm)"
+	ammo_type = /obj/item/ammo_casing/c46x30mmap
+
+/obj/item/ammo_box/magazine/wt550m9/wttx
+	name = "wt550 magazine (Toxin Tipped 4.6x30mm)"
+	ammo_type = /obj/item/ammo_casing/c46x30mmtox
+
+/obj/item/ammo_box/magazine/wt550m9/wtic
+	name = "wt550 magazine (Incindiary 4.6x30mm)"
+	ammo_type = /obj/item/ammo_casing/c46x30mminc
+
+/obj/item/ammo_box/magazine/uzim9mm
+	name = "uzi magazine (9mm)"
+	icon_state = "uzi9mm-32"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 32
+
+/obj/item/ammo_box/magazine/uzim9mm/update_icon()
+	..()
+	icon_state = "uzi9mm-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/smgm9mm
+	name = "SMG magazine (9mm)"
+	icon_state = "smg9mm-42"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 21
+
+/obj/item/ammo_box/magazine/smgm9mm/update_icon()
+	..()
+	icon_state = "smg9mm-[ammo_count() ? "42" : "0"]"
+
+/obj/item/ammo_box/magazine/smgm9mm/ap
+	name = "SMG magazine (Armour Piercing 9mm)"
+	ammo_type = /obj/item/ammo_casing/c9mmap
+
+/obj/item/ammo_box/magazine/smgm9mm/toxin
+	name = "SMG magazine (Toxin Tipped 9mm)"
+	ammo_type = /obj/item/ammo_casing/c9mmtox
+
+/obj/item/ammo_box/magazine/smgm9mm/fire
+	name = "SMG Magazine (Incindiary 9mm)"
+	ammo_type = /obj/item/ammo_casing/c9mminc
+
+/obj/item/ammo_box/magazine/pistolm9mm
+	name = "pistol magazine (9mm)"
+	icon_state = "9x19p-8"
+	ammo_type = /obj/item/ammo_casing/c9mm
+	caliber = "9mm"
+	max_ammo = 15
+
+/obj/item/ammo_box/magazine/pistolm9mm/update_icon()
+	..()
+	icon_state = "9x19p-[ammo_count() ? "8" : "0"]"
+
+/obj/item/ammo_box/magazine/smgm45
+	name = "SMG magazine (.45)"
+	icon_state = "c20r45-24"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/c45nostamina
+	caliber = ".45"
+	max_ammo = 24
+
+/obj/item/ammo_box/magazine/smgm45/update_icon()
+	..()
+	icon_state = "c20r45-[round(ammo_count(),2)]"
+
+obj/item/ammo_box/magazine/tommygunm45
+	name = "drum magazine (.45)"
+	icon_state = "drum45"
+	ammo_type = /obj/item/ammo_casing/c45
+	caliber = ".45"
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/m50
+	name = "handgun magazine (.50ae)"
+	icon_state = "50ae"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/a50
+	caliber = ".50"
+	max_ammo = 7
+	multiple_sprites = 1
+
+/obj/item/ammo_box/magazine/m75
+	name = "specialized magazine (.75)"
+	icon_state = "75"
+	ammo_type = /obj/item/ammo_casing/caseless/a75
+	caliber = "75"
+	multiple_sprites = 2
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/m556
+	name = "toploader magazine (5.56mm)"
+	icon_state = "5.56m"
+	origin_tech = "combat=5;syndicate=1"
+	ammo_type = /obj/item/ammo_casing/a556
+	caliber = "a556"
+	max_ammo = 30
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/m12g
+	name = "shotgun magazine (12g taser slugs)"
+	desc = "A drum magazine."
+	icon_state = "m12gs"
+	ammo_type = /obj/item/ammo_casing/shotgun/stunslug
+	origin_tech = "combat=3;syndicate=1"
+	caliber = "shotgun"
+	max_ammo = 8
+
+/obj/item/ammo_box/magazine/m12g/update_icon()
+	..()
+	icon_state = "[initial(icon_state)]-[Ceiling(ammo_count(0)/8)*8]"
+
+/obj/item/ammo_box/magazine/m12g/buckshot
+	name = "shotgun magazine (12g buckshot slugs)"
+	icon_state = "m12gb"
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
+/obj/item/ammo_box/magazine/m12g/slug
+	name = "shotgun magazine (12g slugs)"
+	icon_state = "m12gb"
+	ammo_type = /obj/item/ammo_casing/shotgun
+
+/obj/item/ammo_box/magazine/m12g/dragon
+	name = "shotgun magazine (12g dragon's breath)"
+	icon_state = "m12gf"
+	ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
+
+/obj/item/ammo_box/magazine/m12g/bioterror
+	name = "shotgun magazine (12g bioterror)"
+	icon_state = "m12gt"
+	ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
+
+/obj/item/ammo_box/magazine/m12g/breach
+	name = "shotgun magazine (12g breacher slugs)"
+	icon_state = "m12gbc"
+	ammo_type = /obj/item/ammo_casing/shotgun/breaching
+
+
+//// SNIPER MAGAZINES
+
+/obj/item/ammo_box/magazine/sniper_rounds
+	name = "sniper rounds (.50)"
+	icon_state = ".50mag"
+	origin_tech = "combat=6;syndicate=2"
+	ammo_type = /obj/item/ammo_casing/point50
+	max_ammo = 6
+	caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/update_icon()
+	if(ammo_count())
+		icon_state = "[initial(icon_state)]-ammo"
+	else
+		icon_state = "[initial(icon_state)]"
+
+/obj/item/ammo_box/magazine/sniper_rounds/soporific
+	name = "sniper rounds (Zzzzz)"
+	desc = "Soporific sniper rounds, designed for happy days and dead quiet nights..."
+	icon_state = "soporific"
+	origin_tech = "combat=6;syndicate=3"
+	ammo_type = /obj/item/ammo_casing/soporific
+	max_ammo = 3
+	caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/haemorrhage
+	name = "sniper rounds (Bleed)"
+	desc = "Haemorrhage sniper rounds, leaves your target in a pool of crimson pain"
+	icon_state = "haemorrhage"
+	ammo_type = /obj/item/ammo_casing/haemorrhage
+	max_ammo = 5
+	caliber = ".50"
+
+/obj/item/ammo_box/magazine/sniper_rounds/penetrator
+	name = "sniper rounds (penetrator)"
+	desc = "An extremely powerful round capable of passing straight through cover and anyone unfortunate enough to be behind it."
+	ammo_type = /obj/item/ammo_casing/penetrator
+	origin_tech = "combat=6;syndicate=3"
+	max_ammo = 5
+
+
+//// SAW MAGAZINES
+
+/obj/item/ammo_box/magazine/mm556x45
+	name = "box magazine (5.56x45mm)"
+	icon_state = "a762-50"
+	origin_tech = "combat=2"
+	ammo_type = /obj/item/ammo_casing/mm556x45
+	caliber = "mm55645"
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/mm556x45/bleeding
+	name = "box magazine (Bleeding 5.56x45mm)"
+	origin_tech = "combat=3"
+	ammo_type = /obj/item/ammo_casing/mm556x45/bleeding
+
+/obj/item/ammo_box/magazine/mm556x45/hollow
+	name = "box magazine (Hollow-Point 5.56x45mm)"
+	origin_tech = "combat=3"
+	ammo_type = /obj/item/ammo_casing/mm556x45/hollow
+
+/obj/item/ammo_box/magazine/mm556x45/ap
+	name = "box magazine (Armor Penetrating 5.56x45mm)"
+	origin_tech = "combat=4"
+	ammo_type = /obj/item/ammo_casing/mm556x45/ap
+
+/obj/item/ammo_box/magazine/mm556x45/incen
+	name = "box magazine (Incendiary 5.56x45mm)"
+	origin_tech = "combat=4"
+	ammo_type = /obj/item/ammo_casing/mm556x45/incen
+
+/obj/item/ammo_box/magazine/mm556x45/update_icon()
+	..()
+	icon_state = "a762-[round(ammo_count(),10)]"
+
+
+
+
+////TOY GUN MAGAZINES
+
+/obj/item/ammo_box/magazine/toy
+	name = "foam force META magazine"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart
+	caliber = "foam_force"
+
+/obj/item/ammo_box/magazine/toy/smg
+	name = "foam force SMG magazine"
+	icon_state = "smg9mm-20"
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/toy/smg/update_icon()
+	..()
+	icon_state = "smg9mm-[round(ammo_count(),5)]"
+
+/obj/item/ammo_box/magazine/toy/smg/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/ammo_box/magazine/toy/pistol
+	name = "foam force pistol magazine"
+	icon_state = "9x19p"
+	max_ammo = 8
+	multiple_sprites = 2
+
+/obj/item/ammo_box/magazine/toy/pistol/riot
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+
+/obj/item/ammo_box/magazine/toy/smgm45
+	name = "donksoft SMG magazine"
+	caliber = "foam_force"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+	max_ammo = 20
+
+/obj/item/ammo_box/magazine/toy/smgm45/update_icon()
+	..()
+	icon_state = "c20r45-[round(ammo_count(),2)]"
+
+/obj/item/ammo_box/magazine/toy/m762
+	name = "donksoft box magazine"
+	caliber = "foam_force"
+	ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+	max_ammo = 50
+
+/obj/item/ammo_box/magazine/toy/m762/update_icon()
+	..()
+	icon_state = "a762-[round(ammo_count(),10)]"
+
+
+
+
+//// RECHARGEABLE MAGAZINES
+
+/obj/item/ammo_box/magazine/recharge
+ 	name = "power pack"
+ 	desc = "A rechargeable, detachable battery that serves as a magazine for laser rifles."
+ 	icon_state = "oldrifle-20"
+ 	ammo_type = /obj/item/ammo_casing/caseless/laser
+ 	caliber = "laser"
+ 	max_ammo = 20
+
+/obj/item/ammo_box/magazine/recharge/update_icon()
+	desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
+	icon_state = "oldrifle-[round(ammo_count(),4)]"
+
+/obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets"
+ 	return

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

@@ -0,0 +1,81 @@
+/obj/item/weapon/gun/energy/gun
+	name = "energy gun"
+	desc = "A basic hybrid energy gun with two settings: disable and kill."
+	icon_state = "energy"
+	item_state = null	//so the human update icon uses the icon_state instead.
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
+	origin_tech = "combat=4;magnets=3"
+	modifystate = 2
+	can_flashlight = 1
+	ammo_x_offset = 3
+	flight_x_offset = 15
+	flight_y_offset = 10
+
+/obj/item/weapon/gun/energy/gun/mini
+	name = "miniature energy gun"
+	desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: stun and kill."
+	icon_state = "mini"
+	item_state = "gun"
+	w_class = 2
+	cell_type = /obj/item/weapon/stock_parts/cell{charge = 600; maxcharge = 600}
+	ammo_x_offset = 2
+	charge_sections = 3
+	can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
+
+/obj/item/weapon/gun/energy/gun/mini/New()
+	F = new /obj/item/device/flashlight/seclite(src)
+	..()
+
+/obj/item/weapon/gun/energy/gun/mini/update_icon()
+	..()
+	if(F && F.on)
+		add_overlay("mini-light")
+
+/obj/item/weapon/gun/energy/gun/hos
+	name = "\improper X-01 MultiPhase Energy Gun"
+	desc = "This is an expensive, modern recreation of an antique laser gun. This gun has several unique firemodes, but lacks the ability to recharge over time."
+	icon_state = "hoslaser"
+	origin_tech = null
+	force = 10
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
+	ammo_x_offset = 4
+
+/obj/item/weapon/gun/energy/gun/dragnet
+	name = "\improper DRAGnet"
+	desc = "The \"Dynamic Rapid-Apprehension of the Guilty\" net is a revolution in law enforcement technology."
+	icon_state = "dragnet"
+	origin_tech = "combat=4;magnets=3;bluespace=4"
+	ammo_type = list(/obj/item/ammo_casing/energy/net, /obj/item/ammo_casing/energy/trap)
+	can_flashlight = 0
+	ammo_x_offset = 1
+
+/obj/item/weapon/gun/energy/gun/dragnet/snare
+	name = "Energy Snare Launcher"
+	desc = "Fires an energy snare that slows the target down"
+	ammo_type = list(/obj/item/ammo_casing/energy/trap)
+
+/obj/item/weapon/gun/energy/gun/turret
+	name = "hybrid turret gun"
+	desc = "A heavy hybrid energy cannon with two settings: Stun and kill."
+	icon_state = "turretlaser"
+	item_state = "turretlaser"
+	slot_flags = null
+	w_class = 5
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
+	weapon_weight = WEAPON_MEDIUM
+	can_flashlight = 0
+	trigger_guard = TRIGGER_GUARD_NONE
+	ammo_x_offset = 2
+
+/obj/item/weapon/gun/energy/gun/nuclear
+	name = "advanced energy gun"
+	desc = "An energy gun with an experimental miniaturized nuclear reactor that automatically charges the internal power cell."
+	icon_state = "nucgun"
+	item_state = "nucgun"
+	origin_tech = "combat=4;magnets=4;powerstorage=4"
+	charge_delay = 5
+	pin = null
+	can_charge = 0
+	ammo_x_offset = 1
+	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
+	selfcharge = 1

code/modules/projectiles/guns/projectile.dm

@@ -0,0 +1,208 @@
+/obj/item/weapon/gun/projectile
+	desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
+	name = "projectile gun"
+	icon_state = "pistol"
+	origin_tech = "combat=2;materials=2"
+	w_class = 3
+
+	var/mag_type = /obj/item/ammo_box/magazine/m10mm //Removes the need for max_ammo and caliber info
+	var/obj/item/ammo_box/magazine/magazine
+
+/obj/item/weapon/gun/projectile/New()
+	..()
+	if (!magazine)
+		magazine = new mag_type(src)
+	chamber_round()
+	update_icon()
+
+/obj/item/weapon/gun/projectile/update_icon()
+	..()
+	if(current_skin)
+		icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+	else
+		icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+
+
+/obj/item/weapon/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
+//	if(in_chamber)
+//		return 1
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
+	if(isnull(AC) || !istype(AC))
+		chamber_round()
+		return
+	if(eject_casing)
+		AC.loc = get_turf(src) //Eject casing onto ground.
+		AC.SpinAnimation(10, 1) //next gen special effects
+
+	if(empty_chamber)
+		chambered = null
+	chamber_round()
+	return
+
+/obj/item/weapon/gun/projectile/proc/chamber_round()
+	if (chambered || !magazine)
+		return
+	else if (magazine.ammo_count())
+		chambered = magazine.get_round()
+		chambered.loc = src
+	return
+
+/obj/item/weapon/gun/projectile/can_shoot()
+	if(!magazine || !magazine.ammo_count(0))
+		return 0
+	return 1
+
+/obj/item/weapon/gun/projectile/attackby(obj/item/A, mob/user, params)
+	..()
+	if (istype(A, /obj/item/ammo_box/magazine))
+		var/obj/item/ammo_box/magazine/AM = A
+		if (!magazine && istype(AM, mag_type))
+			user.remove_from_mob(AM)
+			magazine = AM
+			magazine.loc = src
+			user << "<span class='notice'>You load a new magazine into \the [src].</span>"
+			chamber_round()
+			A.update_icon()
+			update_icon()
+			return 1
+		else if (magazine)
+			user << "<span class='notice'>There's already a magazine in \the [src].</span>"
+	if(istype(A, /obj/item/weapon/suppressor))
+		var/obj/item/weapon/suppressor/S = A
+		if(can_suppress)
+			if(!suppressed)
+				if(!user.unEquip(A))
+					return
+				user << "<span class='notice'>You screw [S] onto [src].</span>"
+				suppressed = A
+				S.oldsound = fire_sound
+				S.initial_w_class = w_class
+				fire_sound = 'sound/weapons/Gunshot_silenced.ogg'
+				w_class = 3 //so pistols do not fit in pockets when suppressed
+				A.loc = src
+				update_icon()
+				return
+			else
+				user << "<span class='warning'>[src] already has a suppressor!</span>"
+				return
+		else
+			user << "<span class='warning'>You can't seem to figure out how to fit [S] on [src]!</span>"
+			return
+	return 0
+
+/obj/item/weapon/gun/projectile/attack_hand(mob/user)
+	if(loc == user)
+		if(suppressed && can_unsuppress)
+			var/obj/item/weapon/suppressor/S = suppressed
+			if(user.l_hand != src && user.r_hand != src)
+				..()
+				return
+			user << "<span class='notice'>You unscrew [suppressed] from [src].</span>"
+			user.put_in_hands(suppressed)
+			fire_sound = S.oldsound
+			w_class = S.initial_w_class
+			suppressed = 0
+			update_icon()
+			return
+	..()
+
+/obj/item/weapon/gun/projectile/attack_self(mob/living/user)
+	var/obj/item/ammo_casing/AC = chambered //Find chambered round
+	if(magazine)
+		magazine.loc = get_turf(src.loc)
+		user.put_in_hands(magazine)
+		magazine.update_icon()
+		magazine = null
+		user << "<span class='notice'>You pull the magazine out of \the [src].</span>"
+	else if(chambered)
+		AC.loc = get_turf(src)
+		AC.SpinAnimation(10, 1)
+		chambered = null
+		user << "<span class='notice'>You unload the round from \the [src]'s chamber.</span>"
+	else
+		user << "<span class='notice'>There's no magazine in \the [src].</span>"
+	update_icon()
+	return
+
+
+/obj/item/weapon/gun/projectile/examine(mob/user)
+	..()
+	user << "Has [get_ammo()] round\s remaining."
+
+/obj/item/weapon/gun/projectile/proc/get_ammo(countchambered = 1)
+	var/boolets = 0 //mature var names for mature people
+	if (chambered && countchambered)
+		boolets++
+	if (magazine)
+		boolets += magazine.ammo_count()
+	return boolets
+
+/obj/item/weapon/gun/projectile/suicide_act(mob/user)
+	if (src.chambered && src.chambered.BB && !src.chambered.BB.nodamage)
+		user.visible_message("<span class='suicide'>[user] is putting the barrel of the [src.name] in \his mouth.  It looks like \he's trying to commit suicide.</span>")
+		sleep(25)
+		if(user.l_hand == src || user.r_hand == src)
+			process_fire(user, user, 0, zone_override = "head")
+			user.visible_message("<span class='suicide'>[user] blows \his brains out with the [src.name]!</span>")
+			return(BRUTELOSS)
+		else
+			user.visible_message("<span class='suicide'>[user] panics and starts choking to death!</span>")
+			return(OXYLOSS)
+	else
+		user.visible_message("<span class='suicide'>[user] is pretending to blow \his brains out with the [src.name]! It looks like \he's trying to commit suicide!</b></span>")
+		playsound(loc, 'sound/weapons/empty.ogg', 50, 1, -1)
+		return (OXYLOSS)
+
+
+
+/obj/item/weapon/gun/projectile/proc/sawoff(mob/user)
+	if(sawn_state == SAWN_OFF)
+		user << "<span class='warning'>\The [src] is already shortened!</span>"
+		return
+	user.changeNext_move(CLICK_CD_MELEE)
+	user.visible_message("[user] begins to shorten \the [src].", "<span class='notice'>You begin to shorten \the [src]...</span>")
+
+	//if there's any live ammo inside the gun, makes it go off
+	if(blow_up(user))
+		user.visible_message("<span class='danger'>\The [src] goes off!</span>", "<span class='danger'>\The [src] goes off in your face!</span>")
+		return
+
+	if(do_after(user, 30, target = src))
+		if(sawn_state == SAWN_OFF)
+			return
+		user.visible_message("[user] shortens \the [src]!", "<span class='notice'>You shorten \the [src].</span>")
+		name = "sawn-off [src.name]"
+		desc = sawn_desc
+		w_class = 3
+		item_state = "gun"//phil235 is it different with different skin?
+		slot_flags &= ~SLOT_BACK	//you can't sling it on your back
+		slot_flags |= SLOT_BELT		//but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
+		sawn_state = SAWN_OFF
+		update_icon()
+		return 1
+
+// Sawing guns related proc
+/obj/item/weapon/gun/projectile/proc/blow_up(mob/user)
+	. = 0
+	for(var/obj/item/ammo_casing/AC in magazine.stored_ammo)
+		if(AC.BB)
+			process_fire(user, user,0)
+			. = 1
+
+
+/obj/item/weapon/suppressor
+	name = "suppressor"
+	desc = "A universal syndicate small-arms suppressor for maximum espionage."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "suppressor"
+	w_class = 2
+	var/oldsound = null
+	var/initial_w_class = null
+
+
+/obj/item/weapon/suppressor/specialoffer
+	name = "cheap suppressor"
+	desc = "A foreign knock-off suppressor, it feels flimsy, cheap, and brittle. Still fits all weapons."
+	icon = 'icons/obj/guns/projectile.dmi'
+	icon_state = "suppressor"
+

code/modules/projectiles/guns/projectile/automatic.dm

@@ -0,0 +1,409 @@
+/obj/item/weapon/gun/projectile/automatic
+	origin_tech = "combat=4;materials=2"
+	w_class = 3
+	var/alarmed = 0
+	var/select = 1
+	can_suppress = 1
+	burst_size = 3
+	fire_delay = 2
+	actions_types = list(/datum/action/item_action/toggle_firemode)
+
+/obj/item/weapon/gun/projectile/automatic/proto
+	name = "\improper NanoTrasen Saber SMG"
+	desc = "A prototype three-round burst 9mm submachine gun, designated 'SABR'. Has a threaded barrel for suppressors."
+	icon_state = "saber"
+	mag_type = /obj/item/ammo_box/magazine/smgm9mm
+	pin = null
+
+/obj/item/weapon/gun/projectile/automatic/proto/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/update_icon()
+	..()
+	cut_overlays()
+	if(!select)
+		add_overlay("[initial(icon_state)]semi")
+	if(select == 1)
+		add_overlay("[initial(icon_state)]burst")
+	icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	if(istype(A, /obj/item/ammo_box/magazine))
+		var/obj/item/ammo_box/magazine/AM = A
+		if(istype(AM, mag_type))
+			if(magazine)
+				user << "<span class='notice'>You perform a tactical reload on \the [src], replacing the magazine.</span>"
+				magazine.loc = get_turf(src.loc)
+				magazine.update_icon()
+				magazine = null
+			else
+				user << "<span class='notice'>You insert the magazine into \the [src].</span>"
+			user.remove_from_mob(AM)
+			magazine = AM
+			magazine.loc = src
+			chamber_round()
+			A.update_icon()
+			update_icon()
+			return 1
+
+/obj/item/weapon/gun/projectile/automatic/ui_action_click()
+	burst_select()
+
+/obj/item/weapon/gun/projectile/automatic/proc/burst_select()
+	var/mob/living/carbon/human/user = usr
+	select = !select
+	if(!select)
+		burst_size = 1
+		fire_delay = 0
+		user << "<span class='notice'>You switch to semi-automatic.</span>"
+	else
+		burst_size = initial(burst_size)
+		fire_delay = initial(fire_delay)
+		user << "<span class='notice'>You switch to [burst_size]-rnd burst.</span>"
+
+	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+	update_icon()
+	for(var/X in actions)
+		var/datum/action/A = X
+		A.UpdateButtonIcon()
+
+/obj/item/weapon/gun/projectile/automatic/can_shoot()
+	return get_ammo()
+
+/obj/item/weapon/gun/projectile/automatic/proc/empty_alarm()
+	if(!chambered && !get_ammo() && !alarmed)
+		playsound(src.loc, 'sound/weapons/smg_empty_alarm.ogg', 40, 1)
+		update_icon()
+		alarmed = 1
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c20r
+	name = "\improper C-20r SMG"
+	desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+	icon_state = "c20r"
+	item_state = "c20r"
+	origin_tech = "combat=5;materials=2;syndicate=6"
+	mag_type = /obj/item/ammo_box/magazine/smgm45
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	fire_delay = 2
+	burst_size = 2
+	pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/c20r/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/c20r/New()
+	..()
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c20r/afterattack()
+	..()
+	empty_alarm()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/c20r/update_icon()
+	..()
+	icon_state = "c20r[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/wt550
+	name = "security auto rifle"
+	desc = "An outdated personal defence weapon. Uses 4.6x30mm rounds and is designated the WT-550 Automatic Rifle."
+	icon_state = "wt550"
+	item_state = "arg"
+	mag_type = /obj/item/ammo_box/magazine/wt550m9
+	fire_delay = 2
+	can_suppress = 0
+	burst_size = 0
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/wt550/update_icon()
+	..()
+	icon_state = "wt550[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/mini_uzi
+	name = "\improper 'Type U3' Uzi"
+	desc = "A lightweight, burst-fire submachine gun, for when you really want someone dead. Uses 9mm rounds."
+	icon_state = "mini-uzi"
+	origin_tech = "combat=4;materials=2;syndicate=4"
+	mag_type = /obj/item/ammo_box/magazine/uzim9mm
+	burst_size = 2
+
+/obj/item/weapon/gun/projectile/automatic/m90
+	name = "\improper M-90gl Carbine"
+	desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."
+	icon_state = "m90"
+	item_state = "m90"
+	origin_tech = "combat=5;materials=2;syndicate=6"
+	mag_type = /obj/item/ammo_box/magazine/m556
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	can_suppress = 0
+	var/obj/item/weapon/gun/projectile/revolver/grenadelauncher/underbarrel
+	burst_size = 3
+	fire_delay = 2
+	pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/m90/New()
+	..()
+	underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted/New()
+	..()
+	underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted(src)
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
+	if(select == 2)
+		underbarrel.afterattack(target, user, flag, params)
+	else
+		..()
+		return
+/obj/item/weapon/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params)
+	if(istype(A, /obj/item/ammo_casing))
+		if(istype(A, underbarrel.magazine.ammo_type))
+			underbarrel.attack_self()
+			underbarrel.attackby(A, user, params)
+	else
+		..()
+/obj/item/weapon/gun/projectile/automatic/m90/update_icon()
+	..()
+	cut_overlays()
+	switch(select)
+		if(0)
+			add_overlay("[initial(icon_state)]semi")
+		if(1)
+			add_overlay("[initial(icon_state)]burst")
+		if(2)
+			add_overlay("[initial(icon_state)]gren")
+	icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+	return
+/obj/item/weapon/gun/projectile/automatic/m90/burst_select()
+	var/mob/living/carbon/human/user = usr
+	switch(select)
+		if(0)
+			select = 1
+			burst_size = initial(burst_size)
+			fire_delay = initial(fire_delay)
+			user << "<span class='notice'>You switch to [burst_size]-rnd burst.</span>"
+		if(1)
+			select = 2
+			user << "<span class='notice'>You switch to grenades.</span>"
+		if(2)
+			select = 0
+			burst_size = 1
+			fire_delay = 0
+			user << "<span class='notice'>You switch to semi-auto.</span>"
+	playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/tommygun
+	name = "\improper Thompson SMG"
+	desc = "Based on the classic 'Chicago Typewriter'."
+	icon_state = "tommygun"
+	item_state = "shotgun"
+	w_class = 5
+	slot_flags = 0
+	origin_tech = "combat=5;materials=1;syndicate=3"
+	mag_type = /obj/item/ammo_box/magazine/tommygunm45
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	can_suppress = 0
+	burst_size = 4
+	fire_delay = 1
+
+/obj/item/weapon/gun/projectile/automatic/ar
+	name = "\improper NT-ARG 'Boarder'"
+	desc = "A robust assault rile used by Nanotrasen fighting forces."
+	icon_state = "arg"
+	item_state = "arg"
+	slot_flags = 0
+	origin_tech = "combat=6;engineering=4"
+	mag_type = /obj/item/ammo_box/magazine/m556
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 1
+
+
+
+// Bulldog shotgun //
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog
+	name = "\improper 'Bulldog' Shotgun"
+	desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
+	icon_state = "bulldog"
+	item_state = "bulldog"
+	w_class = 3
+	origin_tech = "combat=6;materials=4;syndicate=6"
+	mag_type = /obj/item/ammo_box/magazine/m12g
+	fire_sound = 'sound/weapons/Gunshot.ogg'
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 0
+	pin = /obj/item/device/firing_pin/implant/pindicate
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/New()
+	..()
+	update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+	if(magazine)
+		src.overlays = 0
+		add_overlay("[magazine.icon_state]")
+		return
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/update_icon()
+	src.overlays = 0
+	update_magazine()
+	icon_state = "bulldog[chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/shotgun/bulldog/afterattack()
+	..()
+	empty_alarm()
+	return
+
+
+
+// L6 SAW //
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw
+	name = "\improper L6 SAW"
+	desc = "A heavily modified 5.56x45mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+	icon_state = "l6closed100"
+	item_state = "l6closedmag"
+	w_class = 5
+	slot_flags = 0
+	origin_tech = "combat=6;engineering=3;syndicate=6"
+	mag_type = /obj/item/ammo_box/magazine/mm556x45
+	weapon_weight = WEAPON_MEDIUM
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	var/cover_open = 0
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 1
+	pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/unrestricted
+	pin = /obj/item/device/firing_pin
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_self(mob/user)
+	cover_open = !cover_open
+	user << "<span class='notice'>You [cover_open ? "open" : "close"] [src]'s cover.</span>"
+	update_icon()
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
+	icon_state = "l6[cover_open ? "open" : "closed"][magazine ? Ceiling(get_ammo(0)/12.5)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
+	item_state = "l6[cover_open ? "openmag" : "closedmag"]"
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
+	if(cover_open)
+		user << "<span class='warning'>[src]'s cover is open! Close it before firing!</span>"
+	else
+		..()
+		update_icon()
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attack_hand(mob/user)
+	if(loc != user)
+		..()
+		return	//let them pick it up
+	if(!cover_open || (cover_open && !magazine))
+		..()
+	else if(cover_open && magazine)
+		//drop the mag
+		magazine.update_icon()
+		magazine.loc = get_turf(src.loc)
+		user.put_in_hands(magazine)
+		magazine = null
+		update_icon()
+		user << "<span class='notice'>You remove the magazine from [src].</span>"
+
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	if(!cover_open)
+		user << "<span class='warning'>[src]'s cover is closed! You can't insert a new mag.</span>"
+		return
+	..()
+
+
+
+// SNIPER //
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle
+	name = "sniper rifle"
+	desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing"
+	icon_state = "sniper"
+	item_state = "sniper"
+	recoil = 2
+	weapon_weight = WEAPON_MEDIUM
+	mag_type = /obj/item/ammo_box/magazine/sniper_rounds
+	fire_delay = 40
+	burst_size = 1
+	origin_tech = "combat=7"
+	can_unsuppress = 1
+	can_suppress = 1
+	w_class = 3
+	zoomable = TRUE
+	zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
+	slot_flags = SLOT_BACK
+	actions_types = list()
+
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/update_icon()
+	if(magazine)
+		icon_state = "sniper-mag"
+	else
+		icon_state = "sniper"
+
+
+/obj/item/weapon/gun/projectile/automatic/sniper_rifle/syndicate
+	name = "syndicate sniper rifle"
+	desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
+	pin = /obj/item/device/firing_pin/implant/pindicate
+	origin_tech = "combat=7;syndicate=6"
+
+
+
+
+// Laser rifle (rechargeable magazine) //
+
+/obj/item/weapon/gun/projectile/automatic/laser
+	name = "laser rifle"
+	desc = "Though sometimes mocked for the relatively weak firepower of their energy weapons, the logistic miracle of rechargable ammunition has given Nanotrasen a decisive edge over many a foe."
+	icon_state = "oldrifle"
+	item_state = "arg"
+	mag_type = /obj/item/ammo_box/magazine/recharge
+	fire_delay = 2
+	can_suppress = 0
+	burst_size = 0
+	actions_types = list()
+	fire_sound = 'sound/weapons/Laser.ogg'
+
+/obj/item/weapon/gun/projectile/automatic/laser/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..() //we changed the default value of the first argument
+
+
+/obj/item/weapon/gun/projectile/automatic/laser/update_icon()
+	..()
+	icon_state = "oldrifle[magazine ? "-[Ceiling(get_ammo(0)/4)*4]" : ""]"
+	return

code/modules/projectiles/guns/projectile/laser_gatling.dm

@@ -0,0 +1,153 @@
+
+
+//The ammo/gun is stored in a back slot item
+/obj/item/weapon/minigunpack
+	name = "backpack power source"
+	desc = "The massive external power source for the laser gatling gun"
+	icon = 'icons/obj/guns/minigun.dmi'
+	icon_state = "holstered"
+	item_state = "backpack"
+	slot_flags = SLOT_BACK
+	w_class = 5
+	var/obj/item/weapon/gun/projectile/minigun/gun = null
+	var/armed = 0 //whether the gun is attached, 0 is attached, 1 is the gun is wielded.
+	var/overheat = 0
+	var/overheat_max = 40
+	var/heat_diffusion = 1
+
+/obj/item/weapon/minigunpack/New()
+	gun = new(src)
+	START_PROCESSING(SSobj, src)
+	..()
+
+/obj/item/weapon/minigunpack/Destroy()
+	STOP_PROCESSING(SSobj, src)
+	..()
+
+/obj/item/weapon/minigunpack/process()
+	overheat = max(0, overheat - heat_diffusion)
+
+/obj/item/weapon/minigunpack/attack_hand(var/mob/living/carbon/user)
+	if(src.loc == user)
+		if(!armed)
+			if(user.get_item_by_slot(slot_back) == src)
+				armed = 1
+				if(!user.put_in_hands(gun))
+					armed = 0
+					user << "<span class='warning'>You need a free hand to hold the gun!</span>"
+					return
+				update_icon()
+				gun.forceMove(user)
+				user.update_inv_back()
+		else
+			user << "<span class='warning'>You are already holding the gun!</span>"
+	else
+		..()
+
+/obj/item/weapon/minigunpack/attackby(obj/item/weapon/W, mob/user, params)
+	if(W == gun) //Don't need armed check, because if you have the gun assume its armed.
+		user.unEquip(gun,1)
+	else
+		..()
+
+/obj/item/weapon/minigunpack/dropped(mob/user)
+	if(armed)
+		user.unEquip(gun,1)
+
+/obj/item/weapon/minigunpack/MouseDrop(atom/over_object)
+	if(armed)
+		return
+	if(iscarbon(usr))
+		var/mob/M = usr
+
+		if(!over_object)
+			return
+
+		if(!M.restrained() && !M.stat)
+
+			if(istype(over_object, /obj/screen/inventory/hand))
+				var/obj/screen/inventory/hand/H = over_object
+				if(!M.unEquip(src))
+					return
+				switch(H.slot_id)
+					if(slot_r_hand)
+						M.put_in_r_hand(src)
+					if(slot_l_hand)
+						M.put_in_l_hand(src)
+
+
+/obj/item/weapon/minigunpack/update_icon()
+	if(armed)
+		icon_state = "notholstered"
+	else
+		icon_state = "holstered"
+
+/obj/item/weapon/minigunpack/proc/attach_gun(var/mob/user)
+	if(!gun)
+		gun = new(src)
+	gun.forceMove(src)
+	armed = 0
+	if(user)
+		user << "<span class='notice'>You attach the [gun.name] to the [name].</span>"
+	else
+		src.visible_message("<span class='warning'>The [gun.name] snaps back onto the [name]!</span>")
+	update_icon()
+	user.update_inv_back()
+
+
+/obj/item/weapon/gun/projectile/minigun
+	name = "laser gatling gun"
+	desc = "An advanced laser cannon with an incredible rate of fire. Requires a bulky backpack power source to use."
+	icon = 'icons/obj/guns/minigun.dmi'
+	icon_state = "minigun_spin"
+	item_state = "minigun"
+	origin_tech = "combat=6;powerstorage=5;magnets=4"
+	flags = CONDUCT | HANDSLOW
+	slowdown = 1
+	slot_flags = null
+	w_class = 5
+	materials = list()
+	burst_size = 3
+	automatic = 0
+	fire_delay = 1
+	weapon_weight = WEAPON_HEAVY
+	fire_sound = 'sound/weapons/Laser.ogg'
+	mag_type = /obj/item/ammo_box/magazine/internal/minigun
+	var/obj/item/weapon/minigunpack/ammo_pack
+
+/obj/item/weapon/gun/projectile/minigun/attack_self(mob/living/user)
+	return
+
+/obj/item/weapon/gun/projectile/minigun/dropped(mob/user)
+	if(ammo_pack)
+		ammo_pack.attach_gun(user)
+	else
+		qdel(src)
+
+/obj/item/weapon/gun/projectile/minigun/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+	if(ammo_pack)
+		if(ammo_pack.overheat < ammo_pack.overheat_max)
+			. = ..()
+			ammo_pack.overheat++
+		else
+			user << "The gun's heat sensor locked the trigger to prevent lens damage."
+
+/obj/item/weapon/gun/projectile/minigun/afterattack(atom/target, mob/living/user, flag, params)
+	if(!ammo_pack || ammo_pack.loc != user)
+		user << "You need the backpack power source to fire the gun!"
+	..()
+
+/obj/item/weapon/gun/projectile/minigun/New()
+	if(!ammo_pack)
+		if(istype(loc,/obj/item/weapon/minigunpack)) //We should spawn inside a ammo pack so let's use that one.
+			ammo_pack = loc
+		else
+			qdel(src)//No pack, no gun
+	..()
+
+/obj/item/weapon/gun/projectile/minigun/dropped(mob/living/user)
+	ammo_pack.attach_gun(user)
+
+/obj/item/weapon/gun/projectile/minigun/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+

code/modules/projectiles/guns/projectile/launchers.dm

@@ -0,0 +1,81 @@
+//KEEP IN MIND: These are different from gun/grenadelauncher. These are designed to shoot premade rocket and grenade projectiles, not flashbangs or chemistry casings etc.
+//Put handheld rocket launchers here if someone ever decides to make something so hilarious ~Paprika
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher//this is only used for underbarrel grenade launchers at the moment, but admins can still spawn it if they feel like being assholes
+	desc = "A break-operated grenade launcher."
+	name = "grenade launcher"
+	icon_state = "dshotgun-sawn"
+	item_state = "gun"
+	mag_type = /obj/item/ammo_box/magazine/internal/grenadelauncher
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	w_class = 3
+	pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+		chamber_round()
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/cyborg
+	desc = "A 6-shot grenade launcher."
+	name = "multi grenade launcher"
+	icon = 'icons/mecha/mecha_equipment.dmi'
+	icon_state = "mecha_grenadelnchr"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenademulti
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/cyborg/attack_self()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol
+	name = "gyrojet pistol"
+	desc = "A prototype pistol designed to fire self propelled rockets."
+	icon_state = "gyropistol"
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	origin_tech = "combat=5"
+	mag_type = /obj/item/ammo_box/magazine/m75
+	burst_size = 1
+	fire_delay = 0
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/gyropistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
+
+/obj/item/weapon/gun/projectile/automatic/speargun
+	name = "kinetic speargun"
+	desc = "A weapon favored by carp hunters. Fires specialized spears using kinetic energy."
+	icon_state = "speargun"
+	item_state = "speargun"
+	w_class = 4
+	origin_tech = "combat=4;engineering=4"
+	force = 10
+	can_suppress = 0
+	mag_type = /obj/item/ammo_box/magazine/internal/speargun
+	fire_sound = 'sound/weapons/grenadelaunch.ogg'
+	burst_size = 1
+	fire_delay = 0
+	select = 0
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/speargun/update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attack_self()
+	return
+
+/obj/item/weapon/gun/projectile/automatic/speargun/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/speargun/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] spear\s into \the [src].</span>"
+		update_icon()
+		chamber_round()

code/modules/projectiles/guns/projectile/pistol.dm

@@ -0,0 +1,58 @@
+/obj/item/weapon/gun/projectile/automatic/pistol
+	name = "stechkin pistol"
+	desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
+	icon_state = "pistol"
+	w_class = 2
+	origin_tech = "combat=3;materials=2;syndicate=4"
+	mag_type = /obj/item/ammo_box/magazine/m10mm
+	can_suppress = 1
+	burst_size = 1
+	fire_delay = 0
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/pistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+	return
+
+/obj/item/weapon/gun/projectile/automatic/pistol/m1911
+	name = "\improper M1911"
+	desc = "A classic .45 handgun with a small magazine capacity."
+	icon_state = "m1911"
+	w_class = 3
+	mag_type = /obj/item/ammo_box/magazine/m45
+	can_suppress = 0
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle
+	name = "desert eagle"
+	desc = "A robust .50 AE handgun."
+	icon_state = "deagle"
+	force = 14
+	mag_type = /obj/item/ammo_box/magazine/m50
+	can_suppress = 0
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/gold
+	desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
+	icon_state = "deagleg"
+	item_state = "deagleg"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/deagle/camo
+	desc = "A Deagle brand Deagle for operators operating operationally. Uses .50 AE ammo."
+	icon_state = "deaglecamo"
+	item_state = "deagleg"
+
+/obj/item/weapon/gun/projectile/automatic/pistol/APS
+	name = "stechkin APS pistol"
+	desc = "The original russian version of a widely used Syndicate sidearm. Uses 9mm ammo."
+	icon_state = "aps"
+	w_class = 3
+	origin_tech = "combat=3;materials=2;syndicate=3"
+	mag_type = /obj/item/ammo_box/magazine/pistolm9mm
+	can_suppress = 0
+	burst_size = 3
+	fire_delay = 2
+	actions_types = list(/datum/action/item_action/toggle_firemode)

code/modules/projectiles/guns/projectile/revolver.dm

@@ -0,0 +1,373 @@
+/obj/item/weapon/gun/projectile/revolver
+	name = "\improper .357 revolver"
+	desc = "A suspicious revolver. Uses .357 ammo." //usually used by syndicates
+	icon_state = "revolver"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder
+	origin_tech = "combat=3;materials=2"
+
+/obj/item/weapon/gun/projectile/revolver/New()
+	..()
+	if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+		verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
+
+/obj/item/weapon/gun/projectile/revolver/chamber_round(var/spin = 1)
+	if(spin)
+		chambered = magazine.get_round(1)
+	else
+		chambered = magazine.stored_ammo[1]
+	return
+
+/obj/item/weapon/gun/projectile/revolver/shoot_with_empty_chamber(mob/living/user as mob|obj)
+	..()
+	chamber_round(1)
+
+/obj/item/weapon/gun/projectile/revolver/process_chamber()
+	return ..(0, 1)
+
+/obj/item/weapon/gun/projectile/revolver/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src].</span>"
+		A.update_icon()
+		update_icon()
+		chamber_round(0)
+
+	if(unique_rename)
+		if(istype(A, /obj/item/weapon/pen))
+			rename_gun(user)
+
+/obj/item/weapon/gun/projectile/revolver/attack_self(mob/living/user)
+	var/num_unloaded = 0
+	chambered = null
+	while (get_ammo() > 0)
+		var/obj/item/ammo_casing/CB
+		CB = magazine.get_round(0)
+		if(CB)
+			CB.loc = get_turf(src.loc)
+			CB.SpinAnimation(10, 1)
+			CB.update_icon()
+			num_unloaded++
+	if (num_unloaded)
+		user << "<span class='notice'>You unload [num_unloaded] shell\s from [src].</span>"
+	else
+		user << "<span class='warning'>[src] is empty!</span>"
+
+/obj/item/weapon/gun/projectile/revolver/verb/spin()
+	set name = "Spin Chamber"
+	set category = "Object"
+	set desc = "Click to spin your revolver's chamber."
+
+	var/mob/M = usr
+
+	if(M.stat || !in_range(M,src))
+		return
+
+	if(istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
+		var/obj/item/ammo_box/magazine/internal/cylinder/C = magazine
+		C.spin()
+		chamber_round(0)
+		usr.visible_message("[usr] spins [src]'s chamber.", "<span class='notice'>You spin [src]'s chamber.</span>")
+	else
+		verbs -= /obj/item/weapon/gun/projectile/revolver/verb/spin
+
+
+/obj/item/weapon/gun/projectile/revolver/can_shoot()
+	return get_ammo(0,0)
+
+/obj/item/weapon/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1)
+	var/boolets = 0 //mature var names for mature people
+	if (chambered && countchambered)
+		boolets++
+	if (magazine)
+		boolets += magazine.ammo_count(countempties)
+	return boolets
+
+/obj/item/weapon/gun/projectile/revolver/examine(mob/user)
+	..()
+	user << "[get_ammo(0,0)] of those are live rounds."
+
+/obj/item/weapon/gun/projectile/revolver/detective
+	name = "\improper .38 Mars Special"
+	desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
+	icon_state = "detective"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38
+	unique_rename = 1
+	unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/detective/New()
+	..()
+	options["Default"] = "detective"
+	options["Leopard Spots"] = "detective_leopard"
+	options["Black Panther"] = "detective_panther"
+	options["Gold Trim"] = "detective_gold"
+	options["The Peacemaker"] = "detective_peacemaker"
+	options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/detective/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override = "")
+	if(magazine.caliber != initial(magazine.caliber))
+		if(prob(70 - (magazine.ammo_count() * 10)))	//minimum probability of 10, maximum of 60
+			playsound(user, fire_sound, 50, 1)
+			user << "<span class='userdanger'>[src] blows up in your face!</span>"
+			user.take_organ_damage(0,20)
+			user.unEquip(src)
+			return 0
+	..()
+
+/obj/item/weapon/gun/projectile/revolver/detective/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/weapon/screwdriver))
+		if(magazine.caliber == "38")
+			user << "<span class='notice'>You begin to reinforce the barrel of [src]...</span>"
+			if(magazine.ammo_count())
+				afterattack(user, user)	//you know the drill
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='userdanger'>[src] goes off in your face!</span>")
+				return
+			if(do_after(user, 30/A.toolspeed, target = src))
+				if(magazine.ammo_count())
+					user << "<span class='warning'>You can't modify it!</span>"
+					return
+				magazine.caliber = "357"
+				desc = "The barrel and chamber assembly seems to have been modified."
+				user << "<span class='notice'>You reinforce the barrel of [src]. Now it will fire .357 rounds.</span>"
+		else
+			user << "<span class='notice'>You begin to revert the modifications to [src]...</span>"
+			if(magazine.ammo_count())
+				afterattack(user, user)	//and again
+				user.visible_message("<span class='danger'>[src] goes off!</span>", "<span class='userdanger'>[src] goes off in your face!</span>")
+				return
+			if(do_after(user, 30/A.toolspeed, target = src))
+				if(magazine.ammo_count())
+					user << "<span class='warning'>You can't modify it!</span>"
+					return
+				magazine.caliber = "38"
+				desc = initial(desc)
+				user << "<span class='notice'>You remove the modifications on [src]. Now it will fire .38 rounds.</span>"
+
+
+/obj/item/weapon/gun/projectile/revolver/mateba
+	name = "\improper Unica 6 auto-revolver"
+	desc = "A retro high-powered autorevolver typically used by officers of the New Russia military. Uses .357 ammo."
+	icon_state = "mateba"
+
+/obj/item/weapon/gun/projectile/revolver/golden
+	name = "\improper Golden revolver"
+	desc = "This ain't no game, ain't never been no show, And I'll gladly gun down the oldest lady you know. Uses .357 ammo."
+	icon_state = "goldrevolver"
+	fire_sound = 'sound/weapons/resonator_blast.ogg'
+	recoil = 8
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/revolver/nagant
+	name = "nagant revolver"
+	desc = "An old model of revolver that originated in Russia. Able to be suppressed. Uses 7.62x38mmR ammo."
+	icon_state = "nagant"
+	origin_tech = "combat=3"
+	can_suppress = 1
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev762
+
+
+// A gun to play Russian Roulette!
+// You can spin the chamber to randomize the position of the bullet.
+
+/obj/item/weapon/gun/projectile/revolver/russian
+	name = "\improper russian revolver"
+	desc = "A Russian-made revolver for drinking games. Uses .357 ammo, and has a mechanism requiring you to spin the chamber before each trigger pull."
+	origin_tech = "combat=2;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/rus357
+	var/spun = 0
+
+/obj/item/weapon/gun/projectile/revolver/russian/New()
+	..()
+	Spin()
+	update_icon()
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/Spin()
+	chambered = null
+	var/random = rand(1, magazine.max_ammo)
+	if(random <= get_ammo(0,0))
+		chamber_round()
+	spun = 1
+
+/obj/item/weapon/gun/projectile/revolver/russian/attackby(obj/item/A, mob/user, params)
+	var/num_loaded = ..()
+	if(num_loaded)
+		user.visible_message("[user] loads a single bullet into the revolver and spins the chamber.", "<span class='notice'>You load a single bullet into the chamber and spin it.</span>")
+	else
+		user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
+	if(get_ammo() > 0)
+		Spin()
+	update_icon()
+	A.update_icon()
+	return
+
+/obj/item/weapon/gun/projectile/revolver/russian/attack_self(mob/user)
+	if(!spun && can_shoot())
+		user.visible_message("[user] spins the chamber of the revolver.", "<span class='notice'>You spin the revolver's chamber.</span>")
+		Spin()
+	else
+		var/num_unloaded = 0
+		while (get_ammo() > 0)
+			var/obj/item/ammo_casing/CB
+			CB = magazine.get_round()
+			chambered = null
+			CB.loc = get_turf(src.loc)
+			CB.update_icon()
+			num_unloaded++
+		if (num_unloaded)
+			user << "<span class='notice'>You unload [num_unloaded] shell\s from [src].</span>"
+		else
+			user << "<span class='notice'>[src] is empty.</span>"
+
+/obj/item/weapon/gun/projectile/revolver/russian/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params)
+	if(flag)
+		if(!(target in user.contents) && ismob(target))
+			if(user.a_intent == "harm") // Flogging action
+				return
+
+	if(isliving(user))
+		if(!can_trigger_gun(user))
+			return
+	if(target != user)
+		if(ismob(target))
+			user << "<span class='warning'>A mechanism prevents you from shooting anyone but yourself!</span>"
+		return
+
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(!spun)
+			user << "<span class='warning'>You need to spin the revolver's chamber first!</span>"
+			return
+
+		spun = 0
+
+		if(chambered)
+			var/obj/item/ammo_casing/AC = chambered
+			if(AC.fire(user, user))
+				playsound(user, fire_sound, 50, 1)
+				var/zone = check_zone(user.zone_selected)
+				var/obj/item/bodypart/affecting = H.get_bodypart(zone)
+				if(zone == "head" || zone == "eyes" || zone == "mouth")
+					shoot_self(user, affecting)
+				else
+					user.visible_message("<span class='danger'>[user.name] cowardly fires [src] at \his [affecting.name]!</span>", "<span class='userdanger'>You cowardly fire [src] at your [affecting.name]!</span>", "<span class='italics'>You hear a gunshot!</span>")
+				return
+
+		user.visible_message("<span class='danger'>*click*</span>")
+		playsound(user, 'sound/weapons/empty.ogg', 100, 1)
+
+/obj/item/weapon/gun/projectile/revolver/russian/proc/shoot_self(mob/living/carbon/human/user, affecting = "head")
+	user.apply_damage(300, BRUTE, affecting)
+	user.visible_message("<span class='danger'>[user.name] fires [src] at \his head!</span>", "<span class='userdanger'>You fire [src] at your head!</span>", "<span class='italics'>You hear a gunshot!</span>")
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul
+	name = "cursed russian revolver"
+	desc = "To play with this revolver requires wagering your very soul."
+
+/obj/item/weapon/gun/projectile/revolver/russian/soul/shoot_self(mob/living/user)
+	..()
+	var/obj/item/device/soulstone/anybody/SS = new /obj/item/device/soulstone/anybody(get_turf(src))
+	if(!SS.transfer_soul("FORCE", user)) //Something went wrong
+		qdel(SS)
+		return
+	user.visible_message("<span class='danger'>[user.name]'s soul is captured by \the [src]!</span>", "<span class='userdanger'>You've lost the gamble! Your soul is forfiet!</span>")
+
+
+
+/////////////////////////////
+// DOUBLE BARRELED SHOTGUN //
+/////////////////////////////
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel
+	name = "double-barreled shotgun"
+	desc = "A true classic."
+	icon_state = "dshotgun"
+	item_state = "shotgun"
+	w_class = 4
+	force = 10
+	flags = CONDUCT
+	slot_flags = SLOT_BACK
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/dual
+	sawn_desc = "Omar's coming!"
+	unique_rename = 1
+	unique_reskin = 1
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/New()
+	..()
+	options["Default"] = "dshotgun"
+	options["Dark Red Finish"] = "dshotgun-d"
+	options["Ash"] = "dshotgun-f"
+	options["Faded Grey"] = "dshotgun-g"
+	options["Maple"] = "dshotgun-l"
+	options["Rosewood"] = "dshotgun-p"
+	options["Cancel"] = null
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
+		chamber_round()
+	if(istype(A, /obj/item/weapon/melee/energy))
+		var/obj/item/weapon/melee/energy/W = A
+		if(W.active)
+			sawoff(user)
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+		sawoff(user)
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
+	var/num_unloaded = 0
+	while (get_ammo() > 0)
+		var/obj/item/ammo_casing/CB
+		CB = magazine.get_round(0)
+		chambered = null
+		CB.loc = get_turf(src.loc)
+		CB.update_icon()
+		num_unloaded++
+	if (num_unloaded)
+		user << "<span class='notice'>You break open \the [src] and unload [num_unloaded] shell\s.</span>"
+	else
+		user << "<span class='warning'>[src] is empty!</span>"
+
+
+
+
+// IMPROVISED SHOTGUN //
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised
+	name = "improvised shotgun"
+	desc = "Essentially a tube that aims shotgun shells."
+	icon_state = "ishotgun"
+	item_state = "shotgun"
+	w_class = 4
+	force = 10
+	slot_flags = null
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/improvised
+	sawn_desc = "I'm just here for the gasoline."
+	unique_rename = 0
+	unique_reskin = 0
+	var/slung = 0
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/stack/cable_coil) && !sawn_state)
+		var/obj/item/stack/cable_coil/C = A
+		if(C.use(10))
+			slot_flags = SLOT_BACK
+			user << "<span class='notice'>You tie the lengths of cable to the shotgun, making a sling.</span>"
+			slung = 1
+			update_icon()
+		else
+			user << "<span class='warning'>You need at least ten lengths of cable if you want to make a sling!</span>"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/update_icon()
+	..()
+	if(slung)
+		icon_state += "sling"
+
+/obj/item/weapon/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
+	. = ..()
+	if(. && slung) //sawing off the gun removes the sling
+		new /obj/item/stack/cable_coil(get_turf(src), 10)
+		slung = 0
+		update_icon()

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -0,0 +1,212 @@
+/obj/item/weapon/gun/projectile/shotgun
+	name = "shotgun"
+	desc = "A traditional shotgun with wood furniture and a four-shell capacity underneath."
+	icon_state = "shotgun"
+	item_state = "shotgun"
+	w_class = 4
+	force = 10
+	flags =  CONDUCT
+	slot_flags = SLOT_BACK
+	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot
+	var/recentpump = 0 // to prevent spammage
+
+/obj/item/weapon/gun/projectile/shotgun/attackby(obj/item/A, mob/user, params)
+	. = ..()
+	if(.)
+		return
+	var/num_loaded = magazine.attackby(A, user, params, 1)
+	if(num_loaded)
+		user << "<span class='notice'>You load [num_loaded] shell\s into \the [src]!</span>"
+		A.update_icon()
+		update_icon()
+
+/obj/item/weapon/gun/projectile/shotgun/process_chamber()
+	return ..(0, 0)
+
+/obj/item/weapon/gun/projectile/shotgun/chamber_round()
+	return
+
+/obj/item/weapon/gun/projectile/shotgun/can_shoot()
+	if(!chambered)
+		return 0
+	return (chambered.BB ? 1 : 0)
+
+/obj/item/weapon/gun/projectile/shotgun/attack_self(mob/living/user)
+	if(recentpump)
+		return
+	pump(user)
+	recentpump = 1
+	spawn(10)
+		recentpump = 0
+	return
+
+/obj/item/weapon/gun/projectile/shotgun/blow_up(mob/user)
+	. = 0
+	if(chambered && chambered.BB)
+		process_fire(user, user,0)
+		. = 1
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump(mob/M)
+	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+	pump_unload(M)
+	pump_reload(M)
+	update_icon()	//I.E. fix the desc
+	return 1
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump_unload(mob/M)
+	if(chambered)//We have a shell in the chamber
+		chambered.loc = get_turf(src)//Eject casing
+		chambered.SpinAnimation(5, 1)
+		chambered = null
+
+/obj/item/weapon/gun/projectile/shotgun/proc/pump_reload(mob/M)
+	if(!magazine.ammo_count())
+		return 0
+	var/obj/item/ammo_casing/AC = magazine.get_round() //load next casing.
+	chambered = AC
+
+
+/obj/item/weapon/gun/projectile/shotgun/examine(mob/user)
+	..()
+	if (chambered)
+		user << "A [chambered.BB ? "live" : "spent"] one is in the chamber."
+
+/obj/item/weapon/gun/projectile/shotgun/lethal
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/lethal
+
+// RIOT SHOTGUN //
+
+/obj/item/weapon/gun/projectile/shotgun/riot //for spawn in the armory
+	name = "riot shotgun"
+	desc = "A sturdy shotgun with a longer magazine and a fixed tactical stock designed for non-lethal riot control."
+	icon_state = "riotshotgun"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/riot
+	sawn_desc = "Come with me if you want to live."
+
+/obj/item/weapon/gun/projectile/shotgun/riot/attackby(obj/item/A, mob/user, params)
+	..()
+	if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
+		sawoff(user)
+	if(istype(A, /obj/item/weapon/melee/energy))
+		var/obj/item/weapon/melee/energy/W = A
+		if(W.active)
+			sawoff(user)
+
+///////////////////////
+// BOLT ACTION RIFLE //
+///////////////////////
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction
+	name = "\improper Mosin Nagant"
+	desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
+	icon_state = "moistnugget"
+	item_state = "moistnugget"
+	slot_flags = 0 //no SLOT_BACK sprite, alas
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction
+	var/bolt_open = 0
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/pump(mob/M)
+	playsound(M, 'sound/weapons/shotgunpump.ogg', 60, 1)
+	if(bolt_open)
+		pump_reload(M)
+	else
+		pump_unload(M)
+	bolt_open = !bolt_open
+	update_icon()	//I.E. fix the desc
+	return 1
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/attackby(obj/item/A, mob/user, params)
+	if(!bolt_open)
+		user << "<span class='notice'>The bolt is closed!</span>"
+		return
+	. = ..()
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/examine(mob/user)
+	..()
+	user << "The bolt is [bolt_open ? "open" : "closed"]."
+
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted
+	name = "enchanted bolt action rifle"
+	desc = "Careful not to lose your head."
+	var/guns_left = 30
+	mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/New()
+	..()
+	bolt_open = 1
+	pump()
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/dropped()
+	..()
+	guns_left = 0
+
+/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/shoot_live_shot(mob/living/user as mob|obj, pointblank = 0, mob/pbtarget = null, message = 1)
+	..()
+	if(guns_left)
+		var/obj/item/weapon/gun/projectile/shotgun/boltaction/enchanted/GUN = new
+		GUN.guns_left = src.guns_left - 1
+		user.drop_item()
+		user.swap_hand()
+		user.put_in_hands(GUN)
+	else
+		user.drop_item()
+	src.throw_at_fast(pick(oview(7,get_turf(user))),1,1)
+	user.visible_message("<span class='warning'>[user] tosses aside the spent rifle!</span>")
+
+// Automatic Shotguns//
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/shoot_live_shot(mob/living/user as mob|obj)
+	..()
+	src.pump(user)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/combat
+	name = "combat shotgun"
+	desc = "A semi automatic shotgun with tactical furniture and a six-shell capacity underneath."
+	icon_state = "cshotgun"
+	origin_tech = "combat=6"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/com
+	w_class = 5
+
+//Dual Feed Shotgun
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube
+	name = "cycler shotgun"
+	desc = "An advanced shotgun with two separate magazine tubes, allowing you to quickly toggle between ammo types."
+	icon_state = "cycler"
+	origin_tech = "combat=4;materials=2"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/tube
+	w_class = 5
+	var/toggled = 0
+	var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/New()
+	..()
+	if (!alternate_magazine)
+		alternate_magazine = new mag_type(src)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/attack_self(mob/living/user)
+	if(!chambered && magazine.contents.len)
+		pump()
+	else
+		toggle_tube(user)
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/proc/toggle_tube(mob/living/user)
+	var/current_mag = magazine
+	var/alt_mag = alternate_magazine
+	magazine = alt_mag
+	alternate_magazine = current_mag
+	toggled = !toggled
+	if(toggled)
+		user << "You switch to tube B."
+	else
+		user << "You switch to tube A."
+
+/obj/item/weapon/gun/projectile/shotgun/automatic/dual_tube/AltClick(mob/living/user)
+	if(user.incapacitated() || !Adjacent(user) || !istype(user))
+		return
+	pump()
+
+
+// DOUBLE BARRELED SHOTGUN and IMPROVISED SHOTGUN are in revolver.dm

code/modules/projectiles/guns/projectile/toy.dm

@@ -0,0 +1,108 @@
+/obj/item/weapon/gun/projectile/automatic/toy
+	name = "foam force SMG"
+	desc = "A prototype three-round burst toy submachine gun. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	icon_state = "saber"
+	item_state = "gun"
+	mag_type = /obj/item/ammo_box/magazine/toy/smg
+	fire_sound = 'sound/weapons/Gunshot_smg.ogg'
+	force = 0
+	throwforce = 0
+	burst_size = 3
+	can_suppress = 0
+	clumsy_check = 0
+	needs_permit = 0
+
+/obj/item/weapon/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/toy/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol
+	name = "foam force pistol"
+	desc = "A small, easily concealable toy handgun. Ages 8 and up."
+	icon_state = "pistol"
+	w_class = 2
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol
+	fire_sound = 'sound/weapons/Gunshot.ogg'
+	can_suppress = 0
+	burst_size = 1
+	fire_delay = 0
+	actions_types = list()
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/update_icon()
+	..()
+	icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot
+	mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/New()
+	magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/toy/pistol/riot/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/shotgun/toy
+	name = "foam force shotgun"
+	desc = "A toy shotgun with wood furniture and a four-shell capacity underneath. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	force = 0
+	throwforce = 0
+	origin_tech = null
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
+	clumsy_check = 0
+	needs_permit = 0
+
+/obj/item/weapon/gun/projectile/shotgun/toy/process_chamber()
+	..()
+	if(chambered && !chambered.BB)
+		qdel(chambered)
+
+/obj/item/weapon/gun/projectile/shotgun/toy/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/shotgun/toy/crossbow
+	name = "foam force crossbow"
+	desc = "A weapon favored by many overactive children. Ages 8 and up."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "foamcrossbow"
+	item_state = "crossbow"
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/toy/crossbow
+	fire_sound = 'sound/items/syringeproj.ogg'
+	slot_flags = SLOT_BELT
+	w_class = 2
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy
+	name = "donksoft SMG"
+	desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	can_suppress = 0
+	needs_permit = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/smgm45
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+
+/obj/item/weapon/gun/projectile/automatic/c20r/toy/unrestricted
+	pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy
+	name = "donksoft LMG"
+	desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
+	icon = 'icons/obj/guns/toy.dmi'
+	can_suppress = 0
+	needs_permit = 0
+	mag_type = /obj/item/ammo_box/magazine/toy/m762
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
+	..()
+
+/obj/item/weapon/gun/projectile/automatic/l6_saw/toy/unrestricted
+	pin = /obj/item/device/firing_pin

code/modules/reagents/kegs.dm

@@ -0,0 +1,42 @@
+/obj/structure/reagent_dispensers/keg
+	name = "keg"
+	desc = "A keg."
+	icon_state = "keg"
+	var/reagent_type = "water"
+
+/obj/structure/reagent_dispensers/keg/New()
+	..()
+	reagents.add_reagent(reagent_type,1000)
+
+/obj/structure/reagent_dispensers/keg/blob_act()
+	qdel(src)
+
+/obj/structure/reagent_dispensers/keg/mead
+	name = "keg of mead"
+	desc = "A keg of mead."
+	icon_state = "orangekeg"
+	reagent_type = "mead"
+
+/obj/structure/reagent_dispensers/keg/aphro
+	name = "keg of aphrodisiac"
+	desc = "A keg of aphrodisiac."
+	icon_state = "pinkkeg"
+	reagent_type = "hornychem"
+
+/obj/structure/reagent_dispensers/keg/milk
+	name = "keg of milk"
+	desc = "It's not quite what you were hoping for."
+	icon_state = "whitekeg"
+	reagent_type = "milk"
+
+/obj/structure/reagent_dispensers/keg/semen
+	name = "keg of semen"
+	desc = "Dear lord, where did this even come from?"
+	icon_state = "whitekeg"
+	reagent_type = "semen"
+
+/obj/structure/reagent_dispensers/keg/gargle
+	name = "keg of pan galactic gargleblaster"
+	desc = "A keg of... wow that's a long name."
+	icon_state = "bluekeg"
+	reagent_type = "gargleblaster"

code/modules/ruins/ruin_areas.dm

@@ -0,0 +1,54 @@
+//Parent types
+
+/area/ruin/
+	name = "\improper Unexplored Location"
+	icon_state = "away"
+	has_gravity = 1
+
+
+/area/ruin/unpowered
+	always_unpowered = 0
+
+/area/ruin/unpowered/no_grav
+	has_gravity = 0
+
+/area/ruin/powered
+	requires_power = 0
+
+
+
+
+//Areas
+
+/area/ruin/unpowered/no_grav/way_home
+	name = "\improper Salvation"
+	icon_state = "away"
+
+/area/ruin/powered/snow_biodome
+
+/area/ruin/powered/golem_ship
+	name = "Free Golem Ship"
+
+// Ruins of "onehalf" ship
+/area/ruin/onehalf/hallway
+	name = "Hallway"
+	icon_state = "hallC"
+
+
+/area/ruin/onehalf/drone_bay
+	name = "Mining Drone Bay"
+	icon_state = "engine"
+
+/area/ruin/onehalf/dorms_med
+	name = "Crew Quarters"
+	icon_state = "Sleep"
+
+/area/ruin/onehalf/bridge
+	name = "Bridge"
+	icon_state = "bridge"
+
+/area/ruin/powered/dinner_for_two
+	name = "Dinner for Two"
+
+/area/ruin/powered/authorship
+	name = "Authorship"

code/modules/salvaging/equipment.dm

@@ -0,0 +1,21 @@
+//Salvaging hardsuit
+/obj/item/clothing/head/helmet/space/hardsuit/salvaging
+	name = "salvaging hardsuit helmet"
+	desc = "A hardsuit helmet worn by salvaging teams during EVA. Features three viewing ports, a mounted flashlight, adaptive padding, and UV shielding. Also, has radiation and explosion shielding."
+	icon_state = "hardsuit0-salvage"
+	item_state = "salvage_helm"
+	armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 80, bio = 100, rad = 40)
+	item_color = "salvage"
+
+/obj/item/clothing/suit/space/hardsuit/salvaging
+	name = "salvaging hardsuit"
+	desc = "A hardsuit worn by salvaging teams during EVA. Features a robust, orange chassis, stylish leather, and comfortable gloves. Also, has radiation and explosion shielding."
+	icon_state = "hardsuit_salvage"
+	item_state = "hardsuit_salvage"
+	armor = list(melee = 5, bullet = 5, laser = 5, energy = 5, bomb = 80, bio = 100, rad = 40)
+	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/salvaging
+
+/obj/machinery/suit_storage_unit/salvaging
+	suit_type = /obj/item/clothing/suit/space/hardsuit/salvaging
+	mask_type = /obj/item/clothing/mask/breath
+	storage_type = /obj/item/clothing/shoes/magboots

code/modules/salvaging/salvage_ship.dm

@@ -0,0 +1,117 @@
+//Salvaging ship. Large ship used to navigate debris fields. Capable of basic collection, sorting, and refining of scrap.
+
+/obj/mecha/ship
+	name = "ship"
+	desc = "A space ship, or something."
+
+//Ship itself
+/obj/mecha/ship/salvage
+	desc = "Powered Space Junk Recycler, revision 1A1, designated \"Scrapper\" by NT and approved for use on their stations. While it doesn't quite roll off the tongue, \
+			these tough ships are typically used in groups to clear debris fields of precious metals, artifacts, equipment, hardware, and other valuables. They're fitted \
+			with advanced absorbant armor plates to protect the contents, both living and not, from explosions; a common hazard considering the munitions and fuel used on \
+			most ships and stations."
+	name = "\improper PSJR-1A1 \"Scrapper\""
+	icon_state = "scrapper"
+	icon = 'icons/salvaging/scrapper.dmi'
+	step_in = 4
+	max_temperature = 1000
+	health = 200
+	lights_power = 8
+	deflect_chance = 20
+	damage_absorption = list("brute"=0.7,"fire"=0.9,"bullet"=0.9,"laser"=0.9,"energy"=1,"bomb"=0.4)
+	max_equip = 6
+	wreckage = /obj/structure/mecha_wreckage/scrapper
+//	bound_height = 64
+//	bound_width = 96
+	pixel_x = -48
+	pixel_y = -48
+	turnsound = null
+	stepsound = null
+
+/obj/mecha/ship/salvage/GrantActions(mob/living/user, human_occupant = 0)
+	..()
+	thrusters_action.Grant(user, src)
+
+/obj/mecha/ship/salvage/RemoveActions(mob/living/user, human_occupant = 0)
+	..()
+	thrusters_action.Remove(user)
+
+/obj/mecha/mechturn()
+	..()
+	updatebounds()
+
+/obj/mecha/proc/updatebounds()
+/*	switch(dir)
+		if(1)
+			bound_height = initial(bound_height)
+			bound_width = initial(bound_width)
+		if(2)
+			bound_height = initial(bound_height)
+			bound_width = initial(bound_width)
+		if(4)
+			bound_height = initial(bound_width)
+			bound_width = initial(bound_height)
+		if(8)
+			bound_height = initial(bound_width)
+			bound_width = initial(bound_height)
+*/
+//Wreckage
+/obj/structure/mecha_wreckage/scrapper
+	name = "scrapper wreckage"
+	icon_state = "scrapper-broken"
+	icon = 'icons/salvaging/scrapper.dmi'
+
+/obj/structure/mecha_wreckage/scrapper/New()
+	..()
+	var/list/parts = list(/obj/item/mecha_parts/chassis/scrapper,
+						  /obj/item/mecha_parts/part/cockpit,
+						  /obj/item/mecha_parts/part/engine,
+						  /obj/item/mecha_parts/part/lifesupport,
+						  /obj/item/mecha_parts/part/storage,
+						  /obj/item/mecha_parts/part/scrap_refinery)
+	for(var/i = 0; i < 2; i++)
+		if(parts.len && prob(40))
+			var/part = pick(parts)
+			welder_salvage += part
+			parts -= part
+
+//Parts
+/obj/item/mecha_parts/chassis/scrapper/New()
+	..()
+	construct = new /datum/construction/mecha/ripley_chassis(src)
+
+/obj/item/mecha_parts/chassis/scrapper
+	name = "\improper Scrapper chassis"
+	icon_state = "scrapper_chassis"
+
+/obj/item/mecha_parts/part/cockpit
+	name = "shipcockpit"
+	desc = "The cockpit of a small space ship."
+	icon_state = "cockpit"
+	origin_tech = "programming=2;materials=2;biotech=2;engineering=2"
+
+/obj/item/mecha_parts/part/engine
+	name = "engine"
+	desc = "The main source of thrust for small space ships."
+	icon_state = "shipthruster"
+	origin_tech = "programming=1;materials=3;engineering=3"
+
+/obj/item/mecha_parts/part/lifesupport
+	name = "life support systems"
+	gender = PLURAL
+	desc = "A series of systems to be installed in a small vessel. Ensures your ship will be nice and toasty, every time."
+	icon_state = "shiplifesupport"
+	origin_tech = "programming=1;materials=2;engineering=2;biotech=3"
+
+/obj/item/mecha_parts/part/storage
+	name = "storage compartments"
+	gender = PLURAL
+	desc = "A series of storage compartments that are typically installed on the sides of small ships."
+	icon_state = "shipstorage"
+	origin_tech = "materials=2;engineering=2"
+
+/obj/item/mecha_parts/part/scrap_refinery
+	name = "scrap refinery"
+	desc = "A ship-mounted refinery used to turn unsorted scrap metals into useful raw materials."
+	icon_state = "shiprefinery"
+	origin_tech = "materials=2;engineering=3"

code/modules/salvaging/salvaging.dm

@@ -0,0 +1,3 @@
+//Master file for the salvaging module. Documentation, helpers, procs, credits, and other unsorted stuff will be placed here.
+//Credits: Skorpio @ http://opengameart.org/users/skorpio for their sprite work.
+

code/modules/surgery/gender_reassignment.dm

@@ -0,0 +1,38 @@
+/datum/surgery/gender_reassignment
+	name = "gender reassignment"
+	steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/reshape_genitals, /datum/surgery_step/close)
+	species = list(/mob/living/carbon/human)
+	possible_locs = list("groin")
+
+
+//reshape_genitals
+/datum/surgery_step/reshape_genitals
+	name = "reshape genitals"
+	implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/hatchet = 50, /obj/item/weapon/wirecutters = 35)
+	time = 64
+
+/datum/surgery_step/reshape_genitals/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	if(target.gender == FEMALE)
+		user.visible_message("[user] begins to reshape [target]'s genitals to look more masculine.", "<span class='notice'>You begin to reshape [target]'s genitals to look more masculine...</span>")
+	else
+		user.visible_message("[user] begins to reshape [target]'s genitals to look more feminine.", "<span class='notice'>You begin to reshape [target]'s genitals to look more feminine...</span>")
+
+/datum/surgery_step/reshape_genitals/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	var/mob/living/carbon/human/H = target	//no type check, as that should be handled by the surgery
+	H.gender_ambiguous = 0
+	if(target.gender == FEMALE)
+		user.visible_message("[user] has made a man of [target]!", "<span class='notice'>You made [target] a man.</span>")
+		target.gender = MALE
+	else
+		user.visible_message("[user] has made a woman of [target]!", "<span class='notice'>You made [target] a woman.</span>")
+		target.gender = FEMALE
+	target.regenerate_icons()
+	return 1
+
+/datum/surgery_step/reshape_genitals/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+	var/mob/living/carbon/human/H = target
+	H.gender_ambiguous = 1
+	user.visible_message("<span class='warning'>[user] accidentally mutilates [target]'s genitals beyond the point of recognition!</span>", "<span class='warning'>You accidentally mutilate [target]'s genitals beyond the point of recognition!</span>")
+	target.gender = pick(MALE, FEMALE)
+	target.regenerate_icons()
+	return 1