Merge remote-tracking branch 'upstream/master' into tgui4.0-and-camera-console

code/game/objects/items/devices/defib.dm

@@ -332,14 +332,14 @@
 	if(!heart)
 		return TRUE
 
-	var/blood_volume = round((H.vessel.get_reagent_amount("blood")/H.species.blood_volume)*100)
+	var/blood_volume = H.vessel.get_reagent_amount("blood")
 	if(!heart || heart.is_broken())
 		blood_volume *= 0.3
 	else if(heart.is_bruised())
 		blood_volume *= 0.7
 	else if(heart.damage > 1)
 		blood_volume *= 0.8
-	return blood_volume < BLOOD_VOLUME_SURVIVE
+	return blood_volume < H.species.blood_volume*H.species.blood_level_fatal
 
 /obj/item/weapon/shockpaddles/proc/check_charge(var/charge_amt)
 	return 0

code/game/objects/items/devices/scanners.dm

@@ -130,10 +130,10 @@ HALOGEN COUNTER	- Radcount on mobs
 			for(var/A in C.reagents.reagent_list)
 				var/datum/reagent/R = A
 				if(R.scannable)
-					reagentdata["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span><br>"
+					reagentdata["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 				else
 					unknown++
-					unknownreagents["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name]</span><br>"
+					unknownreagents["[R.id]"] = "<span class='notice'>\t[round(C.reagents.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 			if(reagentdata.len)
 				dat += "<span class='notice'>Beneficial reagents detected in subject's blood:</span><br>"
 				for(var/d in reagentdata)
@@ -150,14 +150,14 @@ HALOGEN COUNTER	- Radcount on mobs
 			var/stomachreagentdata[0]
 			var/stomachunknownreagents[0]
 			for(var/B in C.ingested.reagent_list)
-				var/datum/reagent/T = B
-				if(T.scannable)
-					stomachreagentdata["[T.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
+				var/datum/reagent/R = B
+				if(R.scannable)
+					stomachreagentdata["[R.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 					if (advscan == 0 || showadvscan == 0)
-						dat += "<span class='notice'>[T.name] found in subject's stomach.</span><br>"
+						dat += "<span class='notice'>[R.name] found in subject's stomach.</span><br>"
 				else
 					++unknown
-					stomachunknownreagents["[T.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
+					stomachunknownreagents["[R.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 			if(advscan >= 1 && showadvscan == 1)
 				dat += "<span class='notice'>Beneficial reagents detected in subject's stomach:</span><br>"
 				for(var/d in stomachreagentdata)
@@ -174,14 +174,14 @@ HALOGEN COUNTER	- Radcount on mobs
 			var/touchreagentdata[0]
 			var/touchunknownreagents[0]
 			for(var/B in C.touching.reagent_list)
-				var/datum/reagent/T = B
-				if(T.scannable)
-					touchreagentdata["[T.id]"] = "<span class='notice'>\t[round(C.touching.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
+				var/datum/reagent/R = B
+				if(R.scannable)
+					touchreagentdata["[R.id]"] = "<span class='notice'>\t[round(C.touching.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 					if (advscan == 0 || showadvscan == 0)
-						dat += "<span class='notice'>[T.name] found in subject's dermis.</span><br>"
+						dat += "<span class='notice'>[R.name] found in subject's dermis.</span><br>"
 				else
 					++unknown
-					touchunknownreagents["[T.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(T.id), 1)]u [T.name]</span><br>"
+					touchunknownreagents["[R.id]"] = "<span class='notice'>\t[round(C.ingested.get_reagent_amount(R.id), 1)]u [R.name][(R.overdose && R.can_overdose_touch && R.volume > R.overdose) ? " - <span class='danger'>Overdose</span>" : ""]</span><br>"
 			if(advscan >= 1 && showadvscan == 1)
 				dat += "<span class='notice'>Beneficial reagents detected in subject's dermis:</span><br>"
 				for(var/d in touchreagentdata)
@@ -266,9 +266,11 @@ HALOGEN COUNTER	- Radcount on mobs
 			var/blood_volume = H.vessel.get_reagent_amount("blood")
 			var/blood_percent =  round((blood_volume / H.species.blood_volume)*100)
 			var/blood_type = H.dna.b_type
-			if(blood_percent <= BLOOD_VOLUME_BAD)
+			if(blood_volume <= H.species.blood_volume*H.species.blood_level_danger)
 				dat += "<span class='danger'><i>Warning: Blood Level CRITICAL: [blood_percent]% [blood_volume]cl. Type: [blood_type]</i></span><br>"
-			else if(blood_percent <= BLOOD_VOLUME_SAFE)
+			else if(blood_volume <= H.species.blood_volume*H.species.blood_level_warning)
+				dat += "<span class='danger'><i>Warning: Blood Level VERY LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]</i></span><br>"
+			else if(blood_volume <= H.species.blood_volume*H.species.blood_level_safe)
 				dat += "<span class='danger'>Warning: Blood Level LOW: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span><br>"
 			else
 				dat += "<span class='notice'>Blood Level Normal: [blood_percent]% [blood_volume]cl. Type: [blood_type]</span><br>"

code/game/objects/items/glassjar.dm

@@ -1,3 +1,9 @@
+
+#define JAR_NOTHING 0
+#define JAR_MONEY   1
+#define JAR_ANIMAL  2
+#define JAR_SPIDER  3
+
 /obj/item/glass_jar
 	name = "glass jar"
 	desc = "A small empty jar."
@@ -27,7 +33,7 @@
 		var/mob/L = A
 		user.visible_message("<span class='notice'>[user] scoops [L] into \the [src].</span>", "<span class='notice'>You scoop [L] into \the [src].</span>")
 		L.loc = src
-		contains = 2
+		contains = JAR_ANIMAL
 		update_icon()
 		return
 	else if(istype(A, /obj/effect/spider/spiderling))
@@ -35,40 +41,40 @@
 		user.visible_message("<span class='notice'>[user] scoops [S] into \the [src].</span>", "<span class='notice'>You scoop [S] into \the [src].</span>")
 		S.loc = src
 		STOP_PROCESSING(SSobj, S) // No growing inside jars
-		contains = 3
+		contains = JAR_SPIDER
 		update_icon()
 		return
 
 /obj/item/glass_jar/attack_self(var/mob/user)
 	switch(contains)
-		if(1)
+		if(JAR_MONEY)
 			for(var/obj/O in src)
 				O.loc = user.loc
 			to_chat(user, "<span class='notice'>You take money out of \the [src].</span>")
-			contains = 0
+			contains = JAR_NOTHING
 			update_icon()
 			return
-		if(2)
+		if(JAR_ANIMAL)
 			for(var/mob/M in src)
 				M.loc = user.loc
 				user.visible_message("<span class='notice'>[user] releases [M] from \the [src].</span>", "<span class='notice'>You release [M] from \the [src].</span>")
-			contains = 0
+			contains = JAR_NOTHING
 			update_icon()
 			return
-		if(3)
+		if(JAR_SPIDER)
 			for(var/obj/effect/spider/spiderling/S in src)
 				S.loc = user.loc
 				user.visible_message("<span class='notice'>[user] releases [S] from \the [src].</span>", "<span class='notice'>You release [S] from \the [src].</span>")
 				START_PROCESSING(SSobj, S) // They can grow after being let out though
-			contains = 0
+			contains = JAR_NOTHING
 			update_icon()
 			return
 
 /obj/item/glass_jar/attackby(var/obj/item/W, var/mob/user)
 	if(istype(W, /obj/item/weapon/spacecash))
-		if(contains == 0)
-			contains = 1
-		if(contains != 1)
+		if(contains == JAR_NOTHING)
+			contains = JAR_MONEY
+		if(contains != JAR_MONEY)
 			return
 		var/obj/item/weapon/spacecash/S = W
 		user.visible_message("<span class='notice'>[user] puts [S.worth] [S.worth > 1 ? "thalers" : "thaler"] into \the [src].</span>")
@@ -80,10 +86,10 @@
 	underlays.Cut()
 	overlays.Cut()
 	switch(contains)
-		if(0)
+		if(JAR_NOTHING)
 			name = initial(name)
 			desc = initial(desc)
-		if(1)
+		if(JAR_MONEY)
 			name = "tip jar"
 			desc = "A small jar with money inside."
 			for(var/obj/item/weapon/spacecash/S in src)
@@ -92,7 +98,7 @@
 				money.pixel_y = rand(-6, 6)
 				money.transform *= 0.6
 				underlays += money
-		if(2)
+		if(JAR_ANIMAL)
 			for(var/mob/M in src)
 				var/image/victim = image(M.icon, M.icon_state)
 				victim.pixel_y = 6
@@ -105,10 +111,109 @@
 				underlays += victim
 				name = "glass jar with [M]"
 				desc = "A small jar with [M] inside."
-		if(3)
+		if(JAR_SPIDER)
 			for(var/obj/effect/spider/spiderling/S in src)
 				var/image/victim = image(S.icon, S.icon_state)
 				underlays += victim
 				name = "glass jar with [S]"
 				desc = "A small jar with [S] inside."
-	return
+	return
+
+/obj/item/glass_jar/fish
+	name = "glass tank"
+	desc = "A large glass tank."
+
+	var/filled = FALSE
+
+	w_class = ITEMSIZE_NORMAL
+
+	accept_mobs = list(/mob/living/simple_mob/animal/passive/lizard, /mob/living/simple_mob/animal/passive/mouse, /mob/living/simple_mob/animal/sif/leech, /mob/living/simple_mob/animal/sif/frostfly, /mob/living/simple_mob/animal/sif/glitterfly, /mob/living/simple_mob/animal/passive/fish)
+
+/obj/item/glass_jar/fish/plastic
+	name = "plastic tank"
+	desc = "A large plastic tank."
+	matter = list("plastic" = 4000)
+
+/obj/item/glass_jar/fish/update_icon() // Also updates name and desc
+	underlays.Cut()
+	overlays.Cut()
+
+	if(filled)
+		underlays += image(icon, "[icon_state]_water")
+
+	switch(contains)
+		if(JAR_NOTHING)
+			name = initial(name)
+			desc = initial(desc)
+		if(JAR_MONEY)
+			name = "tip tank"
+			desc = "A large [name] with money inside."
+			for(var/obj/item/weapon/spacecash/S in src)
+				var/image/money = image(S.icon, S.icon_state)
+				money.pixel_x = rand(-2, 3)
+				money.pixel_y = rand(-6, 6)
+				money.transform *= 0.6
+				underlays += money
+		if(JAR_ANIMAL)
+			for(var/mob/M in src)
+				var/image/victim = image(M.icon, M.icon_state)
+				var/initial_x_scale = M.icon_scale_x
+				var/initial_y_scale = M.icon_scale_y
+				M.adjust_scale(0.7)
+				victim.appearance = M.appearance
+				M.adjust_scale(initial_x_scale, initial_y_scale)
+				victim.pixel_y = 4
+				underlays += victim
+				name = "[name] with [M]"
+				desc = "A large [name] with [M] inside."
+		if(JAR_SPIDER)
+			for(var/obj/effect/spider/spiderling/S in src)
+				var/image/victim = image(S.icon, S.icon_state)
+				underlays += victim
+				name = "[name] with [S]"
+				desc = "A large tank with [S] inside."
+
+	if(filled)
+		desc = "[desc] It contains water."
+
+	return
+
+/obj/item/glass_jar/fish/afterattack(var/atom/A, var/mob/user, var/proximity)
+	if(!filled)
+		if(istype(A, /obj/structure/sink) || istype(A, /turf/simulated/floor/water))
+			if(contains && user.a_intent == "help")
+				to_chat(user, "<span class='warning'>That probably isn't the best idea.</span>")
+				return
+
+			to_chat(user, "<span class='notice'>You fill \the [src] with water!</span>")
+			filled = TRUE
+			update_icon()
+			return
+
+	return ..()
+
+/obj/item/glass_jar/fish/attack_self(var/mob/user)
+	if(filled)
+		if(contains == JAR_ANIMAL)
+			if(user.a_intent == "help")
+				to_chat(user, "<span class='notice'>Maybe you shouldn't empty the water...</span>")
+				return
+
+			else
+				filled = FALSE
+				user.visible_message("<span class='warning'>[user] dumps out \the [src]'s water!</span>")
+				update_icon()
+				return
+
+		else
+			user.visible_message("<span class='notice'>[user] dumps \the [src]'s water.</span>")
+			filled = FALSE
+			update_icon()
+			return
+
+	return ..()
+
+#undef JAR_NOTHING
+#undef JAR_MONEY
+#undef JAR_ANIMAL
+#undef JAR_SPIDER

code/game/objects/items/toys.dm

@@ -425,6 +425,15 @@
 			return
 	..()
 
+/obj/random/mech_toy
+	name = "Random Mech Toy"
+	desc = "This is a random mech toy."
+	icon = 'icons/obj/toy.dmi'
+	icon_state = "ripleytoy"
+
+/obj/random/mech_toy/item_to_spawn()
+	return pick(typesof(/obj/item/toy/prize))
+
 /obj/item/toy/prize/ripley
 	name = "toy ripley"
 	desc = "Mini-Mecha action figure! Collect them all! 1/11."

code/game/objects/items/weapons/storage/boxes.dm

@@ -198,6 +198,16 @@
 /obj/item/weapon/storage/box/empshells/large
 	starts_with = list(/obj/item/ammo_casing/a12g/emp = 16)
 
+/obj/item/weapon/storage/box/flechetteshells
+	name = "box of shotgun flechettes"
+	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."
+	icon_state = "lethalslug_box"
+	item_state_slots = list(slot_r_hand_str = "syringe_kit", slot_l_hand_str = "syringe_kit")
+	starts_with = list(/obj/item/ammo_casing/a12g/flechette = 8)
+
+/obj/item/weapon/storage/box/flechetteshells/large
+	starts_with = list(/obj/item/ammo_casing/a12g/flechette = 16)
+
 /obj/item/weapon/storage/box/sniperammo
 	name = "box of 14.5mm shells"
 	desc = "It has a picture of a gun and several warning symbols on the front.<br>WARNING: Live ammunition. Misuse may result in serious injury or death."

code/game/objects/items/weapons/storage/wallets.dm

@@ -63,7 +63,7 @@
 	overlays.Cut()
 	if(front_id)
 		var/tiny_state = "id-generic"
-		if("id-"+front_id.icon_state in icon_states(icon))
+		if("id-"+front_id.icon_state in cached_icon_states(icon))
 			tiny_state = "id-"+front_id.icon_state
 		var/image/tiny_image = new/image(icon, icon_state = tiny_state)
 		tiny_image.appearance_flags = RESET_COLOR