Merge branch 'master' of https://github.com/ZomgPonies/Paradise

code/modules/mob/language.dm

@@ -56,7 +56,7 @@
 	desc = "The noise made by rubbing it's antennae together is actually a complex form of communication for Kidan."
 	speech_verb = "rubs it's antenna together"
 	colour = "tajaran"
-	key = "l"
+	key = "4"
 	flags = RESTRICTED
 
 /datum/language/slime
@@ -76,7 +76,7 @@
 /datum/language/trinary
 	name = "Trinary"
 	desc = "A modification of binary to allow fuzzy logic. 0 is no, 1 maybe, 2 yes. Credited with giving Machine People the ability to think creatively."
-	key = "l"
+	key = "t"
 	flags = RESTRICTED
 
 

code/modules/mob/living/carbon/alien/humanoid/life.dm

@@ -385,13 +385,13 @@
 			sight |= SEE_MOBS
 			sight |= SEE_OBJS
 			see_in_dark = 8
-			see_invisible = SEE_INVISIBLE_LEVEL_TWO
+			see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 		else if (stat != 2)
 			sight |= SEE_MOBS
 			sight &= ~SEE_TURFS
 			sight &= ~SEE_OBJS
 			see_in_dark = 4
-			see_invisible = SEE_INVISIBLE_LEVEL_TWO
+			see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 		if (healths)
 			if (stat != 2)

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

@@ -565,7 +565,10 @@
 
 /mob/living/carbon/human/Topic(href, href_list)
 	var/pickpocket = 0
+
 	if(!usr.stat && usr.canmove && !usr.restrained() && in_range(src, usr))
+
+		// if looting pockets with gloves, do it quietly
 		if(href_list["pockets"])
 			if(usr:gloves)
 				var/obj/item/clothing/gloves/G = usr:gloves
@@ -601,6 +604,47 @@
 				// Display a warning if the user mocks up
 				src << "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>"
 
+
+		// if looting id with gloves, do it quietly - this allows pickpocket gloves to take/place id stealthily - Bone White
+		if(href_list["item"])
+			var/itemTarget = href_list["item"]
+			if(itemTarget == "id")
+				if(usr:gloves)
+					var/obj/item/clothing/gloves/G = usr:gloves
+					pickpocket = G.pickpocket
+				if(pickpocket)
+					var/obj/item/worn_id = src.wear_id
+					var/obj/item/place_item = usr.get_active_hand() // Item to place in the pocket, if it's empty
+
+					if(worn_id)
+						usr << "<span class='notice'>You try to remove [src]'s ID.</span>"
+					else if(place_item && place_item.mob_can_equip(src, slot_wear_id, 1))
+						usr << "<span class='notice'>You try to place [place_item] onto [src].</span>"
+					else
+						return
+
+					if(do_mob(usr, src, STRIP_DELAY))
+						if(worn_id)
+							u_equip(worn_id)
+							usr.put_in_hands(worn_id)
+						else
+							if(place_item)
+								usr.u_equip(place_item)
+							equip_to_slot_if_possible(place_item, slot_wear_id, 0, 1)
+
+						// Update strip window
+						if(usr.machine == src && in_range(src, usr))
+							show_inv(usr)
+
+
+
+					else if(!pickpocket)
+						// Display a warning if the user mocks up
+						src << "<span class='warning'>You feel your ID slot being fumbled with!</span>"
+
+
+
+
 	if (href_list["refresh"])
 		if((machine)&&(in_range(src, usr)))
 			show_inv(machine)
@@ -615,17 +659,18 @@
 		if(ishuman(usr) && usr:gloves)
 			var/obj/item/clothing/gloves/G = usr:gloves
 			pickpocket = G.pickpocket
-		O.source = usr
-		O.target = src
-		O.item = usr.get_active_hand()
-		O.s_loc = usr.loc
-		O.t_loc = loc
-		O.place = href_list["item"]
-		O.pickpocket = pickpocket //Stealthy
-		requests += O
-		spawn( 0 )
-			O.process()
-			return
+		if(!pickpocket || href_list["item"] != "id")  // Stop the non-stealthy verbose strip if pickpocketing id.
+			O.source = usr
+			O.target = src
+			O.item = usr.get_active_hand()
+			O.s_loc = usr.loc
+			O.t_loc = loc
+			O.place = href_list["item"]
+			O.pickpocket = pickpocket //Stealthy
+			requests += O
+			spawn( 0 )
+				O.process()
+				return
 
 	if (href_list["criminal"])
 		if(hasHUD(usr,"security"))

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

@@ -1472,7 +1472,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 						see_invisible = SEE_INVISIBLE_LEVEL_ONE
 					if("shadow")
 						see_in_dark = 8
-						see_invisible = SEE_INVISIBLE_LEVEL_ONE
+						see_invisible = SEE_INVISIBLE_OBSERVER_NOLIGHTING
 
 			if(mind && mind.vampire)
 				if((VAMP_VISION in mind.vampire.powers) && !(VAMP_FULL in mind.vampire.powers))

code/modules/organs/organ_external.dm

@@ -393,8 +393,7 @@ This function completely restores a damaged organ to perfect condition.
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
 			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
-			var/inaprovaline = owner.reagents.get_reagent_amount("inaprovaline")
-			if(!bicardose || !inaprovaline)	//bicaridine and inaprovaline stop internal wounds from growing bigger with time, and also stop bleeding
+			if(!bicardose)	//bicaridine stop internal wounds from growing bigger with time, and also stop bleeding, inaprovaline only helps against the oxyloss from bloodloss, and does no direct healing
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 

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

@@ -56,8 +56,9 @@ obj/item/weapon/gun/energy/laser/retro
 	if(isrobot(src.loc))
 		var/mob/living/silicon/robot/R = src.loc
 		if(R && R.cell)
-			R.cell.use(100)
+			R.cell.use(500)
 			in_chamber = new/obj/item/projectile/beam(src)
+			fire_delay = 12
 			return 1
 	return 0