Merge pull request #3439 from Aroliacue/aro_medbelts

[READY TO MERGE] Medical Improvements

code/__defines/items_clothing.dm

@@ -14,9 +14,7 @@
 	/obj/item/ammo_magazine/m6d,\
 	/obj/item/ammo_magazine/m6s,\
 	/obj/item/projectile/bullet/covenant/needles,\
-	/obj/item/weapon/storage/firstaid/unsc,\
-	/obj/item/weapon/storage/firstaid/erk,\
-	/obj/item/weapon/storage/firstaid/combat/unsc,\
+	/obj/item/weapon/storage/firstaid,\
 	/obj/item/device/healthanalyzer,\
 	/obj/item/weapon/reagent_containers/dropper,\
 	/obj/item/weapon/reagent_containers/glass/beaker,\
@@ -31,7 +29,8 @@
 	/obj/item/clothing/head/surgery,\
 	/obj/item/clothing/gloves/latex,\
 	/obj/item/weapon/reagent_containers/hypospray,\
-	/obj/item/clothing/glasses/hud/health\
+	/obj/item/clothing/glasses/hud/health,\
+	/obj/item/weapon/defibrillator/compact\
 	)
 
 #define AMMO_BELT_CANHOLD list(\

code/game/machinery/Sleeper.dm

@@ -8,7 +8,7 @@
 	clicksound = 'sound/machines/buttonbeep.ogg'
 	clickvol = 30
 	var/mob/living/carbon/human/occupant = null
-	var/list/available_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Soporific" = /datum/reagent/soporific, "Paracetamol" = /datum/reagent/paracetamol, "Dylovene" = /datum/reagent/dylovene, "Dexalin" = /datum/reagent/dexalin)
+	var/list/available_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Bicaridine" = /datum/reagent/bicaridine, "Dermaline" = /datum/reagent/dermaline, "Tramadol" = /datum/reagent/tramadol, "Dylovene" = /datum/reagent/dylovene, "Dexalin" = /datum/reagent/dexalin)
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
 	var/filtering = 0
 	var/pump

code/game/objects/items/stacks/medical.dm

@@ -2,7 +2,7 @@
 	name = "medical pack"
 	singular_name = "medical pack"
 	icon = 'icons/obj/items.dmi'
-	amount = 20
+	amount = 40
 	max_amount = 40
 	w_class = ITEM_SIZE_SMALL
 	throw_speed = 4
@@ -144,7 +144,7 @@
 	desc = "An advanced trauma kit for severe injuries."
 	icon_state = "traumakit"
 	heal_brute = 0
-	amount = 10
+	amount = 40
 	origin_tech = list(TECH_BIO = 1)
 	animal_heal = 12
 
@@ -197,7 +197,7 @@
 	desc = "An advanced treatment kit for severe burns."
 	icon_state = "burnkit"
 	heal_burn = 0
-	amount = 10
+	amount = 40
 	origin_tech = list(TECH_BIO = 1)
 	animal_heal = 7
 

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

@@ -23,6 +23,7 @@
 	max_storage_space = DEFAULT_BACKPACK_STORAGE
 	use_dynamic_slowdown = 1
 	cant_hold = list(/obj/item/weapon/gun)
+	dynamic_storage_threshold = 8
 
 /obj/item/weapon/storage/backpack/equipped()
 	if(!has_extension(src, /datum/extension/appearance))

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

@@ -81,16 +81,16 @@
 
 /obj/item/weapon/storage/firstaid/adv
 	name = "advanced first-aid kit"
-	desc = "Contains advanced medical treatments."
+	desc = "Contains equipment for treating extensive physical trauma."
 	icon_state = "advfirstaid"
 	item_state = "firstaid-advanced"
 
 	startswith = list(
-		/obj/item/weapon/reagent_containers/hypospray/autoinjector,
 		/obj/item/stack/medical/advanced/bruise_pack = 2,
 		/obj/item/stack/medical/advanced/ointment = 2,
 		/obj/item/stack/medical/splint,
-		/obj/item/weapon/storage/pill_bottle/paracetamol
+		/obj/item/weapon/storage/pill_bottle/bicaridine,
+		/obj/item/weapon/storage/pill_bottle/dermaline
 		)
 
 /obj/item/weapon/storage/firstaid/combat

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

