Merge pull request #1768 from CIB/master

Bleeding fixes

baystation12.dme

@@ -500,6 +500,7 @@
 #include "code\game\machinery\hologram.dm"
 #include "code\game\machinery\hydroponics.dm"
 #include "code\game\machinery\igniter.dm"
+#include "code\game\machinery\iv_drip.dm"
 #include "code\game\machinery\lightswitch.dm"
 #include "code\game\machinery\machinery.dm"
 #include "code\game\machinery\magnet.dm"
@@ -962,10 +963,10 @@
 #include "code\modules\critters\critter_defenses.dm"
 #include "code\modules\critters\critters.dm"
 #include "code\modules\critters\hivebots\hivebot.dm"
-#include "code\modules\DetectiveWork\detective_work.dm"
-#include "code\modules\DetectiveWork\evidence.dm"
-#include "code\modules\DetectiveWork\footprints_and_rag.dm"
-#include "code\modules\DetectiveWork\scanner.dm"
+#include "code\modules\detectivework\detective_work.dm"
+#include "code\modules\detectivework\evidence.dm"
+#include "code\modules\detectivework\footprints_and_rag.dm"
+#include "code\modules\detectivework\scanner.dm"
 #include "code\modules\flufftext\Dreaming.dm"
 #include "code\modules\flufftext\Hallucination.dm"
 #include "code\modules\flufftext\TextFilters.dm"
@@ -1235,6 +1236,7 @@
 #include "code\modules\reagents\reagent_containers.dm"
 #include "code\modules\reagents\reagent_dispenser.dm"
 #include "code\modules\reagents\syringe_gun.dm"
+#include "code\modules\reagents\reagent_containers\blood_pack.dm"
 #include "code\modules\reagents\reagent_containers\borghydro.dm"
 #include "code\modules\reagents\reagent_containers\dropper.dm"
 #include "code\modules\reagents\reagent_containers\food.dm"

code/ATMOSPHERICS/pipes.dm

@@ -1028,6 +1028,29 @@ obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/u
 		return ..()
 	if (istype(src, /obj/machinery/atmospherics/pipe/vent))
 		return ..()
+
+	// ===== Handle paints =====
+	if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/red))
+		src.color = "red"
+		user << "\red You paint the pipe red."
+		update_icon()
+		return 1
+	if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/blue))
+		src.color = "blue"
+		user << "\red You paint the pipe blue."
+		update_icon()
+		return 1
+	if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/green))
+		src.color = "green"
+		user << "\red You paint the pipe green."
+		update_icon()
+		return 1
+	if(istype(W, /obj/item/weapon/reagent_containers/glass/paint/yellow))
+		src.color = "yellow"
+		user << "\red You paint the pipe yellow."
+		update_icon()
+		return 1
+    
 	if (!istype(W, /obj/item/weapon/wrench))
 		return ..()
 	var/turf/T = src.loc
