[SPECIES][PARTIALLY-MODULAR] Nabbers, Nabber systems, Blood Colours, Offset System, Stungloves, and more!

code/__DEFINES/mobs.dm

@@ -126,11 +126,6 @@
 #define SPECIES_ZOMBIE "zombie"
 #define SPECIES_ZOMBIE_INFECTIOUS "memezombie"
 #define SPECIES_ZOMBIE_KROKODIL "krokodil_zombie"
-#define SPECIES_OOZELING "oozeling"
-#define SPECIES_IPC "ipc"
-#define SPECIES_SIMIAN "simian" //Monkestation Addition
-#define SPECIES_GOBLIN "goblin" //Monkestation Addition
-#define SPECIES_FLORAN "floran" //Monkestation Addition
 // Like species IDs, but not specifically attached a species.
 #define BODYPART_ID_ALIEN "alien"
 #define BODYPART_ID_ROBOTIC "robotic"

code/__DEFINES/research/anomalies.dm

@@ -28,12 +28,14 @@ GLOBAL_LIST_INIT(bioscrambler_parts_blacklist, typecacheof(list(
 )))
 
 /// Blacklist of limb IDs which should not appear when bioscrambled, mostly because they looks awful and buggy.
+/* - Moved to Monkeystation Defines file. Because apparently it was never considered we may modularise species code.
 GLOBAL_LIST_INIT(bioscrambler_limb_id_blacklist, list(
 	BODYPART_ID_PSYKER,
 	SPECIES_SIMIAN,
 	SPECIES_MONKEY,
 	SPECIES_GOBLIN
 ))
+*/
 
 /// Blacklist of organs which should not appear when bioscrambled.
 /// Either will look terrible outside of intended host, give you magical powers, are irreversible, or kill you

code/__DEFINES/~monkestation/mobs.dm

@@ -1,5 +1,13 @@
+//Monkeystation Species Defines. Please update this here instead of /tg/stations mobs.dm \\
+
 #define SPECIES_ARACHNIDS "arachnid"
 #define SPECIES_DRACONIC_SKELETON "draconic_skeleton"
