From a5ef405ad05f6500c26027de07544ae31b9dec04 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Wed, 31 Dec 2014 19:18:06 +0200
Subject: [PATCH 1/6] Ban Transfer Proc

Debug proc, saved for posterity's sake.
---
 code/modules/admin/NewBan.dm | 64 ++++++++++++++++++++++++++++++++++++
 1 file changed, 64 insertions(+)

diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 3c29c486..767668ab 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -227,3 +227,67 @@ var/savefile/Banlist
 	for (var/A in Banlist.dir)
 		RemoveBan(A)
 
+////////////////////////////
+//TRANSFER TO SQL DATABASE//
+////////////////////////////
+//Used to transfer the old .dbd file contents over to the SQL database. Kept on hand just for the sake of being kept on hand, frankly.
+/*
+/datum/admins/proc/bantosql()
+
+	establish_db_connection()
+
+	if(!dbcon.IsConnected())
+		usr << "\red Failed to establish database connection"
+		return
+	else
+		message_admins("Houston, we have a database!")
+
+
+	var/count = 0
+//	var/dat
+
+	//junk vars to keep track of simple shit, like serverip
+	var/serverip = ""
+	var/bantype_str
+	var/rounds = 0
+	var/duration = -1
+	var/job = ""
+	var/banckey = null
+
+	message_admins("Fetching data now.")
+
+	//var/dat = "<HR><B>Unban Player:</B> \blue(U) = Unban , (E) = Edit Ban\green (Total<HR><table border=1 rules=all frame=void cellspacing=0 cellpadding=3 >"
+	Banlist.cd = "/base"
+	for (var/A in Banlist.dir)
+		count++
+		Banlist.cd = "/base/[A]"
+		var/ref		= "\ref[src]"
+		var/key		= Banlist["key"]
+		var/id		= Banlist["id"]
+		var/ip		= Banlist["ip"]
+		var/reason	= Banlist["reason"]
+		banckey		= Banlist["bannedby"]
+		var/minutes = Banlist["minutes"]
+		var/expiry
+		if(Banlist["temp"])
+			bantype_str = "TEMPBAN"
+			duration = Banlist["minutes"]
+			expiry = GetExp(Banlist["minutes"])
+			if(!expiry)
+				expiry = "Removal Pending"
+		else
+			expiry = "Permaban"
+			bantype_str = "PERMABAN"
+			duration = -1
+
+		message_admins("Query data: [serverip], [bantype_str], [duration], [key], [id], [ip], [reason], [banckey]")
+		message_admins("Executing query")
+
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO `erro_ban` (`id`,`bantime`,`serverip`,`bantype`,`reason`,`job`,`duration`,`rounds`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`,`edits`,`unbanned`,`unbanned_datetime`,`unbanned_ckey`,`unbanned_computerid`,`unbanned_ip`) VALUES (null, Now(), '[serverip]', '[bantype_str]', '[reason]', '[job]', '[minutes]', '[rounds]', Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[key]', '[id]', '[ip]', '[banckey]', '', '', '', '', null, null, null, null, null, null);")
+		insert_query.Execute()
+		var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Attempted to transfer the ban of [key].');")
+		log_query.Execute()
+
+		message_admins("Salvo complete, stand by.")
+	message_admins("Rounds complete, RTB.")
+*/

From fe10748d2fc665ddf146027fa7de0de4d0a935ff Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Wed, 31 Dec 2014 19:24:29 +0200
Subject: [PATCH 2/6] SQL Preset Admin Ranks

Adds a set of preset ranks to assign on the permissions panel, with
permissions included.
---
 .../admin/permissionverbs/permissionedit.dm   | 28 +++++++++++++++++--
 code/modules/admin/topic.dm                   |  2 +-
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/code/modules/admin/permissionverbs/permissionedit.dm b/code/modules/admin/permissionverbs/permissionedit.dm
index d6cc0c95..a52e289d 100644
--- a/code/modules/admin/permissionverbs/permissionedit.dm
+++ b/code/modules/admin/permissionverbs/permissionedit.dm
@@ -76,16 +76,40 @@
 
 	var/new_admin = 1
 	var/admin_id