@@ -1052,4 +1075,4 @@ obj/machinery/atmospherics/pipe/attackby(var/obj/item/weapon/W as obj, var/mob/u
 			if (meter.target == src)
 				new /obj/item/pipe_meter(T)
 				del(meter)
-		del(src)
+		del(src)

code/datums/organs/wound.dm

@@ -34,6 +34,10 @@
 	// number of wounds of this type
 	var/tmp/amount = 1
 
+	// maximum stage at which bleeding should still happen, counted from the right rather than the left of the list
+	// 1 means all stages except the last should bleed
+	var/max_bleeding_stage = 1
+
 	// helper lists
 	var/tmp/list/desc_list = list()
 	var/tmp/list/damage_list = list()
@@ -55,6 +59,10 @@
 		// this will ensure the size of the wound matches the damage
 		src.heal_damage(0)
 
+		// make the max_bleeding_stage count from the end of the list rather than the start
+		// this is more robust to changes to the list
+		max_bleeding_stage = src.desc_list.len - max_bleeding_stage
+
 	// returns 1 if there's a next stage, 0 otherwise
 	proc/next_stage()
 		if(current_stage + 1 > src.desc_list.len)
@@ -106,29 +114,35 @@
 		src.min_damage = damage_list[current_stage]
 
 	proc/bleeding()
-		return (!bandaged && (damage_type == BRUISE && damage >= 20 || damage_type == CUT))
+		return (!bandaged && (damage_type == BRUISE && damage >= 20 || damage_type == CUT) && current_stage <= max_bleeding_stage)
 
 /** CUTS **/
 /datum/wound/cut
 	// link wound descriptions to amounts of damage
+	max_bleeding_stage = 2
 	stages = list("ugly ripped cut" = 20, "ripped cut" = 10, "cut" = 5, "healing cut" = 2, "small scab" = 0)
 
 /datum/wound/deep_cut
+	max_bleeding_stage = 3
 	stages = list("ugly deep ripped cut" = 25, "deep ripped cut" = 20, "deep cut" = 15, "clotted cut" = 8, "scab" = 2, "fresh skin" = 0)
 
 /datum/wound/flesh_wound
+	max_bleeding_stage = 3
 	stages = list("ugly ripped flesh wound" = 35, "ugly flesh wound" = 30, "flesh wound" = 25, "blood soaked clot" = 15, "large scab" = 5, "fresh skin" = 0)
 
 /datum/wound/gaping_wound
+	max_bleeding_stage = 2
 	stages = list("gaping wound" = 50, "large blood soaked clot" = 25, "large clot" = 15, "small angry scar" = 5, \
 	               "small straight scar" = 0)
 
 /datum/wound/big_gaping_wound
+	max_bleeding_stage = 2
 	stages = list("big gaping wound" = 60, "healing gaping wound" = 40, "large angry scar" = 10, "large straight scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged
 
 /datum/wound/massive_wound
+	max_bleeding_stage = 2
 	stages = list("massive wound" = 70, "massive healing wound" = 50, "massive angry scar" = 10,  "massive jagged scar" = 0)
 
 	needs_treatment = 1 // this only heals when bandaged

code/game/machinery/iv_drip.dm

@@ -0,0 +1,92 @@
+/obj/machinery/iv_drip
+	name = "\improper IV drip"
+	icon = 'icons/obj/iv_drip.dmi'
+	anchored = 0
+	density = 1
+
+/obj/machinery/iv_drip/var/mob/living/carbon/human/attached = null
+/obj/machinery/iv_drip/var/obj/item/weapon/reagent_containers/beaker = null
+
+/obj/machinery/iv_drip/update_icon()
+	if(src.attached)
+		icon_state = "hooked"
+	else
+		icon_state = ""
+
+	overlays = null
+
+	if(beaker)
+		var/datum/reagents/reagents = beaker.reagents
+		if(reagents.total_volume)
+			var/image/filling = image('icons/obj/iv_drip.dmi', src, "reagent")
+
+			var/percent = round((reagents.total_volume / beaker.volume) * 100)
+			switch(percent)
+				if(0 to 9)		filling.icon_state = "reagent0"
+				if(10 to 24) 	filling.icon_state = "reagent10"
+				if(25 to 49)	filling.icon_state = "reagent25"
+				if(50 to 74)	filling.icon_state = "reagent50"
+				if(75 to 79)	filling.icon_state = "reagent75"
+				if(80 to 90)	filling.icon_state = "reagent80"
+				if(91 to INFINITY)	filling.icon_state = "reagent100"
+
+			filling.icon += mix_color_from_reagents(reagents.reagent_list)
+			overlays += filling
+
+/obj/machinery/iv_drip/MouseDrop(over_object, src_location, over_location)
+	..()
+
+	if(attached)
+		visible_message("[src.attached] is detached from \the [src]")
+		src.attached = null
+		src.update_icon()
+		return
+
+	if(in_range(src, usr) && ishuman(over_object) && get_dist(over_object, src) <= 1)
+		visible_message("[usr] attaches \the [src] to \the [over_object].")
+		src.attached = over_object
+		src.update_icon()
+
+
+/obj/machinery/iv_drip/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/reagent_containers))
+		if(!isnull(src.beaker))
+			user << "There is already a reagent container loaded!"
+			return
+
+		user.drop_item()
+		W.loc = src
+		src.beaker = W
+		user << "You attach \the [W] to \the [src]."
+		src.update_icon()
+		return
+	else
+		return ..()
+
+
+/obj/machinery/iv_drip/process()
+	set background = 1
+
+	..()
+	if(src.attached && src.beaker && src.beaker.volume > 0)
+		if(!(get_dist(src, src.attached) <= 1))
+			visible_message("The needle is ripped out of [src.attached], doesn't that hurt?")
+			src.attached:apply_damage(3, BRUTE, pick("r_arm", "l_arm"))
+			src.attached = null
+			src.update_icon()
+			return
+
+		var/transfer_amount = REAGENTS_METABOLISM
+		if(istype(src.beaker, /obj/item/weapon/reagent_containers/blood))
+			// speed up transfer on blood packs
+			transfer_amount = 4
+		src.beaker.reagents.trans_to(src.attached, transfer_amount)
+		update_icon()
+
+/obj/machinery/iv_drip/attack_hand(mob/user as mob)
+	if(src.beaker)
+		src.beaker.loc = get_turf(src)
+		src.beaker = null
+		update_icon()
+	else
+		return ..()

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