@@ -4,7 +4,6 @@
 // Do not remove this functionality without good reason, cough reagent_containers cough.
 // -Sayu
 
-
 /obj/item/weapon/storage
 	name = "storage"
 	icon = 'icons/obj/storage.dmi'
@@ -28,6 +27,7 @@
 	var/list/startswith
 	var/datum/storage_ui/storage_ui = /datum/storage_ui/default
 	var/use_dynamic_slowdown = 1
+	var/dynamic_storage_threshold = 2 // This is the amount of normal-sized items that you can carry before slowdown kicks in.
 
 /obj/item/weapon/storage/Destroy()
 	QDEL_NULL(storage_ui)
@@ -49,7 +49,7 @@
 			slowdown_total += base_storage_cost(A.w_class) * STORAGE_SLOWDOWN_MOD
 		inv -= A
 
-	var/min_threshold_slowdown = (base_storage_cost(ITEM_SIZE_NORMAL) * STORAGE_SLOWDOWN_MOD) * 2 //2 normals.
+	var/min_threshold_slowdown = (base_storage_cost(ITEM_SIZE_NORMAL) * (STORAGE_SLOWDOWN_MOD) * dynamic_storage_threshold) //Dynamic variable settable in specific items.
 	if(slowdown_total <= min_threshold_slowdown)
 		slowdown_total = 0
 	else

code/modules/halo/clothing/jumpsuits.dm

@@ -10,6 +10,7 @@
 	icon_state = "unscgrey"
 	item_state = "unscgrey"
 	worn_state = "unsc_grey"
+	species_restricted = list("Human", "Orion")
 	item_icons = list(
 		slot_l_hand_str = null,
 		slot_r_hand_str = null,

code/modules/halo/clothing/marine.dm

@@ -101,6 +101,7 @@
 	icon_override = MARINE_OVERRIDE
 	item_state = "M52B Body Armor regular"
 	icon_state = "M52B Body Armor regular_obj"
+	species_restricted = list("Human", "Orion")
 	blood_overlay_type = "armor"
 	item_state_slots = list(slot_l_hand_str = "armor", slot_r_hand_str = "armor")
 	body_parts_covered = ARMS|UPPER_TORSO|LOWER_TORSO
@@ -190,22 +191,21 @@
 
 /obj/item/weapon/storage/belt/marine_medic
 	name = "Medical Supplies Storage Belt"
-	desc = "A belt with multiple hooks to hold medical kits, alongside a few small ammunition pouches"
+	desc = "A belt with multiple hooks to hold medical kits. Heavy, but distributes the weight of larger loads much more efficiently."
 	icon_state = "medicalbelt"
 	w_class = ITEM_SIZE_HUGE
 	/*icon = ITEM_INHAND //Using normal medical belt sprites for now.
 	icon_override = MARINE_OVERRIDE
 	icon_state = "UNSC Marine Medical Belt item"
 	item_state = "UNSC Marine Medical Belt"*/
 	storage_slots = 5
+	dynamic_storage_threshold = 12
 
 	can_hold = list(\
 	/obj/item/ammo_magazine/m7,
 	/obj/item/ammo_magazine/m6d,
 	/obj/item/ammo_magazine/m6s,
-	/obj/item/weapon/storage/firstaid/unsc,
-	/obj/item/weapon/storage/firstaid/erk,
-	/obj/item/weapon/storage/firstaid/combat/unsc,
+	/obj/item/weapon/storage/firstaid,
 	/obj/item/device/healthanalyzer,
 	/obj/item/weapon/reagent_containers/dropper,
 	/obj/item/weapon/reagent_containers/glass/beaker,
@@ -220,7 +220,8 @@
 	/obj/item/clothing/head/surgery,
 	/obj/item/clothing/gloves/latex,
 	/obj/item/weapon/reagent_containers/hypospray,
-	/obj/item/clothing/glasses/hud/health
+	/obj/item/clothing/glasses/hud/health,
+	/obj/item/weapon/defibrillator/compact
 	)
 
 /obj/item/clothing/mask/marine

code/modules/halo/clothing/odst.dm

@@ -52,6 +52,7 @@
 	icon = ITEM_INHAND
 	icon_state = "Odst Armour"
 	icon_override = ODST_OVERRIDE
+	species_restricted = list("Human", "Orion")
 	blood_overlay_type = "armor"
 	armor = list(melee = 55, bullet = 50, laser = 55, energy = 45, bomb = 40, bio = 25, rad = 25)
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/device/radio,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/handcuffs,/obj/item/weapon/gun/magnetic,/obj/item/weapon/tank)