+
+	var/flags
+	switch(new_rank)
+		if("Head Developer")
+			flags = 32767
+		if("Head Admin")
+			flags = 32767
+		if("Primary Admin")
+			flags = 8191
+		if("Secondary Admin")
+			flags = 7983
+		if("Moderator")
+			flags = 8196
+		if("Trial Moderator")
+			flags = 8192
+		if("Event Host - Moderator")
+			flags = 15885
+		if("Event Host")
+			flags = 5672
+		if("Retired Admin")
+			flags = 8194
+		else
+			flags = 0
+
 	while(select_query.NextRow())
 		new_admin = 0
 		admin_id = text2num(select_query.item[1])
 
 	if(new_admin)
-		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO `erro_admin` (`id`, `ckey`, `rank`, `level`, `flags`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, 0)")
+		var/DBQuery/insert_query = dbcon.NewQuery("INSERT INTO `erro_admin` (`id`, `ckey`, `rank`, `level`, `flags`) VALUES (null, '[adm_ckey]', '[new_rank]', -1, '[flags]')")
 		insert_query.Execute()
 		var/DBQuery/log_query = dbcon.NewQuery("INSERT INTO `erro_admin_log` (`id` ,`datetime` ,`adminckey` ,`adminip` ,`log` ) VALUES (NULL , NOW( ) , '[usr.ckey]', '[usr.client.address]', 'Added new admin [adm_ckey] to rank [new_rank]');")
 		log_query.Execute()
-		usr << "\blue New admin added."
+		usr << "\blue New admin added. Don't forget to manually reload the admins for the permissions to load!"
 	else
 		if(!isnull(admin_id) && isnum(admin_id))
 			var/DBQuery/insert_query = dbcon.NewQuery("UPDATE `erro_admin` SET rank = '[new_rank]' WHERE id = [admin_id]")
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 9cbd1985..f0fbde2b 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -151,7 +151,7 @@
 			if(admin_ranks.len)
 				new_rank = input("Please select a rank", "New rank", null, null) as null|anything in (admin_ranks|"*New Rank*")
 			else
-				new_rank = input("Please select a rank", "New rank", null, null) as null|anything in list("Game Master","Game Admin", "Trial Admin", "Admin Observer","*New Rank*")
+				new_rank = input("Please select a rank", "New rank", null, null) as null|anything in list("Head Developer","Head Admin", "Primary Admin", "Secondary Admin", "Moderator", "Trial Moderator", "Event Host - Moderator", "Event Host", "Retired Admin", "*New Rank*")
 
 			var/rights = 0
 			if(D)

From 1066da98ffdf9fe527bdc3458075770b41a3b2d2 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 5 Jan 2015 23:08:13 +0200
Subject: [PATCH 3/6] Empty hands for mechs!

So you can't get animals in the contents.
---
 code/game/mecha/mecha.dm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 1d38590b..0efbf6be 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -982,11 +982,11 @@
 		usr << "\blue <B>The [src.name] is already occupied!</B>"
 		src.log_append_to_last("Permission denied.")
 		return
-/*
+
 	if (usr.abiotic())
-		usr << "\blue <B>Subject cannot have abiotic items on.</B>"
+		usr << "\blue <B>You need empty hands to enter the mech.</B>"
 		return
-*/
+
 	var/passed
 	if(src.dna)
 		if(usr.dna.unique_enzymes==src.dna)

From 870c8fcbeed74cdcdd063da73b919434b4395579 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 5 Jan 2015 23:08:22 +0200
Subject: [PATCH 4/6] Missing icon round-up.

---
 icons/mob/eyes.dmi             | Bin 7425 -> 7564 bytes
 icons/obj/clothing/glasses.dmi | Bin 7103 -> 7216 bytes
 icons/obj/clothing/hats.dmi    | Bin 59844 -> 60116 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi
index cd1c65a53460af32f4e2dea6b66607ff6dd636d7..e3f3a0f57e495f6a040971da791c1d94a5f36503 100644
GIT binary patch
literal 7564
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

literal 7425
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
BTx$RT

diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index e47b8a70eeb3688dac21480a20d7cd00b782079b..44c6159ff72ff23c6d307639cdfed7ce54c82971 100644
GIT binary patch
literal 7216
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

