Added octopus modpack.

Author: MistakeNot4892

code/__defines/damage_organs.dm

@@ -77,6 +77,8 @@
 #define ORGAN_CATEGORY_STANCE      "stance"
 /// Limb is considered the 'root' of a given stance limb (leg) - also counted for stance damage a la ORGAN_CATEGORY_STANCE
 #define ORGAN_CATEGORY_STANCE_ROOT "stance_root"
+// Limb is considered a manipulator, currently only used when trying to pilot a wheelchair.
+#define ORGAN_CATEGORY_MANIPLE     "maniple"
 
 // Droplimb types.
 #define DISMEMBER_METHOD_EDGE  0

code/_helpers/global_lists.dm

@@ -37,12 +37,15 @@ var/global/list/string_slot_flags = list(
 )
 
 // Used to avoid constantly generating new lists during movement.
+var/global/list/all_maniple_limbs   = list(
+	(ORGAN_CATEGORY_MANIPLE)
+)
 var/global/list/all_stance_limbs   = list(
-	ORGAN_CATEGORY_STANCE,
-	ORGAN_CATEGORY_STANCE_ROOT
+	(ORGAN_CATEGORY_STANCE),
+	(ORGAN_CATEGORY_STANCE_ROOT)
 )
 var/global/list/child_stance_limbs = list(
-	ORGAN_CATEGORY_STANCE
+	(ORGAN_CATEGORY_STANCE)
 )
 
 // TODO: Replace keybinding datums with keybinding decls to make this unnecessary.

code/controllers/subsystems/jobs.dm

@@ -556,7 +556,7 @@ SUBSYSTEM_DEF(jobs)
 	if(job.req_admin_notify)
 		to_chat(H, "<b>You are playing a job that is important for Game Progression. If you have to disconnect, please notify the admins via adminhelp.</b>")
 
-	if(H.needs_wheelchair())
+	if(H.cannot_stand())
 		equip_wheelchair(H)
 
 	BITSET(H.hud_updateflag, ID_HUD)

code/modules/bodytype/_bodytype.dm

@@ -415,20 +415,19 @@ var/global/list/bodytypes_by_category = list()
 		var/list/organ_data = has_limbs[organ_tag]
 		var/obj/item/organ/organ = organ_data["path"]
 		organ_data["descriptor"] = initial(organ.name)
-		var/organ_cat = initial(organ.organ_category)
-		if(organ_cat)
+		for(var/organ_cat in cached_json_decode(initial(organ.organ_categories)))
 			LAZYINITLIST(_organs_by_category)
 			LAZYADD(_organs_by_category[organ_cat], organ)
 			LAZYINITLIST(_organ_tags_by_category)
 			LAZYADD(_organ_tags_by_category[organ_cat], organ_tag)
+
 		var/list/parent_organ_data = has_limbs[organ::parent_organ]
 		if(parent_organ_data)
 			parent_organ_data["has_children"]++
 
 	for(var/organ_tag in has_organ)
 		var/obj/item/organ/organ = has_organ[organ_tag]
-		var/organ_cat = initial(organ.organ_category)
-		if(organ_cat)
+		for(var/organ_cat in cached_json_decode(initial(organ.organ_categories)))
 			LAZYINITLIST(_organs_by_category)
 			LAZYADD(_organs_by_category[organ_cat], organ)
 			LAZYINITLIST(_organ_tags_by_category)

code/modules/mob/language/language.dm