+#define SPECIES_OOZELING "oozeling"
+#define SPECIES_IPC "ipc"
+#define SPECIES_SIMIAN "simian"
+#define SPECIES_GOBLIN "goblin"
+#define SPECIES_FLORAN "floran"
+#define SPECIES_NABBER "nabber"
 
 GLOBAL_REAL_VAR(list/voice_type2sound = list(
 	"1" = list(

code/__byond_version_compat.dm

@@ -9,7 +9,6 @@
 #error You need version 515.1627 or higher
 #endif
 
-
 // Keep savefile compatibilty at minimum supported level
 /savefile/byond_version = MIN_COMPILER_VERSION
 

code/_onclick/hud/hud.dm

@@ -221,6 +221,7 @@ GLOBAL_LIST_INIT(available_ui_styles, list(
 	action_intent = null
 	zone_select = null
 	pull_icon = null
+	rest_icon = null //MONKEYSTATION FIX: FIXES HARDDEL
 
 	QDEL_LIST(toggleable_inventory)
 	QDEL_LIST(hotkeybuttons)

code/_onclick/hud/screen_objects.dm

@@ -310,6 +310,10 @@
 		flashy.color = "#C62727"
 	. += flashy
 
+/atom/movable/screen/combattoggle/flashy/Destroy()
+	. = ..()
+	QDEL_NULL(flashy) //Monkeystation Edit - Absolutely make sure these things avoid harddels
+
 /atom/movable/screen/combattoggle/robot
 	icon = 'icons/hud/screen_cyborg.dmi'
 	screen_loc = ui_borg_intents

code/datums/components/bloodysoles.dm

@@ -23,6 +23,9 @@
 
 	var/footprint_sprite = FOOTPRINT_SPRITE_SHOES
 
+	//Monkeystation edit. Holds colors.
+	var/blood_color
+
 /datum/component/bloodysoles/Initialize()
 	if(!isclothing(parent))
 		return COMPONENT_INCOMPATIBLE
@@ -92,7 +95,7 @@
 
 	set_bloody_shoes(pool.blood_state, new_our_bloodiness)
 	pool.bloodiness = total_bloodiness - new_our_bloodiness // Give the pool the remaining blood incase we were limited
-
+	blood_color = pool.color //Monkeystation Edit.
 	if(HAS_TRAIT(parent_atom, TRAIT_LIGHT_STEP)) //the character is agile enough to don't mess their clothing and hands just from one blood splatter at floor
 		return TRUE
 
@@ -184,6 +187,7 @@
 				oldLocFP.bloodiness = half_our_blood
 				oldLocFP.add_blood_DNA(GET_ATOM_BLOOD_DNA(parent_atom))
 				oldLocFP.update_appearance()
+				oldLocFP.color = blood_color //Monkeystation Edit. Blood color for footprints.
 
 			half_our_blood = bloody_shoes[last_blood_state] / 2
 
@@ -197,6 +201,7 @@
 		update_icon()
 
 		var/obj/effect/decal/cleanable/blood/footprints/FP = new(get_turf(parent_atom), footprint_sprite)
+		FP.color = blood_color //Monkeystation edit.
 		if(!QDELETED(FP)) ///prints merged
 			FP.blood_state = last_blood_state
 			FP.entered_dirs |= wielder.dir

code/datums/interactions/combat_mode.dm

@@ -1,6 +1,7 @@
 /datum/interaction_mode/combat_mode
 	shift_to_open_context_menu = TRUE
 	var/combat_mode = FALSE
+	var/held_hud //Monkeystation Edit. Ensures the HUD is tracked to prevent harddels
 
 /datum/interaction_mode/combat_mode/update_istate(mob/M, modifiers)
 	M.istate = NONE
@@ -19,6 +20,7 @@
 	if (!M.hud_used.has_interaction_ui)
 		return
 	var/atom/movable/screen/combattoggle/flashy/CT = new
+	held_hud = CT //Monkeystation Edit. Keep track of this HUD for future destruction.
 	CT.hud = H
 	CT.icon = H.ui_style
 	CT.combat_mode = src

code/game/objects/effects/decals/cleanable/humans.dm

@@ -49,7 +49,7 @@
 		name = dryname
 		desc = drydesc
 		bloodiness = 0
-		color = COLOR_GRAY //not all blood splatters have their own sprites... It still looks pretty nice
+		color = "#6b0000" //Monkeystation edit. Fallback for blood drying.
 		STOP_PROCESSING(SSobj, src)
 		return TRUE
 
@@ -365,6 +365,8 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 	var/splatter_strength = 3
 	/// Insurance so that we don't keep moving once we hit a stoppoint
 	var/hit_endpoint = FALSE
+	/// Monkeystation Edit: Ensures these retain proper colour variables, and that even in the worst case, the blood is still red.
+	var/held_color = "#b60a0a"
 
 /obj/effect/decal/cleanable/blood/hitsplatter/Initialize(mapload, splatter_strength)
 	. = ..()
@@ -376,7 +378,8 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 	if(isturf(loc) && !skip)
 		playsound(src, 'sound/effects/wounds/splatter.ogg', 60, TRUE, -1)
 		if(blood_dna_info)
-			loc.add_blood_DNA(blood_dna_info)
+			var/turf/land = loc
+			land.add_blood_DNA_special(blood_dna_info, colour = held_color) //Monkeystation edit. Preserves blood colour.
 	return ..()
 
 /// Set the splatter up to fly through the air until it rounds out of steam or hits something
@@ -439,6 +442,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 			land_on_window(bumped_atom)
 		else
 			var/obj/effect/decal/cleanable/blood/splatter/over_window/final_splatter = new(prev_loc)
+			final_splatter.color = held_color //Monkeystation Edit: Keeps blood color consistent!
 			final_splatter.pixel_x = (dir == EAST ? 32 : (dir == WEST ? -32 : 0))
 			final_splatter.pixel_y = (dir == NORTH ? 32 : (dir == SOUTH ? -32 : 0))
 	else // This will only happen if prev_loc is not even a turf, which is highly unlikely.
@@ -451,6 +455,7 @@ GLOBAL_LIST_EMPTY(bloody_footprints_cache)
 		return
 	var/obj/effect/decal/cleanable/blood/splatter/over_window/final_splatter = new
 	final_splatter.forceMove(the_window)
+	final_splatter.color = src.color //Monkeystation Edit: Keeps blood color consistent!
 	the_window.vis_contents += final_splatter
 	the_window.bloodied = TRUE
 	qdel(src)

code/modules/client/preferences.dm

@@ -373,6 +373,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 /atom/movable/screen/map_view/char_preview/Destroy()
 	QDEL_NULL(body)
+	body = null //Monkeystation edit. Absolutely ensure this qdels.
 	preferences?.character_preview_view = null
 	preferences = null
 	return ..()

code/modules/mob/living/blood.dm

@@ -335,7 +335,6 @@
 	var/datum/reagent/blood_type = get_blood_id()
 	var/list/temp_blood_DNA
 	if(small_drip)
-
 		if(T.liquids)
 			var/list/blood_drop = list(get_blood_id() = 0.1)
 			T.add_liquid_list(blood_drop, FALSE, 300)
@@ -347,15 +346,15 @@
 				T.pollute_turf(/datum/pollutant/metallic_scent, 5)
 				drop.drips++
 				drop.add_overlay(pick(drop.random_icon_states))
-				drop.transfer_mob_blood_dna(src)
+				drop.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours. Also makes blood splatters now transfer DNA! Forensics buff!
 				return
 			else
 				temp_blood_DNA = GET_ATOM_BLOOD_DNA(drop) //we transfer the dna from the drip to the splatter
 				qdel(drop)//the drip is replaced by a bigger splatter
 		else
 			T.pollute_turf(/datum/pollutant/metallic_scent, 5)
 			drop = new(T, get_static_viruses())
-			drop.transfer_mob_blood_dna(src)
+			drop.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours. Also makes blood splatters now transfer DNA! Forensics buff!
 			return
 
 	// Create a bit of metallic pollution, as that's how blood smells
@@ -365,19 +364,20 @@
 	var/obj/effect/decal/cleanable/blood/B = locate() in T
 	if(!B)
 		B = new /obj/effect/decal/cleanable/blood/splatter(T, get_static_viruses())
+		B.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours. Also makes blood splatters now transfer DNA! Forensics buff!
 	if(QDELETED(B)) //Give it up
 		return
 	B.bloodiness = min((B.bloodiness + BLOOD_AMOUNT_PER_DECAL), BLOOD_POOL_MAX)
-	B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
+	B.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours
 	if(temp_blood_DNA)
 		B.add_blood_DNA(temp_blood_DNA)
 
 	if(B.count < 10 )
 		if(blood_type)
 			B.color = initial(blood_type.color)
 		B.count ++
-		B.transfer_mob_blood_dna(src)
-	B.transfer_mob_blood_dna(src) //give blood info to the blood decal.
+		B.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours. Also makes blood splatters now transfer DNA! Forensics buff!
+	B.transfer_mob_blood_dna(src, TRUE) //MONKEY EDIT: , TRUE append to allow for custom blood colours
 	if(temp_blood_DNA)
 		B.add_blood_DNA(temp_blood_DNA)
 

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

@@ -1353,8 +1353,12 @@
 	var/obj/effect/decal/cleanable/blood/hitsplatter/our_splatter = new(loc)
 	our_splatter.add_blood_DNA(GET_ATOM_BLOOD_DNA(src))
 	our_splatter.blood_dna_info = get_blood_dna_list()
+	our_splatter.transfer_mob_blood_dna(src, TRUE) //Monkeystation Edit: Makes it so blood sprays also inherit blood colour changes
 	var/turf/targ = get_ranged_target_turf(src, splatter_direction, splatter_strength)
 	our_splatter.fly_towards(targ, splatter_strength)
+	if(ishuman(src)) //Monkeystation Edit: Ensures that no matter what, splatters will hold the color of blood in question.
+		var/mob/living/carbon/human/blood_donor = src
+		our_splatter.held_color = blood_donor.dna.species.blood_colours
 
 /mob/living/carbon/ominous_nosebleed()
 	var/obj/item/bodypart/head = get_bodypart(BODY_ZONE_HEAD)

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

@@ -1000,4 +1000,22 @@ generate/load female uniform sprites matching all previously decided variables
 
 	return appearance
 
+//MONKEYSTATION EDIT - ENSURES FILTERS ARE CUT UPON BEING DESTROYED \\
+
+/mob/living/carbon/human/proc/get_filter_and_destroy(filtername) //Using this is way neater code-wise.
+	var/filter = src.get_filter(filtername)
+	if(filter)
+		remove_filter(filter)
+
+/mob/living/carbon/human/Destroy() //Ensure all filters are cut on destroy. Hopefully prevents harddels due to height.
+	. = ..()
+	src.get_filter_and_destroy("Gnome_Cut_Torso")
+	src.get_filter_and_destroy("Gnome_Cut_Legs")
+	src.get_filter_and_destroy("Cut_Torso")
+	src.get_filter_and_destroy("Cut_Legs")
+	src.get_filter_and_destroy("Lenghten_Legs")
+	src.get_filter_and_destroy("Lenghten_Torso")
+
+//MONKEYSTATION EDIT END\\
+
 #undef RESOLVE_ICON_STATE

code/modules/mob/living/living.dm

@@ -1050,7 +1050,7 @@
 		if((!(newdir in TH.existing_dirs) || trail_type == "trails_1" || trail_type == "trails_2") && TH.existing_dirs.len <= 16) //maximum amount of overlays is 16 (all light & heavy directions filled)
 			TH.existing_dirs += newdir
 			TH.add_overlay(image('icons/effects/blood.dmi', trail_type, dir = newdir))
-			TH.transfer_mob_blood_dna(src)
+			TH.transfer_mob_blood_dna(src, TRUE) //Monkeystation Edit: Ensures blood color and DNA is successfully transferred to new blood.
 
 /mob/living/carbon/human/makeTrail(turf/T)
 	if(HAS_TRAIT(src, TRAIT_NOBLOOD) || !is_bleeding() || HAS_TRAIT(src, TRAIT_NOBLOOD))

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -108,6 +108,7 @@
 	var/obj/effect/decal/cleanable/blood/bloodsplatter = locate() in exposed_turf //find some blood here
 	if(!bloodsplatter)
 		bloodsplatter = new(exposed_turf, data["viruses"])
+		bloodsplatter.color = "#b60a0a" //Monkeystation Edit: Ensures splattered blood will always be red.
 	else if(LAZYLEN(data["viruses"]))
 		var/list/viri_to_add = list()
 		for(var/datum/disease/virus in data["viruses"])

code/modules/research/techweb/all_nodes.dm

@@ -1542,8 +1542,7 @@
 		"pepperspray",
 		"seclite",
 		"zipties",
-		"inspector",
-		"rubber_c35", //monkestation edit: taco sec
+		"inspector"
 	)
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
 

monkestation/code/__DEFINES/bodytypes.dm

@@ -0,0 +1,2 @@
+//Can likely be moved elsewhere. This will handle limbs that absolutely SHOULD NOT go on other species under any circumstances.
+#define BODYSHAPE_CUSTOM (1<<9)

monkestation/code/__DEFINES/nabber.dm

@@ -0,0 +1,14 @@
+//Handles nabber-related code
+#define OFFSET_HELD "held" //handles the fact they have weird grab positions. Can be used for other species.
+
+#define NABBER_ACCESSORIES_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/accessories.dmi'
+#define NABBER_BACK_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/back.dmi'
+#define NABBER_BELT_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/belt.dmi'
+#define NABBER_EYES_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/eyes.dmi'
+#define NABBER_HANDS_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/hands.dmi'
+#define NABBER_HEAD_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/head.dmi'
+#define NABBER_MASK_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/mask.dmi'
+#define NABBER_NECK_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/neck.dmi'
+#define NABBER_SUIT_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/suit.dmi'
+#define NABBER_UNIFORM_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/uniform.dmi'
+#define NABBER_EARS_ICON 'monkestation/code/modules/nabbers/icons/mob/clothing/ears.dmi'

monkestation/code/__DEFINES/research/anomalies.dm

@@ -0,0 +1,7 @@
+/// Blacklist of limb IDs which should not appear when bioscrambled, mostly because they looks awful and buggy.
+GLOBAL_LIST_INIT(bioscrambler_limb_id_blacklist, list(
+	BODYPART_ID_PSYKER,
+	SPECIES_SIMIAN,
+	SPECIES_MONKEY,
+	SPECIES_GOBLIN
+))