Merge pull request #1135 from Erthilo/master

Removed blood regen due to errors, bug fixing, adds a way to temporarily allow people Taj/Sog, custom items, changelog credits list!

code/modules/admin/admin.dm

@@ -1267,6 +1267,33 @@ var/global/BSACooldown = 0
 		else
 			alert("You cannot perform this action. You must be of a higher administrative rank!")
 			return
+
+	if (href_list["granttaj"])
+		if (src.level>=5)
+			var/mob/M = locate(href_list["granttaj"])
+			for (var/s in alien_whitelist)
+				if(findtext(s,"[M.ckey] - Tajaran"))
+					alert("This key is already on the whitelist!", null, null, null, null, null)
+					return
+			alien_whitelist += "[M.ckey] - Tajaran"
+			usr << "[M.ckey] added to Tajaran whitelist."
+		else
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
+
+	if (href_list["grantsog"])
+		if (src.level>=5)
+			var/mob/M = locate(href_list["grantsog"])
+			for (var/s in alien_whitelist)
+				if(findtext(s,"[M.ckey] - Soghun"))
+					alert("This key is already on the whitelist!", null, null, null, null, null)
+					return
+			alien_whitelist += "[M.ckey] - Soghun"
+			usr << "[M.ckey] added to Soghun whitelist."
+		else
+			alert("You cannot perform this action. You must be of a higher administrative rank!")
+			return
+
 /***************** BEFORE**************
 
 	if (href_list["l_players"])
@@ -2473,6 +2500,8 @@ var/global/BSACooldown = 0
 		body += "<A href='?src=\ref[src];tdome2=\ref[M]'>Thunderdome 2</A> | "
 		body += "<A href='?src=\ref[src];tdomeadmin=\ref[M]'>Thunderdome Admin</A> | "
 		body += "<A href='?src=\ref[src];tdomeobserve=\ref[M]'>Thunderdome Observer</A> | "
+		body += "<A href='?src=\ref[src];granttaj=\ref[M]'>Grant Tajaran (Temp)</A> | "
+		body += "<A href='?src=\ref[src];grantsog=\ref[M]'>Grant Soghun (Temp)</A> | "
 
 	body += "<br>"
 	body += "</body></html>"

code/modules/chemical/Chemistry-Reagents.dm

@@ -1818,9 +1818,9 @@ datum
 						M:confused += 2
 						M:drowsyness += 2
 					if(2 to 50)
-						M:sleeping += 1
+						M:sleeping += 5
 					if(51 to INFINITY)
-						M:sleeping += 1
+						M:sleeping += 5
 						M:adjustToxLoss(2)
 				..()
 				return

code/modules/customitems/item_defines.dm

@@ -238,6 +238,13 @@
 	item_state = "olddressuniform"
 	color = "olddressuniform"
 
+/obj/item/clothing/under/rank/security/fluff/jeremy_wolf_1 //whitewolf41: Jeremy Wolf
+	name = "worn officer's uniform"
+	desc = "An old red security jumpsuit. Seems to have some slight modifications."
+	icon = 'custom_items.dmi'
+	icon_state = "jeremy_wolf_1"
+	color = "jeremy_wolf_1"
+
 //////////// Masks ////////////
 
 /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell

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

@@ -915,6 +915,7 @@
 				var/blood_volume = round(vessel.get_reagent_amount("blood"))
 				if(bloodloss)
 					drip(bloodloss)
+/*   //Causing too many runtimes, sorry Sky.
 				else if(blood_volume < 560 && blood_volume)
 					var/datum/reagent/blood/B = locate() in vessel //Grab some blood
 					if(!B.data["donor"] == src) //If it's not theirs, then we look for theirs
@@ -924,6 +925,7 @@
 								break
 					//At this point, we dun care which blood we are adding to, as long as they get more blood.
 					B.volume = max(min(B.volume + 560/blood_volume,560), 0) //Less blood = More blood generated per tick
+*/
 				if(!blood_volume)
 					bloodloss = 0
 				else if(blood_volume > 448)
@@ -959,18 +961,6 @@
 
 			if(getOxyLoss() > 50) Paralyse(3)
 
-			if(sleeping)
-				adjustHalLoss(-5)
-				if(paralysis <= 0)
-					Paralyse(2)
-				if (prob(10) && health && !hal_crit) spawn(0) emote("snore")
-				if(!src.sleeping_willingly)
-					src.sleeping--
-
-			if(resting)
-				if(weakened <= 0)
-					Weaken(2)
-
 			if(health < config.health_threshold_dead || brain_op_stage == 4.0)
 				death()
 			else if(health < config.health_threshold_crit)
@@ -990,7 +980,6 @@
 					if (stunned > 0)
 						AdjustStunned(-1)
 						stat = 0
-
 					if (weakened > 0)
 						AdjustWeakened(-1)
 						lying = 1
@@ -1282,7 +1271,9 @@
 						nutrition_icon.icon_state = "nutrition3"
 					else
 						nutrition_icon.icon_state = "nutrition4"
+
 			if (pressure)
+
 				if(istype(wear_suit, /obj/item/clothing/suit/space)||istype(wear_suit, /obj/item/clothing/suit/armor/captain))
 					pressure.icon_state = "pressure0"
 

code/modules/mob/screen.dm

@@ -614,9 +614,14 @@
 	set category = "IC"
 
 	if(usr.sleeping && usr.sleeping_willingly)
+		usr << "\blue You start to wake up..."
 		usr.sleeping = 0
 		usr.sleeping_willingly = 0
+	else if(usr.sleeping)
+		usr << "\red You feel unable to wake up..."
+		return
 	else if(!usr.sleeping)
+		usr << "\blue You start to fall asleep..."
 		usr.sleeping = 20 //Short nap
 		usr.sleeping_willingly = 1
 

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

@@ -52,6 +52,7 @@
 /obj/item/weapon/gun/projectile/shotgun/pump/combat
 	name = "combat shotgun"
 	icon_state = "cshotgun"
+	item_state = "cshotgun"
 	max_shells = 8
 	origin_tech = "combat=5;materials=2"
 	ammo_type = "/obj/item/ammo_casing/shotgun"
@@ -120,6 +121,7 @@
 				return
 			if(do_after(user, 30))	//SHIT IS STEALTHY EYYYYY
 				icon_state = "sawnshotgun"
+				item_state = "sawnshotgun"
 				w_class = 3.0
 				item_state = "gun"
 				flags &= ~ONBACK	//you can't sling it on your back