@@ -109,7 +109,7 @@ MASS SPECTROMETER
 		user.show_message("\blue Localized Damage, Brute/Burn:",1)
 		if(length(damaged)>0)
 			for(var/datum/organ/external/org in damaged)
-				user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+				user.show_message(text("\blue \t []: []\blue-[][]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0, (org.status & ORGAN_BLEEDING)?"\red (bleeding)":""),1)
 		else
 			user.show_message("\blue \t Limbs are OK.",1)
 

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

@@ -190,7 +190,7 @@
 				if(!(temp.status & ORGAN_BLEEDING) || temp.status & ORGAN_ROBOT)
 					continue
 				for(var/datum/wound/W in temp.wounds) if(W.bleeding())
-					blood_max += W.damage / 2
+					blood_max += W.damage / 4
 				if(temp.status & ORGAN_DESTROYED && !(temp.status & ORGAN_GAUZED))
 					blood_max += 20 //Yer missing a fucking limb.
 			drip(blood_max)

code/modules/reagents/reagent_containers/blood_pack.dm

@@ -0,0 +1,36 @@
+/obj/item/weapon/reagent_containers/blood
+	name = "BloodPack"
+	desc = "Contains blood used for transfusion."
+	icon = 'icons/obj/bloodpack.dmi'
+	volume = 200
+
+	var/blood_type = null
+
+	New()
+		..()
+		if(blood_type != null)
+			name = "BloodPack [blood_type]"
+			reagents.add_reagent("blood", 200, list("donor"=null,"viruses"=null,"blood_DNA"=null,"blood_type"=blood_type,"resistances"=null,"trace_chem"=null))
+
+/obj/item/weapon/reagent_containers/blood/APlus
+	blood_type = "A+"
+
+/obj/item/weapon/reagent_containers/blood/AMinus
+	blood_type = "A-"
+
+/obj/item/weapon/reagent_containers/blood/BPlus
+	blood_type = "B+"
+
+/obj/item/weapon/reagent_containers/blood/BMinus
+	blood_type = "B-"
+
+/obj/item/weapon/reagent_containers/blood/OPlus
+	blood_type = "O+"
+
+/obj/item/weapon/reagent_containers/blood/OMinus
+	blood_type = "O-"
+
+/obj/item/weapon/reagent_containers/blood/empty
+	name = "Empty BloodPack"
+	desc = "Seems pretty useless... Maybe if there were a way to fill it?"
+	icon_state = "empty"

code/modules/reagents/reagent_containers/glass.dm

@@ -26,7 +26,8 @@
 		/obj/machinery/bot/medbot,
 		/obj/machinery/computer/pandemic,
 		/obj/item/weapon/secstorage/ssafe,
-		/obj/machinery/disposal
+		/obj/machinery/disposal,
+        /obj/machinery/iv_drip
 	)
 
 	examine()
@@ -222,4 +223,4 @@
 		..()
 		reagents.add_reagent("fluorosurfactant", 20)
 
-*/
+*/

config/admins.txt

@@ -23,4 +23,4 @@ spaceman96 - Retired Admin
 strumpetplaya - Retired Admin
 tastyfish - Retired Admin
 uristqwerty - Game Master
-wrongnumber - Game Admin
+wrongnumber - Game Admin

config/moderators.txt

@@ -3,7 +3,6 @@
 asanadas
 botanistpower
 bowlsoldier
-chinsky
 cubejackal
 dakonic
 densane
@@ -17,5 +16,6 @@ roaper
 searif
 sparklysheep
 themij
+chinsky
 ; Why u no keep list in alphabetical order?! Lazies! Lazies! -Abi
-; Imma best alphabetiser - Erthilo
+; Imma best alphabetiser - Erthilo