code/modules/halo/covenant/items/ammo_belt.dm

@@ -18,7 +18,7 @@
 /obj/item/weapon/storage/belt/covenant_medic
 	name = "Covenant Medical Belt"
 
-	desc = "A belt with many holders for medical kits, with a few small ammunition pouches"
+	desc = "A belt with multiple hooks to hold medical kits. Heavy, but distributes the weight of larger loads much more efficiently."
 	icon = 'tools.dmi'
 	item_state = "securitybelt"
 	color = "#ff99ff"
@@ -28,6 +28,7 @@
 		"Sangheili" = null\
 		)
 	storage_slots = 5
+	dynamic_storage_threshold = 12
 
 	can_hold = MEDIC_BELT_CANHOLD
 

code/modules/halo/covenant/structures_machines/covvendors.dm

@@ -353,7 +353,7 @@
 		/obj/item/weapon/plastique/breaching/covenant = 4,
 		/obj/item/weapon/plastique/breaching/longrange/covenant = 4,
 		/obj/item/clothing/accessory/storage/IFAK/cov = 20,
-		/obj/item/weapon/storage/firstaid/unsc/cov = 6, 
+		/obj/item/weapon/storage/firstaid/unsc/cov = 6,
 		/obj/item/weapon/pinpointer/artifact = 2
 	)
 
@@ -566,12 +566,14 @@
 	"Utility" = -1,
 	/obj/item/bodybag/cryobag/covenant = 3,
 	/obj/item/device/healthanalyzer/covenant = 10,
+	/obj/item/weapon/defibrillator/compact/combat/loaded = 3,
 	"Medkits" = -1,
 	/obj/item/weapon/storage/firstaid/unsc/cov = 10,
-	/obj/item/weapon/storage/firstaid/fire/covenant = 2,
-	/obj/item/weapon/storage/firstaid/o2/covenant = 4,
-	/obj/item/weapon/storage/firstaid/toxin/covenant = 4,
-	/obj/item/weapon/storage/firstaid/erk/cov = 4,
+	/obj/item/weapon/storage/firstaid/fire/covenant = 3,
+	/obj/item/weapon/storage/firstaid/o2/covenant = 3,
+	/obj/item/weapon/storage/firstaid/toxin/covenant = 3,
+	/obj/item/weapon/storage/firstaid/erk/cov = 3,
+	/obj/item/weapon/storage/firstaid/surgery/covenant = 3,
 	/obj/item/weapon/storage/firstaid/combat/unsc/cov = 7,
 	/obj/item/weapon/storage/firstaid/adv = 7,
 	"Pill Bottles" = -1,

code/modules/halo/machinery/gunvendors.dm

@@ -621,12 +621,14 @@
 					"Utility" = -1,
 					/obj/item/bodybag/cryobag = 3,
 					/obj/item/device/healthanalyzer = 10,
+					/obj/item/weapon/defibrillator/compact/combat/loaded = 3,
 					"Medkits" = -1,
 					/obj/item/weapon/storage/firstaid/unsc = 10,
-					/obj/item/weapon/storage/firstaid/fire = 2,
-					/obj/item/weapon/storage/firstaid/o2 = 4,
-					/obj/item/weapon/storage/firstaid/toxin = 4,
-					/obj/item/weapon/storage/firstaid/erk = 4,
+					/obj/item/weapon/storage/firstaid/fire = 3,
+					/obj/item/weapon/storage/firstaid/o2 = 3,
+					/obj/item/weapon/storage/firstaid/toxin = 3,
+					/obj/item/weapon/storage/firstaid/erk = 3,
+					/obj/item/weapon/storage/firstaid/surgery = 3,
 					/obj/item/weapon/storage/firstaid/combat/unsc = 7,
 					/obj/item/weapon/storage/firstaid/adv = 7,
 					"Pill Bottles" = -1,
@@ -647,4 +649,4 @@
 
 /obj/machinery/vending/armory/medical/innie
 	name = "Insurrectionist Medical Vendor"
-	req_access = list(access_innie)
+	req_access = list(access_innie)