literal 7103
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
Zy!~p5^Mfxf*dKF%rka*&xw1v*{{oecc=iAQ

diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index d291581321183278129c8eff5419f30bd3aa1fd6..8fd829dde95a6fb3d96224cf18409639bcf48503 100644
GIT binary patch
delta 4515
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
F{{iMQCyxLC

delta 4241
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
AYybcN


From bcd628e6729d7fe35a27c1ce07deb463590b2a0f Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 5 Jan 2015 23:10:24 +0200
Subject: [PATCH 5/6] Beurocracy

Adds the ability to print forms from the request console, and to print
them. Lays the groundwork for things to move over into adding more paper
shenanigans.
---
 code/game/machinery/requests_console.dm | 125 +++++++++++++++++++++++-
 code/modules/paperwork/paperbin.dm      |  26 ++---
 2 files changed, 138 insertions(+), 13 deletions(-)

diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 641a2e77..05e12878 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -40,6 +40,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		// 8 = view messages
 		// 9 = authentication before sending
 		// 10 = send announcement
+		// 11 = form database
 	var/silent = 0 // set to 1 for it not to beep all the time
 //	var/hackState = 0
 		// 0 = not hacked
@@ -54,6 +55,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 	var/message = "";
 	var/dpt = ""; //the department which will be receiving the message
 	var/priority = -1 ; //Priority of the message being sent
+	var/SQLquery
+	var/paperstock = 10
+	var/lid = 0
 	luminosity = 0
 
 /obj/machinery/requests_console/power_change()
@@ -187,6 +191,38 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 					dat += text("<A href='?src=\ref[src];sendAnnouncement=1'>Announce</A><BR>");
 				dat += text("<BR><A href='?src=\ref[src];setScreen=0'>Back</A><BR>")
 
+			if(11)	//form database
+				dat += text("<B>NanoTrasen Corporate Forms</B><br><br>")
+
+				establish_db_connection()
+
+				if(!dbcon.IsConnected())
+					dat += text("<font color=red><b>ERROR</b>: Unable to contact external database. Please contact your system administrator for assistance.</font>")
+				else
+					dat += {"<table border='1'>
+					<tr><th>NCF ID</th><th>Form Name</th><td></td><td></td></tr>"}
+
+					//For reference:
+					//Command forms, 	01xx series
+					//Security forms,	02xx series
+					//Medical forms,	03xx series
+					//Engineer forms,	04xx series
+					//Science forms,	05xx series
+					//Supply forms,		06xx series
+					//General forms,	10xx series
+
+					var/DBQuery/query = dbcon.NewQuery(SQLquery)
+					query.Execute()
+
+					while(query.NextRow())
+						var/id = query.item[1]
+						var/name = query.item[2]
+						var/department = query.item[3]
+						dat += "<tr><td>NCF-[id]</td><td>[name]</td><td><a href='?src=\ref[src];sort=[department]'>[department]</a></td><td><a href='?src=\ref[src];print=[id]'>Print</a></td></tr>"
+					dat += "</table>"
+					dat += text("<br><A href='?src=\ref[src];setScreen=11'>Reset Search</a>")
+				dat += text("<BR><A href='?src=\ref[src];setScreen=0'>Back</A><BR>")
+
 			else	//main menu
 				screen = 0
 				announceAuth = 0
@@ -198,13 +234,22 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 
 				dat += text("<A href='?src=\ref[src];setScreen=1'>Request Assistance</A><BR>")
 				dat += text("<A href='?src=\ref[src];setScreen=2'>Request Supplies</A><BR>")
-				dat += text("<A href='?src=\ref[src];setScreen=3'>Relay Anonymous Information</A><BR><BR>")
+				dat += text("<A href='?src=\ref[src];setScreen=3'>Relay Anonymous Information</A><BR>")
+				dat += text("<A href='?src=\ref[src];setScreen=11'>NanoTrasen Corporate Form Database</A><BR><BR>")
 				if(announcementConsole)
 					dat += text("<A href='?src=\ref[src];setScreen=10'>Send station-wide announcement</A><BR><BR>")
 				if (silent)
 					dat += text("Speaker <A href='?src=\ref[src];setSilent=0'>OFF</A>")
 				else
 					dat += text("Speaker <A href='?src=\ref[src];setSilent=1'>ON</A>")
+				if(paperstock)
+					dat += text("<br>[paperstock] papers in stock.")
+				else
+					dat += text("<br><font color = red>No paper in stock.</font>")
+				if(lid)
+					dat += text("<br>Paper container lid <A href='?src=\ref[src];setLid=0'>OPEN</A>.")
+				else
+					dat += text("<br>Paper container lid <A href='?src=\ref[src];setLid=1'>CLOSE</A>.")
 
 		user << browse("[dat]", "window=request_console")
 		onclose(user, "req_console")
@@ -314,6 +359,57 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 				for (var/mob/O in hearers(4, src.loc))
 					O.show_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"))
 
+	if(href_list["sort"])
+		var/sortdep = sanitizeSQL(href_list["sort"])
+		SQLquery += " WHERE department LIKE '%[sortdep]%'"
+		screen = 11
+
+	if(href_list["print"])
+		var/printid = sanitizeSQL(href_list["print"])
+		establish_db_connection()
+
+		if(!dbcon.IsConnected())
+			alert("Connection to the database lost. Aborting.")
+		var/DBQuery/query = dbcon.NewQuery("SELECT id, name, data FROM aurora_forms WHERE id=[printid]")
+		query.Execute()
+
+		while(query.NextRow())
+			var/id = query.item[1]
+			var/name = query.item[2]
+			var/data = query.item[3]
+			var/obj/item/weapon/paper/C = new(src.loc)
+
+			//Let's start the BB >> HTML conversion!
+
+			data = html_encode(data)
+			data = replacetext(data, "\n", "<BR>")
+
+			C.info += data
+			C.info = C.parsepencode(C.info)
+			C.updateinfolinks()
+			C.name = "NFC-[id] - [name]"
+
+/*	WIP, finish in a further update.
+
+	if(href_list["info"])
+		var/whatisname = sanitizeSQL(href_list["info"])
+		establish_db_connection()
+
+		if(!dbcon.IsConnected())
+			alert("Connection to the database lost. Aborting.")
+		var/DBQuery/query = dbcon.NewQuery("SELECT id, name, department, info FROM aurora_forms WHERE name=[whatisname]")
+		query.Execute()
+
+		while(query.NextRow())
+			var/id = query.item[1]
+			var/name = query.item[2]
+			var/department = query.item[3]
+			var/info = query.item[1]
+*/
+	switch( href_list["setLid"] )
+		if(null)	//skip
+		if("1")	lid = 1
+		else	lid = 0
 
 	//Handle screen switching
 	switch(text2num(href_list["setScreen"]))
@@ -339,6 +435,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 		if(10)		//send announcement
 			if(!announcementConsole)	return
 			screen = 10
+		if(11)		//form database
+			SQLquery = "SELECT id, name, department FROM aurora_forms"
+			screen = 11
 		else		//main menu
 			dpt = ""
 			msgVerified = ""
@@ -398,8 +497,25 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 			var/obj/item/weapon/stamp/T = O
 			msgStamped = text("<font color='blue'><b>Stamped with the [T.name]</b></font>")
 			updateUsrDialog()
+	if (istype(O, /obj/item/weapon/paper_bundle))
+		if(lid)					//More of that restocking business
+			var/obj/item/weapon/paper_bundle/C = O
+			paperstock += C.amount
+			user.drop_item(C)
+			del(C)
+			for (var/mob/U in hearers(4, src.loc))
+				U.show_message(text("\icon[src] *The Requests Console beeps: 'Paper added.'"))
+		else
+			user << "\blue I should open the lid to add more paper, or try faxing one paper at a time."
 	if (istype(O, /obj/item/weapon/paper))
-		if(screen == 0)
+		if(lid)					//Stocking them papers
+			var/obj/item/weapon/paper/C = O
+			user.drop_item(C)
+			del(C)
+			paperstock++
+			for (var/mob/U in hearers(4, src.loc))
+				U.show_message(text("\icon[src] *The Requests Console beeps: 'Paper added.'"))
+		else if(screen == 0)	//Faxing them papers
 			var/pass = 0
 			var/sendto = input("Select department.", "Send Fax", null, null) in allConsoles
 
@@ -411,6 +527,9 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 				var/sent = 0
 				for (var/obj/machinery/requests_console/Console in world)
 					if (Console == sendto)
+						if(Console.paperstock == 0)
+							alert("Error! Receiving console out of paper! Aborting!")
+							return
 						if(!sent)
 							sent = 1
 
@@ -446,10 +565,12 @@ var/list/obj/machinery/requests_console/allConsoles = list()
 						playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
 						for (var/mob/player in hearers(4, Console.loc))
 							player.show_message(text("\icon[Console] *The Requests Console beeps: 'Fax received'"))
+						Console.paperstock--
 
 				if(sent == 1)
 					user.show_message(text("\icon[src] *The Requests Console beeps: 'Message Sent.'"))
 
 			else
 				user.show_message(text("\icon[src] *The Requests Console beeps: 'NOTICE: No server detected!'"))
+
 	return
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 03c59d4a..d44e288e 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -70,17 +70,21 @@
 	return
 
 
-/obj/item/weapon/paper_bin/attackby(obj/item/weapon/paper/i as obj, mob/user as mob)
-	if(!istype(i))
-		return
-
-	user.drop_item()
-	i.loc = src
-	user << "<span class='notice'>You put [i] in [src].</span>"
-	papers.Add(i)
-	amount++
-
-
+/obj/item/weapon/paper_bin/attackby(obj/item/weapon/O as obj, mob/user as mob)
+	if(istype(O, /obj/item/weapon/paper))
+		var/obj/item/weapon/paper/i = O
+		user.drop_item()
+		i.loc = src
+		user << "<span class='notice'>You put [i] in [src].</span>"
+		papers.Add(i)
+		amount++
+/*	if(istype(O, /obj/item/weapon/paper_pack))	WIP written in.
+		var/obj/item/weapon/paper_bundle/j = O
+		user.drop_item()
+		amount += j.amount
+		user << "<span class='notice'>You add paper from [j] into [src].</span>"
+		del(j)
+*/
 /obj/item/weapon/paper_bin/examine()
 	set src in oview(1)
 

From c4d103d855f6e483d063d8f3832af22054aaf5b4 Mon Sep 17 00:00:00 2001
From: skull132 <erki.meinberg@gmail.com>
Date: Mon, 5 Jan 2015 23:10:36 +0200
Subject: [PATCH 6/6] Simple_animals cannot buckle

Read above.
---
 .../objects/structures/stool_bed_chair_nest/bed.dm   | 10 ++++++++++
 .../structures/stool_bed_chair_nest/chairs.dm        | 12 +++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 77a6e26b..2236ef4e 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -44,6 +44,16 @@
 
 /obj/structure/stool/bed/MouseDrop_T(mob/M as mob, mob/user as mob)
 	if(!istype(M)) return
+	if(istype(M, /mob/living/simple_animal))
+		if (M == user)
+			M.visible_message(\
+				"\blue [M.name] attempts to buckle in, but fails!",\
+				"You attempt to buckle yourself to [src], but find yourself unable to.")
+		else
+			M.visible_message(\
+				"\blue [user.name] tries to buckle [M.name] in to [src], but fails!",\
+				"You are buckled in to [src] by [user.name].")
+		return
 	buckle_mob(M, user)
 	return
 
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index 03f28188..4f53f880 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -70,6 +70,16 @@
 
 /obj/structure/stool/bed/chair/MouseDrop_T(mob/M as mob, mob/user as mob)
 	if(!istype(M)) return
+	if(istype(M, /mob/living/simple_animal))
+		if (M == user)
+			M.visible_message(\
+				"\blue [M.name] attempts to buckle in, but fails!",\
+				"You attempt to buckle yourself to [src], but find yourself unable to.")
+		else
+			M.visible_message(\
+				"\blue [user.name] tries to buckle [M.name] in to [src], but fails!",\
+				"You are buckled in to [src] by [user.name].")
+		return
 	buckle_mob(M, user)
 	return
 
@@ -153,7 +163,7 @@
 	if(propelled)
 		var/mob/living/occupant = buckled_mob
 		unbuckle()
-		
+
 		var/def_zone = ran_zone()
 		var/blocked = occupant.run_armor_check(def_zone, "melee")
 		occupant.throw_at(A, 3, propelled)