@@ -5,7 +5,6 @@
 */
 
 /* Current unused keys, please update when you use one.
- * e
  * n
  * r
  * t

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

@@ -25,20 +25,25 @@
 	if(can_feel_pain() && get_shock() >= 10)
 		tally += (get_shock() / 10) //pain shouldn't slow you down if you can't even feel it
 
+	var/list/limbs_to_check
 	if(istype(buckled, /obj/structure/chair/wheelchair))
-		for(var/organ_name in list(BP_L_HAND, BP_R_HAND, BP_L_ARM, BP_R_ARM))
-			var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(src, organ_name)
-			tally += E ? E.get_movement_delay(4) : 4
-	else
 		for(var/obj/item/I in get_equipped_items(include_carried = TRUE))
 			var/slot = get_equipped_slot_for_item(I)
 			tally += LAZYACCESS(I.slowdown_per_slot, slot)
 			tally += I.slowdown_general
 			tally += I.slowdown_accessory
+		limbs_to_check = global.all_maniple_limbs
+	else
+		limbs_to_check = global.all_stance_limbs
 
-		for(var/organ_name in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT))
-			var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(src, organ_name)
-			tally += E ? E.get_movement_delay(4) : 4
+	var/missing_limbs = H ? H.bodytype.get_expected_organ_count_for_categories(limbs_to_check) : 4
+	if(missing_limbs > 0)
+		var/max_delay_per_limb = ceil(16/missing_limbs)
+		for(var/obj/item/organ/external/limb in get_organs_by_categories(limbs_to_check))
+			tally += limb.get_movement_delay(max_delay_per_limb)
+			missing_limbs--
+		if(missing_limbs > 0)
+			tally += missing_limbs * max_delay_per_limb
 
 	if(shock_stage >= 10 || get_stamina() <= 0)
 		tally += 3
@@ -96,6 +101,11 @@
 		handle_leg_damage()
 		species.handle_post_move(src)
 
+/mob/living/human/forceMove()
+	. = ..()
+	if(.)
+		species.handle_post_move(src, exertion = FALSE)
+
 /mob/living/human/proc/handle_leg_damage()
 	if(!can_feel_pain())
 		return

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

@@ -70,9 +70,10 @@
 		LAZYDISTINCTADD(external_organs, O)
 
 	// Update our organ category lists, if neeed.
-	if(O.organ_category)
-		LAZYINITLIST(organs_by_category)
-		LAZYDISTINCTADD(organs_by_category[O.organ_category], O)
+	if(O.organ_categories)
+		for(var/category in cached_json_decode(O.organ_categories))
+			LAZYINITLIST(organs_by_category)
+			LAZYDISTINCTADD(organs_by_category[category], O)
 
 	// Update stat organs as well
 	if(O.has_stat_info)
@@ -112,10 +113,11 @@
 		LAZYREMOVE(external_organs, O)
 
 	// Update our organ category lists, if neeed.
-	if(O.organ_category && islist(organs_by_category))
-		organs_by_category[O.organ_category] -= O
-		if(LAZYLEN(organs_by_category[O.organ_category]) <= 0)
-			LAZYREMOVE(organs_by_category, O.organ_category)
+	if(O.organ_categories && islist(organs_by_category))
+		for(var/category in cached_json_decode(O.organ_categories))
+			organs_by_category[category] -= O
+			if(LAZYLEN(organs_by_category[category]) <= 0)
+				LAZYREMOVE(organs_by_category, category)
 
 	// Update stat organs as well
 	if(O.has_stat_info && stat_organs)

code/modules/mob/living/living.dm

@@ -838,14 +838,6 @@ default behaviour is:
 		if(saturation > 0)
 			fluids.trans_to_holder(touching_reagents, saturation)
 
-/mob/living/proc/needs_wheelchair()
-	var/tmp_stance_damage = 0
-	for(var/limb_tag in list(BP_L_LEG, BP_R_LEG, BP_L_FOOT, BP_R_FOOT))
-		var/obj/item/organ/external/E = GET_EXTERNAL_ORGAN(src, limb_tag)
-		if(!E || !E.is_usable())
-			tmp_stance_damage += 2
-	return tmp_stance_damage >= 4
-
 /mob/living/proc/seizure()
 	set waitfor = 0
 	sleep(rand(5,10))

code/modules/organs/external/quadruped.dm

@@ -20,7 +20,7 @@
 	amputation_point = "front left knee"
 	tendon_name = "cruciate ligament"
 	artery_name = "femoral artery"
-	organ_category = ORGAN_CATEGORY_STANCE_ROOT
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE_ROOT + "']"
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
 
 /obj/item/organ/external/arm/right/quadruped
@@ -29,7 +29,7 @@
 	amputation_point = "front right knee"
 	tendon_name = "cruciate ligament"
 	artery_name = "femoral artery"
-	organ_category = ORGAN_CATEGORY_STANCE_ROOT
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE_ROOT + "']"
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
 
 /obj/item/organ/external/hand/quadruped
@@ -38,7 +38,7 @@
 	amputation_point = "front left ankle"
 	tendon_name = "Achilles tendon"
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
-	organ_category = ORGAN_CATEGORY_STANCE
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE + "']"
 	gripper_type = null
 
 /obj/item/organ/external/hand/right/quadruped
@@ -47,5 +47,5 @@
 	amputation_point = "front right ankle"
 	tendon_name = "Achilles tendon"
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
-	organ_category = ORGAN_CATEGORY_STANCE
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE + "']"
 	gripper_type = null

code/modules/organs/external/standard.dm

@@ -83,7 +83,7 @@
 	tendon_name = "cruciate ligament"
 	artery_name = "femoral artery"
 	arterial_bleed_severity = 0.75
-	organ_category = ORGAN_CATEGORY_STANCE_ROOT
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE_ROOT + "']"
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
 
 /obj/item/organ/external/leg/right
@@ -108,7 +108,7 @@
 	tendon_name = "Achilles tendon"
 	arterial_bleed_severity = 0.5
 	limb_flags = ORGAN_FLAG_CAN_AMPUTATE | ORGAN_FLAG_CAN_STAND | ORGAN_FLAG_HAS_TENDON | ORGAN_FLAG_CAN_BREAK | ORGAN_FLAG_CAN_DISLOCATE
-	organ_category = ORGAN_CATEGORY_STANCE
+	organ_categories = @"['" + ORGAN_CATEGORY_STANCE + "']"
 
 /obj/item/organ/external/foot/get_natural_attacks()
 	var/static/list/unarmed_attacks = list(