Uploading all files.

modular_citadel/code/modules/mob/cit_emotes.dm

@@ -0,0 +1,239 @@
+#define INSULTS_FILE "insult.json"
+
+/mob
+	var/nextsoundemote = 1
+
+//Disables the custom emote blacklist from TG that normally applies to slimes.
+/datum/emote/living/custom
+	mob_type_blacklist_typecache = list(/mob/living/brain)
+
+/datum/emote/living/insult
+	key = "insult"
+	key_third_person = "insults"
+	message = "spews insults."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/insult/run_emote(mob/living/user, params)
+	var/insult_message = ""
+	var/miming = user.mind ? user.mind.miming : 0
+	if(!user.is_muzzled())
+		insult_message += pick_list_replacements(INSULTS_FILE, "insult_gen")
+		message = insult_message
+	else if(miming)
+		message = "creatively gesticulates."
+	else
+		message = "muffles something."
+	. = ..()
+
+/datum/emote/living/scream/run_emote(mob/living/user, params) //I can't not port this shit, come on.
+	if(user.nextsoundemote >= world.time || user.stat != CONSCIOUS)
+		return
+	var/sound
+	var/miming = user.mind ? user.mind.miming : 0
+	if(!user.is_muzzled() && !miming)
+		user.nextsoundemote = world.time + 7
+		if(issilicon(user))
+			sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
+			if(iscyborg(user))
+				var/mob/living/silicon/robot/S = user
+				if(S.cell.charge < 20)
+					to_chat(S, "<span class='warning'>Scream module deactivated. Please recharge.</span>")
+					return
+				S.cell.use(200)
+		if(ismonkey(user))
+			sound = 'modular_citadel/sound/voice/scream_monkey.ogg'
+		if(istype(user, /mob/living/simple_animal/hostile/gorilla))
+			sound = 'sound/creatures/gorilla.ogg'
+		if(ishuman(user))
+			user.adjustOxyLoss(5)
+			sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
+			if(user.gender == FEMALE)
+				sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
+			if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc))
+				sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
+			if(is_species(user, /datum/species/lizard))
+				sound = 'modular_citadel/sound/voice/scream_lizard.ogg'
+			if(is_species(user, /datum/species/skeleton))
+				sound = 'modular_citadel/sound/voice/scream_skeleton.ogg'
+			if (is_species(user, /datum/species/fly) || is_species(user, /datum/species/insect))
+				sound = 'modular_citadel/sound/voice/scream_moth.ogg'
+		if(isalien(user))
+			sound = 'sound/voice/hiss6.ogg'
+		LAZYINITLIST(user.alternate_screams)
+		if(LAZYLEN(user.alternate_screams))
+			sound = pick(user.alternate_screams)
+		playsound(user.loc, sound, 50, 1, 4, 1.2)
+		message = "screams!"
+	else if(miming)
+		message = "acts out a scream."
+	else
+		message = "makes a very loud noise."
+	. = ..()
+
+/datum/emote/sound/carbon/snap
+	key = "snap"
+	key_third_person = "snaps"
+	muzzle_ignore = TRUE
+	restraint_check = TRUE
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/effects/snap01.ogg'
+	mob_type_allowed_typecache = list(/mob/living/carbon/)
+
+
+/datum/emote/living/snap
+	key = "snap"
+	key_third_person = "snaps"
+	message = "snaps their fingers."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/snap2
+	key = "snap2"
+	key_third_person = "snaps twice"
+	message = "snaps twice."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap2/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap2.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/snap3
+	key = "snap3"
+	key_third_person = "snaps thrice"
+	message = "snaps thrice."
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/snap3/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/snap3.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/awoo
+	key = "awoo"
+	key_third_person = "lets out an awoo"
+	message = "lets out an awoo!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/awoo/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/awoo.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/nya
+	key = "nya"
+	key_third_person = "lets out a nya"
+	message = "lets out a nya!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/nya/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/nya.ogg', 50, 1, -1)
+	. = ..()
+
+//h13 emote	*bleat
+
+/datum/emote/living/bleat
+	key = "bleat"
+	key_third_person = "bleats loudly"
+	message = "bleats loudly!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/bleat/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/bleat.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/weh
+	key = "weh"
+	key_third_person = "lets out a weh"
+	message = "lets out a weh!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/weh/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/weh.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/peep
+	key = "peep"
+	key_third_person = "peeps like a bird"
+	message = "peeps like a bird!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/peep/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/peep.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/dab
+	key = "dab"
+	key_third_person = "suddenly hits a dab"
+	message = "suddenly hits a dab!"
+	emote_type = EMOTE_AUDIBLE
+	restraint_check = TRUE
+
+//hs13
+/datum/emote/living/fingergun
+	key = "fingergun"
+	key_third_person = "uses their hand to mimic a handgun and points"
+	message = "uses their hand to mimic a handgun and points!"
+	emote_type = EMOTE_AUDIBLE
+	restraint_check = TRUE
+
+/datum/emote/living/mothsqueak
+	key = "msqueak"
+	key_third_person = "lets out a tiny squeak"
+	message = "lets out a tiny squeak!"
+	emote_type = EMOTE_AUDIBLE
+	mob_type_allowed_typecache = list(/mob/living/carbon)
+
+/datum/emote/living/mothsqueak/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/mothsqueak.ogg', 50, 1, -1)
+	. = ..()
+
+/datum/emote/living/merp
+	key = "merp"
+	key_third_person = "merps"
+	message = "merps!"
+	emote_type = EMOTE_AUDIBLE
+
+/datum/emote/living/merp/run_emote(mob/living/user, params)
+	if(ishuman(user))
+		if(user.nextsoundemote >= world.time)
+			return
+		user.nextsoundemote = world.time + 7
+		playsound(user, 'modular_citadel/sound/voice/merp.ogg', 50, 1, -1)
+	. = ..()

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

@@ -0,0 +1,79 @@
+/mob/living/carbon
+	var/combatmode = FALSE //literally lifeweb
+	var/lastmousedir
+	var/wrongdirmovedelay
+	var/lastdirchange
+	var/combatmessagecooldown
+
+	//oh no vore time
+	var/voremode = FALSE
+
+/mob/living/carbon/CanPass(atom/movable/mover, turf/target)
+	. = ..()
+	if(.)
+		var/mob/living/mobdude = mover
+		if(istype(mobdude))
+			if(!resting && mobdude.resting)
+				if(!(mobdude.pass_flags & PASSMOB))
+					return FALSE
+	return .
+
+/mob/living/carbon/proc/toggle_combat_mode()
+	if(recoveringstam)
+		return TRUE
+	combatmode = !combatmode
+	if(voremode)
+		toggle_vore_mode()
+	if(combatmode)
+		playsound_local(src, 'modular_citadel/sound/misc/ui_toggle.ogg', 50, FALSE, pressure_affected = FALSE) //Sound from interbay!
+	else
+		playsound_local(src, 'modular_citadel/sound/misc/ui_toggleoff.ogg', 50, FALSE, pressure_affected = FALSE) //Slightly modified version of the above!
+	if(client)
+		client.show_popup_menus = !combatmode // So we can right-click for alternate actions and all that other good shit. Also moves examine to shift+rightclick to make it possible to attack while sprinting
+	if(hud_used && hud_used.static_inventory)
+		for(var/obj/screen/combattoggle/selector in hud_used.static_inventory)
+			selector.rebasetointerbay(src)
+	if(world.time >= combatmessagecooldown && combatmode)
+		if(a_intent != INTENT_HELP)
+			visible_message("<span class='warning'>[src] [resting ? "tenses up" : (prob(95)? "drops into a combative stance" : (prob(95)? "poses aggressively" : "asserts dominance with their pose"))].</span>")
+		else
+			visible_message("<span class='notice'>[src] [pick("looks","seems","goes")] [pick("alert","attentive","vigilant")].</span>")
+	combatmessagecooldown = 10 SECONDS + world.time //This is set 100% of the time to make sure squeezing regen out of process cycles doesn't result in the combat mode message getting spammed
+	SEND_SIGNAL(src, COMSIG_COMBAT_TOGGLED, src, combatmode)
+	return TRUE
+
+mob/living/carbon/proc/toggle_vore_mode()
+	voremode = !voremode
+	if(hud_used && hud_used.static_inventory)
+		for(var/obj/screen/voretoggle/selector in hud_used.static_inventory)
+			selector.rebaseintomygut(src)
+	if(combatmode)
+		return FALSE //let's not override the main draw of the game these days
+	SEND_SIGNAL(src, COMSIG_VORE_TOGGLED, src, voremode)
+	return TRUE
+
+/mob/living/carbon/Move(atom/newloc, direct = 0)
+	var/currentdirection = dir
+	. = ..()
+	wrongdirmovedelay = FALSE
+	if(combatmode && client && lastmousedir)
+		if(lastmousedir != dir)
+			wrongdirmovedelay = TRUE
+			setDir(lastmousedir, ismousemovement = TRUE)
+	if(currentdirection != dir)
+		lastdirchange = world.time
+
+
+/mob/living/carbon/onMouseMove(object, location, control, params)
+	if(!combatmode)
+		return
+	mouse_face_atom(object)
+	lastmousedir = dir
+
+/mob/living/carbon/setDir(newdir, ismousemovement = FALSE)
+	if(!combatmode || ismousemovement)
+		if(dir != newdir)
+			lastdirchange = world.time
+		. = ..()
+	else
+		return

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

@@ -0,0 +1,38 @@
+/mob/living/carbon/adjustStaminaLossBuffered(amount, updating_stamina = 1)
+	if(status_flags & GODMODE)
+		return 0
+	if(CONFIG_GET(flag/disable_stambuffer))
+		return
+	var/directstamloss = (bufferedstam + amount) - stambuffer
+	if(directstamloss > 0)
+		adjustStaminaLoss(directstamloss)
+	bufferedstam = CLAMP(bufferedstam + amount, 0, stambuffer)
+	stambufferregentime = world.time + 10
+	if(updating_stamina)
+		update_health_hud()
+
+/mob/living/carbon/adjustStaminaLoss(amount, updating_health = TRUE, forced = FALSE, affected_zone = BODY_ZONE_CHEST)
+	if(!forced && (status_flags & GODMODE))
+		return FALSE
+	apply_damage(amount > 0 ? amount*incomingstammult : amount, STAMINA, affected_zone)
+	if(recoveringstam && amount > 20)
+		incomingstammult = max(0.01, incomingstammult/(amount*0.05))
+	return amount
+
+/mob/living/carbon/doSprintLossTiles(tiles)
+	doSprintBufferRegen(FALSE)		//first regen.
+	if(sprint_buffer)
+		var/use = min(tiles, sprint_buffer)
+		sprint_buffer -= use
+		tiles -= use
+	update_hud_sprint_bar()
+	if(!tiles)		//we had enough, we're done!
+		return
+	adjustStaminaLoss(tiles * sprint_stamina_cost)		//use stamina to cover deficit.
+
+/mob/living/carbon/proc/doSprintBufferRegen(updating = TRUE)
+	var/diff = world.time - sprint_buffer_regen_last
+	sprint_buffer_regen_last = world.time
+	sprint_buffer = min(sprint_buffer_max, sprint_buffer + sprint_buffer_regen_ds * diff)
+	if(updating)
+		update_hud_sprint_bar()

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

@@ -0,0 +1,43 @@
+/mob/living/carbon/human/species/mammal
+	race = /datum/species/mammal
+
+/mob/living/carbon/human/species/avian
+	race = /datum/species/avian
+
+/mob/living/carbon/human/species/aquatic
+	race = /datum/species/aquatic
+
+/mob/living/carbon/human/species/insect
+	race = /datum/species/insect
+
+/mob/living/carbon/human/species/xeno
+	race = /datum/species/xeno
+
+/mob/living/proc/resist_embedded()
+	return
+
+/mob/living/carbon/human/resist_embedded()
+	if(handcuffed || legcuffed || (wear_suit && wear_suit.breakouttime))
+		return
+	if(canmove && !on_fire)
+		for(var/obj/item/bodypart/L in bodyparts)
+			if(istype(L) && L.embedded_objects.len)
+				for(var/obj/item/I in L.embedded_objects)
+					if(istype(I) && I.w_class >= WEIGHT_CLASS_NORMAL)	//minimum weight class to insta-ripout via resist
+						remove_embedded_unsafe(L, I, src, 1.5)	//forcefully call the remove embedded unsafe proc but with extra pain multiplier. if you want to remove it less painfully, examine and remove it carefully.
+						return TRUE //Hands are occupied
+	return
+
+/mob/living/carbon/human/proc/remove_embedded_unsafe(obj/item/bodypart/L, obj/item/I, mob/user, painmul = 1)
+	if(!I || !L || I.loc != src || !(I in L.embedded_objects))
+		return
+	L.embedded_objects -= I
+	L.receive_damage(I.embedding.embedded_unsafe_removal_pain_multiplier*I.w_class*painmul)//It hurts to rip it out, get surgery you dingus. And if you're ripping it out quickly via resist, it's gonna hurt even more
+	I.forceMove(get_turf(src))
+	user.put_in_hands(I)
+	user.emote("scream")
+	user.visible_message("[user] rips [I] out of [user.p_their()] [L.name]!","<span class='notice'>You remove [I] from your [L.name].</span>")
+	if(!has_embedded_objects())
+		clear_alert("embeddedobject")
+		SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "embedded")
+	return

modular_citadel/code/modules/mob/living/carbon/human/human_defense.dm

@@ -0,0 +1,8 @@
+/mob/living/carbon/human/alt_attack_hand(mob/user)
+	if(..())
+		return
+	if(ishuman(user))
+		var/mob/living/carbon/human/H = user
+		if(!dna.species.alt_spec_attack_hand(H, src))
+			dna.species.spec_attack_hand(H, src)
+		return TRUE

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

@@ -0,0 +1,37 @@
+/mob/living/carbon/human
+	var/sprinting = FALSE
+
+/mob/living/carbon/human/Move(NewLoc, direct)
+	var/oldpseudoheight = pseudo_z_axis
+	. = ..()
+	if(. && sprinting && !(movement_type & FLYING) && canmove && !resting && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && !pulledby)
+		doSprintLossTiles(1)
+		if((oldpseudoheight - pseudo_z_axis) >= 8)
+			to_chat(src, "<span class='warning'>You trip off of the elevated surface!</span>")
+			for(var/obj/item/I in held_items)
+				accident(I)
+			Knockdown(80)
+
+/mob/living/carbon/human/movement_delay()
+	. = 0
+	if(!resting && m_intent == MOVE_INTENT_RUN && !sprinting)
+		. += 1
+	if(wrongdirmovedelay)
+		. += 1
+	. += ..()
+
+/mob/living/carbon/human/proc/togglesprint() // If you call this proc outside of hotkeys or clicking the HUD button, I'll be disappointed in you.
+	sprinting = !sprinting
+	if(!resting && m_intent == MOVE_INTENT_RUN && canmove)
+		if(sprinting)
+			playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+		else
+			playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+	if(hud_used && hud_used.static_inventory)
+		for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
+			selector.insert_witty_toggle_joke_here(src)
+	return TRUE
+
+/mob/living/carbon/human/proc/sprint_hotkey(targetstatus)
+	if(targetstatus ? !sprinting : sprinting)
+		togglesprint()

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

@@ -0,0 +1,21 @@
+/mob/living/carbon/human/Life()
+		//citadel code
+	if(stat != DEAD)
+		handle_arousal()
+	. = ..()
+
+/mob/living/carbon/human/calculate_affecting_pressure(pressure)
+	if(ismob(loc))
+		return ONE_ATMOSPHERE
+	if(istype(loc, /obj/item/dogborg/sleeper))
+		return ONE_ATMOSPHERE
+	. = ..()
+
+/mob/living/carbon/human/update_health_hud(shown_health_amount)
+	. = ..()
+	if(!client || !hud_used)
+		return
+	if(hud_used.staminas)
+		hud_used.staminas.icon_state = staminahudamount()
+	if(hud_used.staminabuffer)
+		hud_used.staminabuffer.icon_state = staminabufferhudamount()

modular_citadel/code/modules/mob/living/carbon/human/species.dm

@@ -0,0 +1,166 @@
+/datum/species
+	var/should_draw_citadel = FALSE
+
+/datum/species/proc/alt_spec_attack_hand(mob/living/carbon/human/M, mob/living/carbon/human/H, datum/martial_art/attacker_style)
+	if(!istype(M))
+		return TRUE
+	CHECK_DNA_AND_SPECIES(M)
+	CHECK_DNA_AND_SPECIES(H)
+
+	if(!istype(M)) //sanity check for drones.
+		return TRUE
+	if(M.mind)
+		attacker_style = M.mind.martial_art
+	if((M != H) && M.a_intent != INTENT_HELP && H.check_shields(M, 0, M.name, attack_type = UNARMED_ATTACK))
+		log_combat(M, H, "attempted to touch")
+		H.visible_message("<span class='warning'>[M] attempted to touch [H]!</span>")
+		return TRUE
+	switch(M.a_intent)
+		if(INTENT_HELP)
+			if(M == H)
+				althelp(M, H, attacker_style)
+				return TRUE
+			return FALSE
+		if(INTENT_DISARM)
+			altdisarm(M, H, attacker_style)
+			return TRUE
+	return FALSE
+
+/datum/species/proc/althelp(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+	if(user == target && istype(user))
+		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
+			return
+		if(!user.resting)
+			to_chat(user, "<span class='notice'>You can only force yourself up if you're on the ground.</span>")
+			return
+		user.visible_message("<span class='notice'>[user] forces [p_them()]self up to [p_their()] feet!</span>", "<span class='notice'>You force yourself up to your feet!</span>")
+		user.resting = 0
+		user.update_canmove()
+		user.adjustStaminaLossBuffered(user.stambuffer) //Rewards good stamina management by making it easier to instantly get up from resting
+		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
+
+/datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
+	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		to_chat(user, "<span class='warning'>You're too exhausted.</span>")
+		return FALSE
+	if(target.check_block())
+		target.visible_message("<span class='warning'>[target] blocks [user]'s shoving attempt!</span>")
+		return FALSE
+	if(attacker_style && attacker_style.disarm_act(user,target))
+		return TRUE
+	if(user.resting)
+		return FALSE
+	else
+		if(user == target)
+			return
+		user.do_attack_animation(target, ATTACK_EFFECT_DISARM)
+		user.adjustStaminaLossBuffered(4)
+		playsound(target, 'sound/weapons/thudswoosh.ogg', 50, TRUE, -1)
+
+		if(target.w_uniform)
+			target.w_uniform.add_fingerprint(user)
+		SEND_SIGNAL(target, COMSIG_HUMAN_DISARM_HIT, user, user.zone_selected)
+
+		if(!target.resting)
+			target.adjustStaminaLoss(5)
+
+
+		var/turf/target_oldturf = target.loc
+		var/shove_dir = get_dir(user.loc, target_oldturf)
+		var/turf/target_shove_turf = get_step(target.loc, shove_dir)
+		var/mob/living/carbon/human/target_collateral_human
+		var/obj/structure/table/target_table
+		var/shove_blocked = FALSE //Used to check if a shove is blocked so that if it is knockdown logic can be applied
+
+		//Thank you based whoneedsspace
+		target_collateral_human = locate(/mob/living/carbon/human) in target_shove_turf.contents
+		if(target_collateral_human)
+			shove_blocked = TRUE
+		else
+			target.Move(target_shove_turf, shove_dir)
+			if(get_turf(target) == target_oldturf)
+				if(target_shove_turf.density)
+					shove_blocked = TRUE
+				else
+					var/thoushallnotpass = FALSE
+					for(var/obj/O in target_shove_turf)
+						if(istype(O, /obj/structure/table))
+							target_table = O
+						else if(!O.CanPass(src, target_shove_turf))
+							shove_blocked = TRUE
+							thoushallnotpass = TRUE
+					if(thoushallnotpass)
+						target_table = null
+
+		if(target.is_shove_knockdown_blocked())
+			return
+
+		if(shove_blocked || target_table)
+			var/directional_blocked = FALSE
+			if(shove_dir in GLOB.cardinals) //Directional checks to make sure that we're not shoving through a windoor or something like that
+				var/target_turf = get_turf(target)
+				for(var/obj/O in target_turf)
+					if(O.flags_1 & ON_BORDER_1 && O.dir == shove_dir && O.density)
+						directional_blocked = TRUE
+						break
+				if(target_turf != target_shove_turf) //Make sure that we don't run the exact same check twice on the same tile
+					for(var/obj/O in target_shove_turf)
+						if(O.flags_1 & ON_BORDER_1 && O.dir == turn(shove_dir, 180) && O.density)
+							directional_blocked = TRUE
+							break
+			var/targetatrest = target.resting
+			if(((!target_table && !target_collateral_human) || directional_blocked) && !targetatrest)
+				target.Knockdown(SHOVE_KNOCKDOWN_SOLID)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name], knocking them down!</span>",
+					"<span class='danger'>You shove [target.name], knocking them down!</span>", null, COMBAT_MESSAGE_RANGE)
+				log_combat(user, target, "shoved", "knocking them down")
+			else if(target_table)
+				if(!targetatrest)
+					target.Knockdown(SHOVE_KNOCKDOWN_TABLE)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name] onto \the [target_table]!</span>",
+					"<span class='danger'>You shove [target.name] onto \the [target_table]!</span>", null, COMBAT_MESSAGE_RANGE)
+				target.forceMove(target_shove_turf)
+				log_combat(user, target, "shoved", "onto [target_table]")
+			else if(target_collateral_human && !targetatrest)
+				target.Knockdown(SHOVE_KNOCKDOWN_HUMAN)
+				if(!target_collateral_human.resting)
+					target_collateral_human.Knockdown(SHOVE_KNOCKDOWN_COLLATERAL)
+				user.visible_message("<span class='danger'>[user.name] shoves [target.name] into [target_collateral_human.name]!</span>",
+					"<span class='danger'>You shove [target.name] into [target_collateral_human.name]!</span>", null, COMBAT_MESSAGE_RANGE)
+				log_combat(user, target, "shoved", "into [target_collateral_human.name]")
+
+		else
+			user.visible_message("<span class='danger'>[user.name] shoves [target.name]!</span>",
+				"<span class='danger'>You shove [target.name]!</span>", null, COMBAT_MESSAGE_RANGE)
+			var/target_held_item = target.get_active_held_item()
+			var/knocked_item = FALSE
+			if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types))
+				target_held_item = null
+			if(!target.has_movespeed_modifier(SHOVE_SLOWDOWN_ID))
+				target.add_movespeed_modifier(SHOVE_SLOWDOWN_ID, multiplicative_slowdown = SHOVE_SLOWDOWN_STRENGTH)
+				if(target_held_item)
+					target.visible_message("<span class='danger'>[target.name]'s grip on \the [target_held_item] loosens!</span>",
+						"<span class='danger'>Your grip on \the [target_held_item] loosens!</span>", null, COMBAT_MESSAGE_RANGE)
+				addtimer(CALLBACK(target, /mob/living/carbon/human/proc/clear_shove_slowdown), SHOVE_SLOWDOWN_LENGTH)
+			else if(target_held_item)
+				target.dropItemToGround(target_held_item)
+				knocked_item = TRUE
+				target.visible_message("<span class='danger'>[target.name] drops \the [target_held_item]!!</span>",
+					"<span class='danger'>You drop \the [target_held_item]!!</span>", null, COMBAT_MESSAGE_RANGE)
+			var/append_message = ""
+			if(target_held_item)
+				if(knocked_item)
+					append_message = "causing them to drop [target_held_item]"
+				else
+					append_message = "loosening their grip on [target_held_item]"
+			log_combat(user, target, "shoved", append_message)
+
+
+////////////////////
+/////BODYPARTS/////
+////////////////////
+
+
+/obj/item/bodypart
+	var/should_draw_citadel = FALSE

modular_citadel/code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -0,0 +1,237 @@
+/datum/species/mammal
+	name = "Anthro"
+	id = "mammal"
+	default_color = "4B4B4B"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur", "legs")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "mam_body_markings" = "Husky", "taur" = "None", "legs" = "Normal Legs")
+	attack_verb = "claw"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
+	liked_food = MEAT | FRIED
+	disliked_food = TOXIC
+
+//Curiosity killed the cat's wagging tail.
+/datum/species/mammal/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/mammal/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/mammal/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/mammal/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/mammal/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/mammal/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+
+/datum/species/mammal/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+
+//AVIAN//
+/datum/species/avian
+	name = "Avian"
+	id = "avian"
+	say_mod = "chirps"
+	default_color = "BCAC9B"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("mam_snouts", "wings", "taur", "mam_tail", "mam_body_markings", "taur")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_snouts" = "Beak", "mam_body_markings" = "Hawk", "wings" = "None", "taur" = "None", "mam_tail" = "Hawk")
+	attack_verb = "peck"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC
+
+/datum/species/avian/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/avian/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/avian/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/avian/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/avian/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/avian/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+/datum/species/avian/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+//AQUATIC//
+/datum/species/aquatic
+	name = "Aquatic"
+	id = "aquatic"
+	default_color = "BCAC9B"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("mam_tail", "mam_ears","mam_body_markings", "taur", "legs", "mam_snouts")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "Shark", "mam_ears" = "None", "mam_body_markings" = "Shark", "mam_snouts" = "Round", "taur" = "None", "legs" = "Normal Legs")
+	attack_verb = "bite"
+	attack_sound = 'sound/weapons/bite.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT
+	disliked_food = TOXIC
+	meat = /obj/item/reagent_containers/food/snacks/carpmeat/aquatic
+
+/datum/species/aquatic/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/aquatic/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/aquatic/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/aquatic/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/aquatic/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/aquatic/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+/datum/species/aquatic/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+//INSECT//
+/datum/species/insect
+	name = "Insect"
+	id = "insect"
+	default_color = "BCAC9B"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS,HAIR)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID, MOB_BUG)
+	mutant_bodyparts = list("mam_ears", "mam_body_markings", "mam_tail", "taur", "moth_wings", "mam_snouts")
+	default_features = list("mcolor" = "FFF","mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "moth_wings" = "Plain", "mam_snouts" = "Bug", "mam_body_markings" = "Moth", "taur" = "None")
+	attack_verb = "flutter" //wat?
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	liked_food = MEAT | FRUIT
+	disliked_food = TOXIC
+
+/datum/species/insect/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/insect/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/insect/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/insect/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/insect/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/insect/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+/datum/species/insect/qualifies_for_rank(rank, list/features)
+	return TRUE
+
+//Alien//
+/datum/species/xeno
+	// A cloning mistake, crossing human and xenomorph DNA
+	name = "Xeno Hybrid"
+	id = "xeno"
+	say_mod = "hisses"
+	default_color = "00FF00"
+	should_draw_citadel = TRUE
+	species_traits = list(MUTCOLORS,EYECOLOR,LIPS)
+	inherent_biotypes = list(MOB_ORGANIC, MOB_HUMANOID)
+	mutant_bodyparts = list("xenotail", "xenohead", "xenodorsal", "mam_body_markings", "taur", "legs")
+	default_features = list("xenotail"="Xenomorph Tail","xenohead"="Standard","xenodorsal"="Standard", "mam_body_markings" = "Xeno","mcolor" = "0F0","mcolor2" = "0F0","mcolor3" = "0F0","taur" = "None", "legs" = "Digitigrade Legs")
+	attack_verb = "slash"
+	attack_sound = 'sound/weapons/slash.ogg'
+	miss_sound = 'sound/weapons/slashmiss.ogg'
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+	skinned_type = /obj/item/stack/sheet/animalhide/xeno
+	exotic_bloodtype = "L"
+	damage_overlay_type = "xeno"
+	liked_food = MEAT
+
+/datum/species/xeno/on_species_gain(mob/living/carbon/human/C, datum/species/old_species)
+	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Digitigrade Legs")
+		species_traits += DIGITIGRADE
+	if(DIGITIGRADE in species_traits)
+		C.Digitigrade_Leg_Swap(FALSE)
+	. = ..()
+
+/datum/species/xeno/on_species_loss(mob/living/carbon/human/C, datum/species/new_species)
+	if(("legs" in C.dna.species.mutant_bodyparts) && C.dna.features["legs"] == "Normal Legs")
+		species_traits -= DIGITIGRADE
+	if(DIGITIGRADE in species_traits)
+		C.Digitigrade_Leg_Swap(TRUE)
+	. = ..()
+
+//Praise the Omnissiah, A challange worthy of my skills - HS
+
+//EXOTIC//
+//These races will likely include lots of downsides and upsides. Keep them relatively balanced.//
+
+//misc
+/mob/living/carbon/human/dummy
+	no_vore = TRUE
+
+/mob/living/carbon/human/vore
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE

modular_citadel/code/modules/mob/living/carbon/human/species_types/ipc.dm

@@ -0,0 +1,43 @@
+/datum/species/ipc
+	name = "IPC"
+	id = "ipc"
+	say_mod = "beeps"
+	default_color = "00FF00"
+	should_draw_citadel = TRUE
+	blacklisted = 0
+	sexes = 0
+	species_traits = list(MUTCOLORS,NOEYES,NOTRANSSTING)
+	inherent_biotypes = list(MOB_ROBOTIC, MOB_HUMANOID)
+	mutant_bodyparts = list("ipc_screen", "ipc_antenna")
+	default_features = list("ipc_screen" = "Blank", "ipc_antenna" = "None")
+	meat = /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
+	mutanttongue = /obj/item/organ/tongue/robot/ipc
+
+	exotic_blood = "oil"
+
+	var/datum/action/innate/monitor_change/screen
+
+/datum/species/ipc/on_species_gain(mob/living/carbon/human/C)
+	if(isipcperson(C) && !screen)
+		screen = new
+		screen.Grant(C)
+	..()
+
+/datum/species/ipc/on_species_loss(mob/living/carbon/human/C)
+	if(screen)
+		screen.Remove(C)
+	..()
+
+/datum/action/innate/monitor_change
+	name = "Screen Change"
+	check_flags = AB_CHECK_CONSCIOUS
+	icon_icon = 'icons/mob/actions/actions_silicon.dmi'
+	button_icon_state = "drone_vision"
+
+/datum/action/innate/monitor_change/Activate()
+	var/mob/living/carbon/human/H = owner
+	var/new_ipc_screen = input(usr, "Choose your character's screen:", "Monitor Display") as null|anything in GLOB.ipc_screens_list
+	if(!new_ipc_screen)
+		return
+	H.dna.features["ipc_screen"] = new_ipc_screen
+	H.update_body()

modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -0,0 +1,257 @@
+/datum/species/jelly/slime
+	name = "Xenobiological Slimeperson"
+
+//##########SLIMEPEOPLE##########
+
+/datum/species/jelly/roundstartslime
+	name = "Slimeperson"
+	id = "slimeperson"
+	limbs_id = "slime"
+	default_color = "00FFFF"
+	species_traits = list(MUTCOLORS,EYECOLOR,HAIR,FACEHAIR,NOBLOOD)
+	inherent_traits = list(TRAIT_TOXINLOVER)
+	mutant_bodyparts = list("mam_tail", "mam_ears", "mam_body_markings", "mam_snouts", "taur")
+	default_features = list("mcolor" = "FFF", "mcolor2" = "FFF","mcolor3" = "FFF", "mam_tail" = "None", "mam_ears" = "None", "mam_body_markings" = "Plain", "mam_snouts" = "None", "taur" = "None")
+	say_mod = "says"
+	hair_color = "mutcolor"
+	hair_alpha = 160 //a notch brighter so it blends better.
+	coldmod = 3
+	heatmod = 1
+	burnmod = 1
+
+/datum/species/jelly/roundstartslime/spec_death(gibbed, mob/living/carbon/human/H)
+	if(H)
+		stop_wagging_tail(H)
+
+/datum/species/jelly/roundstartslime/spec_stun(mob/living/carbon/human/H,amount)
+	if(H)
+		stop_wagging_tail(H)
+	. = ..()
+
+/datum/species/jelly/roundstartslime/can_wag_tail(mob/living/carbon/human/H)
+	return ("mam_tail" in mutant_bodyparts) || ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/jelly/roundstartslime/is_wagging_tail(mob/living/carbon/human/H)
+	return ("mam_waggingtail" in mutant_bodyparts)
+
+/datum/species/jelly/roundstartslime/start_wagging_tail(mob/living/carbon/human/H)
+	if("mam_tail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_tail"
+		mutant_bodyparts |= "mam_waggingtail"
+	H.update_body()
+
+/datum/species/jelly/roundstartslime/stop_wagging_tail(mob/living/carbon/human/H)
+	if("mam_waggingtail" in mutant_bodyparts)
+		mutant_bodyparts -= "mam_waggingtail"
+		mutant_bodyparts |= "mam_tail"
+	H.update_body()
+
+
+/datum/action/innate/slime_change
+	name = "Alter Form"
+	check_flags = AB_CHECK_CONSCIOUS
+	button_icon_state = "alter_form" //placeholder
+	icon_icon = 'modular_citadel/icons/mob/actions/actions_slime.dmi'
+	background_icon_state = "bg_alien"
+
+/datum/action/innate/slime_change/Activate()
+	var/mob/living/carbon/human/H = owner
+	if(!isjellyperson(H))
+		return
+	else
+		H.visible_message("<span class='notice'>[owner] gains a look of \
+		concentration while standing perfectly still.\
+		 Their body seems to shift and starts getting more goo-like.</span>",
+		"<span class='notice'>You focus intently on altering your body while \
+		standing perfectly still...</span>")
+		change_form()
+
+/datum/action/innate/slime_change/proc/change_form()
+	var/mob/living/carbon/human/H = owner
+	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
+	if(select_alteration == "Hair Style")
+		if(H.gender == MALE)
+			var/new_style = input(owner, "Select a facial hair style", "Hair Alterations")  as null|anything in GLOB.facial_hair_styles_list
+			if(new_style)
+				H.facial_hair_style = new_style
+		else
+			H.facial_hair_style = "Shaved"
+		//handle normal hair
+		var/new_style = input(owner, "Select a hair style", "Hair Alterations")  as null|anything in GLOB.hair_styles_list
+		if(new_style)
+			H.hair_style = new_style
+			H.update_hair()
+	else if (select_alteration == "Genitals")
+		var/list/organs = list()
+		var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add sexual organ", "remove sexual organ", "cancel")
+		switch(operation)
+			if("add sexual organ")
+				var/new_organ = input("Select sexual organ:", "Organ Manipulation") in list("Penis", "Testicles", "Breasts", "Vagina", "Womb", "Cancel")
+				if(new_organ == "Penis")
+					H.give_penis()
+				else if(new_organ == "Testicles")
+					H.give_balls()
+				else if(new_organ == "Breasts")
+					H.give_breasts()
+				else if(new_organ == "Vagina")
+					H.give_vagina()
+				else if(new_organ == "Womb")
+					H.give_womb()
+				else
+					return
+			if("remove sexual organ")
+				for(var/obj/item/organ/genital/X in H.internal_organs)
+					var/obj/item/organ/I = X
+					organs["[I.name] ([I.type])"] = I
+				var/obj/item/organ = input("Select sexual organ:", "Organ Manipulation", null) in organs
+				organ = organs[organ]
+				if(!organ)
+					return
+				var/obj/item/organ/genital/O
+				if(isorgan(organ))
+					O = organ
+					O.Remove(H)
+				organ.forceMove(get_turf(H))
+				qdel(organ)
+				H.update_genitals()
+
+	else if (select_alteration == "Ears")
+		var/list/snowflake_ears_list = list("Normal" = null)
+		for(var/path in GLOB.mam_ears_list)
+			var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_ears_list[S.name] = path
+		var/new_ears
+		new_ears = input(owner, "Choose your character's ears:", "Ear Alteration") as null|anything in snowflake_ears_list
+		if(new_ears)
+			H.dna.features["mam_ears"] = new_ears
+		H.update_body()
+
+	else if (select_alteration == "Snout")
+		var/list/snowflake_snouts_list = list("Normal" = null)
+		for(var/path in GLOB.mam_snouts_list)
+			var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_snouts_list[S.name] = path
+		var/new_snout
+		new_snout = input(owner, "Choose your character's face:", "Face Alteration") as null|anything in snowflake_snouts_list
+		if(new_snout)
+			H.dna.features["mam_snouts"] = new_snout
+		H.update_body()
+
+	else if (select_alteration == "Markings")
+		var/list/snowflake_markings_list = list()
+		for(var/path in GLOB.mam_body_markings_list)
+			var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_markings_list[S.name] = path
+		var/new_mam_body_markings
+		new_mam_body_markings = input(H, "Choose your character's body markings:", "Marking Alteration") as null|anything in snowflake_markings_list
+		if(new_mam_body_markings)
+			H.dna.features["mam_body_markings"] = new_mam_body_markings
+			if(new_mam_body_markings == "None")
+				H.dna.features["mam_body_markings"] = "Plain"
+		for(var/X in H.bodyparts) //propagates the markings changes
+			var/obj/item/bodypart/BP = X
+			BP.update_limb(FALSE, H)
+		H.update_body()
+
+	else if (select_alteration == "Tail")
+		var/list/snowflake_tails_list = list("Normal" = null)
+		for(var/path in GLOB.mam_tails_list)
+			var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_tails_list[S.name] = path
+		var/new_tail
+		new_tail = input(owner, "Choose your character's Tail(s):", "Tail Alteration") as null|anything in snowflake_tails_list
+		if(new_tail)
+			H.dna.features["mam_tail"] = new_tail
+			if(new_tail != "None")
+				H.dna.features["taur"] = "None"
+		H.update_body()
+
+	else if (select_alteration == "Taur body")
+		var/list/snowflake_taur_list = list("Normal" = null)
+		for(var/path in GLOB.taur_list)
+			var/datum/sprite_accessory/taur/instance = GLOB.taur_list[path]
+			if(istype(instance, /datum/sprite_accessory))
+				var/datum/sprite_accessory/S = instance
+				if((!S.ckeys_allowed) || (S.ckeys_allowed.Find(H.client.ckey)))
+					snowflake_taur_list[S.name] = path
+		var/new_taur
+		new_taur = input(owner, "Choose your character's tauric body:", "Tauric Alteration") as null|anything in snowflake_taur_list
+		if(new_taur)
+			H.dna.features["taur"] = new_taur
+			if(new_taur != "None")
+				H.dna.features["mam_tail"] = "None"
+		H.update_body()
+
+	else if (select_alteration == "Penis")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's dong", "Genital Alteration") as null|anything in GLOB.cock_shapes_list
+		if(new_shape)
+			H.dna.features["cock_shape"] = new_shape
+		H.update_genitals()
+		H.give_balls()
+		H.give_penis()
+		H.apply_overlay()
+
+
+	else if (select_alteration == "Vagina")
+		for(var/obj/item/organ/genital/vagina/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's pussy", "Genital Alteration") as null|anything in GLOB.vagina_shapes_list
+		if(new_shape)
+			H.dna.features["vag_shape"] = new_shape
+		H.update_genitals()
+		H.give_womb()
+		H.give_vagina()
+		H.apply_overlay()
+
+	else if (select_alteration == "Penis Length")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_length
+		new_length = input(owner, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Genital Alteration") as num|null
+		if(new_length)
+			H.dna.features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_balls()
+		H.give_penis()
+
+	else if (select_alteration == "Breast Size")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_size
+		new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in GLOB.breasts_size_list
+		if(new_size)
+			H.dna.features["breasts_size"] = new_size
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
+	else if (select_alteration == "Breast Shape")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Breast Shape", "Genital Alteration") as null|anything in GLOB.breasts_shapes_list
+		if(new_shape)
+			H.dna.features["breasts_shape"] = new_shape
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
+	else
+		return

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

@@ -0,0 +1,3 @@
+/mob/living/carbon/Life()
+	. = ..()
+	doSprintBufferRegen()

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

@@ -0,0 +1,45 @@
+/mob/living
+	var/list/alternate_screams
+
+/mob/living/carbon/proc/reindex_screams()
+	clear_screams()
+	if(head)
+		add_screams(head.alternate_screams)
+	if(wear_mask)
+		add_screams(wear_mask.alternate_screams)
+	if(back)
+		add_screams(back.alternate_screams)
+
+/mob/living/carbon/human/reindex_screams()
+	..()
+	//More slots in humans.
+	if(ears)
+		add_screams(ears.alternate_screams)
+	if(wear_suit)
+		add_screams(wear_suit.alternate_screams)
+	if(w_uniform)
+		add_screams(w_uniform.alternate_screams)
+	if(glasses)
+		add_screams(glasses.alternate_screams)
+	if(gloves)
+		add_screams(gloves.alternate_screams)
+	if(shoes)
+		add_screams(shoes.alternate_screams)
+	if(belt)
+		add_screams(belt.alternate_screams)
+	if(s_store)
+		add_screams(s_store.alternate_screams)
+	if(wear_id)
+		add_screams(wear_id.alternate_screams)
+
+//Note that the following two are for /mob/living, while the above two are for /carbon and /human
+/mob/living/proc/add_screams(var/list/screams)
+	LAZYINITLIST(alternate_screams)
+	if(!screams || screams.len == 0)
+		return
+	for(var/S in screams)
+		LAZYADD(alternate_screams, S)
+
+/mob/living/proc/clear_screams()
+	LAZYINITLIST(alternate_screams)
+	LAZYCLEARLIST(alternate_screams)

modular_citadel/code/modules/mob/living/damage_procs.dm

@@ -0,0 +1,5 @@
+/mob/living/proc/adjustStaminaLossBuffered(amount, updating_stamina = TRUE, forced = FALSE)
+	return
+
+/mob/living/proc/doSprintLossTiles(amount)
+	return

modular_citadel/code/modules/mob/living/living.dm

@@ -0,0 +1,132 @@
+/mob/living
+	var/recoveringstam = FALSE
+	var/incomingstammult = 1
+	var/bufferedstam = 0
+	var/stambuffer = 20
+	var/stambufferregentime
+	var/attemptingstandup = FALSE
+	var/intentionalresting = FALSE
+	var/attemptingcrawl = FALSE
+
+	//Sprint buffer---
+	var/sprint_buffer = 42					//Tiles
+	var/sprint_buffer_max = 42
+	var/sprint_buffer_regen_ds = 0.3		//Tiles per world.time decisecond
+	var/sprint_buffer_regen_last = 0		//last world.time this was regen'd for math.
+	var/sprint_stamina_cost = 0.55			//stamina loss per tile while insufficient sprint buffer.
+	//---End
+
+/mob/living/movement_delay(ignorewalk = 0)
+	. = ..()
+	if(resting)
+		. += 6
+
+/atom
+	var/pseudo_z_axis
+
+/atom/proc/get_fake_z()
+	return pseudo_z_axis
+
+/obj/structure/table
+	pseudo_z_axis = 8
+
+/turf/open/get_fake_z()
+	var/objschecked
+	for(var/obj/structure/structurestocheck in contents)
+		objschecked++
+		if(structurestocheck.pseudo_z_axis)
+			return structurestocheck.pseudo_z_axis
+		if(objschecked >= 25)
+			break
+	return pseudo_z_axis
+
+/mob/living/Move(atom/newloc, direct)
+	. = ..()
+	if(.)
+		pseudo_z_axis = newloc.get_fake_z()
+		pixel_z = pseudo_z_axis
+
+/mob/living/proc/lay_down()
+	set name = "Rest"
+	set category = "IC"
+
+	if(client && client.prefs && client.prefs.autostand)
+		intentionalresting = !intentionalresting
+		to_chat(src, "<span class='notice'>You are now attempting to [intentionalresting ? "[!resting ? "lay down and ": ""]stay down" : "[resting ? "get up and ": ""]stay up"].</span>")
+		if(intentionalresting && !resting)
+			resting = TRUE
+			update_canmove()
+		else
+			resist_a_rest()
+	else
+		if(!resting)
+			resting = TRUE
+			to_chat(src, "<span class='notice'>You are now laying down.</span>")
+			update_canmove()
+		else
+			resist_a_rest()
+
+/mob/living/proc/resist_a_rest(automatic = FALSE, ignoretimer = FALSE) //Lets mobs resist out of resting. Major QOL change with combat reworks.
+	if(!resting || stat || attemptingstandup)
+		return FALSE
+	if(ignoretimer)
+		resting = FALSE
+		update_canmove()
+		return TRUE
+	else
+		var/totaldelay = 3 //A little bit less than half of a second as a baseline for getting up from a rest
+		if(getStaminaLoss() >= STAMINA_SOFTCRIT)
+			to_chat(src, "<span class='warning'>You're too exhausted to get up!")
+			return FALSE
+		attemptingstandup = TRUE
+		var/health_deficiency = max((maxHealth - (health - getStaminaLoss()))*0.5, 0)
+		if(!has_gravity())
+			health_deficiency = health_deficiency*0.2
+		totaldelay += health_deficiency
+		var/standupwarning = "[src] and everyone around them should probably yell at the dev team"
+		switch(health_deficiency)
+			if(-INFINITY to 10)
+				standupwarning = "[src] stands right up!"
+			if(10 to 35)
+				standupwarning = "[src] tries to stand up."
+			if(35 to 60)
+				standupwarning = "[src] slowly pushes [p_them()]self upright."
+			if(60 to 80)
+				standupwarning = "[src] weakly attempts to stand up."
+			if(80 to INFINITY)
+				standupwarning = "[src] struggles to stand up."
+		var/usernotice = automatic ? "<span class='notice'>You are now getting up. (Auto)</span>" : "<span class='notice'>You are now getting up.</span>"
+		visible_message("<span class='notice'>[standupwarning]</span>", usernotice, vision_distance = 5)
+		if(do_after(src, totaldelay, target = src))
+			resting = FALSE
+			attemptingstandup = FALSE
+			update_canmove()
+			return TRUE
+		else
+			visible_message("<span class='notice'>[src] falls right back down.</span>", "<span class='notice'>You fall right back down.</span>")
+			attemptingstandup = FALSE
+			if(has_gravity())
+				playsound(src, "bodyfall", 20, 1)
+			return FALSE
+
+/mob/living/carbon/update_stamina()
+	var/total_health = getStaminaLoss()
+	if(total_health)
+		if(!recoveringstam && total_health >= STAMINA_CRIT && !stat)
+			to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
+			resting = TRUE
+			if(combatmode)
+				toggle_combat_mode()
+			recoveringstam = TRUE
+			filters += CIT_FILTER_STAMINACRIT
+			update_canmove()
+	if(recoveringstam && total_health <= STAMINA_SOFTCRIT)
+		to_chat(src, "<span class='notice'>You don't feel nearly as exhausted anymore.</span>")
+		recoveringstam = FALSE
+		filters -= CIT_FILTER_STAMINACRIT
+		update_canmove()
+	update_health_hud()
+
+/mob/living/proc/update_hud_sprint_bar()
+	if(hud_used && hud_used.sprint_buffer)
+		hud_used.sprint_buffer.update_to_mob(src)

modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm

@@ -0,0 +1,76 @@
+/obj/item/robot_module/loader
+	name = "loader robot module"
+/obj/item/robot_module/loader/New()
+	..()
+	emag = new /obj/item/borg/stun(src)
+	modules += new /obj/item/extinguisher(src)
+	modules += new /obj/item/weldingtool/largetank/cyborg(src)
+	modules += new /obj/item/screwdriver(src)
+	modules += new /obj/item/wrench(src)
+	modules += new /obj/item/crowbar(src)
+	modules += new /obj/item/wirecutters(src)
+	modules += new /obj/item/multitool(src)
+	modules += new /obj/item/t_scanner(src)
+	modules += new /obj/item/analyzer(src)
+	modules += new /obj/item/assembly/signaler
+	modules += new /obj/item/soap/nanotrasen(src)
+
+	fix_modules()
+
+/obj/item/robot_module/k9
+	name = "Security K-9 Unit module"
+/obj/item/robot_module/k9/New()
+	..()
+	modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg/dog(src)
+	modules += new /obj/item/dogborg/jaws/big(src)
+	modules += new /obj/item/dogborg/pounce(src)
+	modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/analyzer/nose(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	//modules += new /obj/item/assembly/signaler(src)
+	//modules += new /obj/item/detective_scanner(src)
+	modules += new /obj/item/gun/energy/disabler/cyborg(src)
+	emag = new /obj/item/gun/energy/laser/cyborg(src)
+	fix_modules()
+
+/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
+	..()
+	var/obj/item/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/gun/advtaser/cyborg) in get_usable_modules()
+	if(T)
+		if(T.power_supply.charge < T.power_supply.maxcharge)
+			var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
+			T.power_supply.give(S.e_cost * coeff)
+			T.update_icon()
+		else
+			T.charge_tick = 0
+	fix_modules()
+
+/obj/item/robot_module/borgi
+	name = "Borgi module"
+
+/obj/item/robot_module/borgi/New()
+	..()
+	modules += new /obj/item/dogborg/jaws/small(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/healthanalyzer(src)
+	modules += new /obj/item/analyzer/nose(src)
+	emag = new /obj/item/dogborg/pounce(src)
+	fix_modules()
+
+/obj/item/robot_module/medihound
+	name = "MediHound module"
+
+/obj/item/robot_module/medihound/New()
+	..()
+	modules += new /obj/item/dogborg/jaws/small(src)
+	modules += new /obj/item/storage/bag/borgdelivery(src)
+	modules += new /obj/item/analyzer/nose(src)
+	modules += new /obj/item/soap/tongue(src)
+	modules += new /obj/item/healthanalyzer(src)
+	modules += new /obj/item/dogborg/sleeper(src)
+	modules += new /obj/item/twohanded/shockpaddles/hound(src)
+	modules += new /obj/item/sensor_device(src)
+	emag = new /obj/item/dogborg/pounce(src)
+	fix_modules()

modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm

@@ -0,0 +1,389 @@
+/*
+DOG BORG EQUIPMENT HERE
+SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
+*/
+
+/obj/item/dogborg/jaws
+	name = "Dogborg jaws"
+	desc = "The jaws of the debug errors oh god."
+	icon = 'icons/mob/dogborg.dmi'
+	flags_1 = CONDUCT_1
+	force = 1
+	throwforce = 0
+	w_class = 3
+	hitsound = 'sound/weapons/bite.ogg'
+	sharpness = IS_SHARP
+
+/obj/item/dogborg/jaws/big
+	name = "combat jaws"
+	desc = "The jaws of the law. Very sharp."
+	icon_state = "jaws"
+	force = 12
+	attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+
+/obj/item/dogborg/jaws/small
+	name = "puppy jaws"
+	desc = "Rubberized teeth designed to protect accidental harm. Sharp enough for specialized tasks however."
+	icon_state = "smalljaws"
+	force = 6
+	attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
+	var/status = 0
+
+/obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user)
+	..()
+	user.do_attack_animation(A, ATTACK_EFFECT_BITE)
+	log_combat(user, A, "bit")
+
+/obj/item/dogborg/jaws/small/attack_self(mob/user)
+	var/mob/living/silicon/robot.R = user
+	if(R.cell && R.cell.charge > 100)
+		if(R.emagged && status == 0)
+			name = "combat jaws"
+			icon_state = "jaws"
+			desc = "The jaws of the law."
+			force = 12
+			attack_verb = list("chomped", "bit", "ripped", "mauled", "enforced")
+			status = 1
+			to_chat(user, "<span class='notice'>Your jaws are now [status ? "Combat" : "Pup'd"].</span>")
+		else
+			name = "puppy jaws"
+			icon_state = "smalljaws"
+			desc = "The jaws of a small dog."
+			force = 5
+			attack_verb = list("nibbled", "bit", "gnawed", "chomped", "nommed")
+			status = 0
+			if(R.emagged)
+				to_chat(user, "<span class='notice'>Your jaws are now [status ? "Combat" : "Pup'd"].</span>")
+	update_icon()
+
+//Boop
+
+/obj/item/analyzer/nose
+	name = "boop module"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "nose"
+	desc = "The BOOP module"
+	flags_1 = CONDUCT_1
+	force = 0
+	throwforce = 0
+	attack_verb = list("nuzzles", "pushes", "boops")
+	w_class = 1
+
+/obj/item/analyzer/nose/attack_self(mob/user)
+	user.visible_message("[user] sniffs around the air.", "<span class='warning'>You sniff the air for gas traces.</span>")
+
+	var/turf/location = user.loc
+	if(!istype(location))
+		return
+
+	var/datum/gas_mixture/environment = location.return_air()
+
+	var/pressure = environment.return_pressure()
+	var/total_moles = environment.total_moles()
+
+	to_chat(user, "<span class='info'><B>Results:</B></span>")
+	if(abs(pressure - ONE_ATMOSPHERE) < 10)
+		to_chat(user, "<span class='info'>Pressure: [round(pressure,0.1)] kPa</span>")
+	else
+		to_chat(user, "<span class='alert'>Pressure: [round(pressure,0.1)] kPa</span>")
+	if(total_moles)
+		var/list/env_gases = environment.gases
+
+		var/o2_concentration = env_gases[/datum/gas/oxygen]/total_moles
+		var/n2_concentration = env_gases[/datum/gas/nitrogen]/total_moles
+		var/co2_concentration = env_gases[/datum/gas/carbon_dioxide]/total_moles
+		var/plasma_concentration = env_gases[/datum/gas/plasma]/total_moles
+		GAS_GARBAGE_COLLECT(environment.gases)
+
+		if(abs(n2_concentration - N2STANDARD) < 20)
+			to_chat(user, "<span class='info'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='alert'>Nitrogen: [round(n2_concentration*100, 0.01)] %</span>")
+
+		if(abs(o2_concentration - O2STANDARD) < 2)
+			to_chat(user, "<span class='info'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='alert'>Oxygen: [round(o2_concentration*100, 0.01)] %</span>")
+
+		if(co2_concentration > 0.01)
+			to_chat(user, "<span class='alert'>CO2: [round(co2_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='info'>CO2: [round(co2_concentration*100, 0.01)] %</span>")
+
+		if(plasma_concentration > 0.005)
+			to_chat(user, "<span class='alert'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")
+		else
+			to_chat(user, "<span class='info'>Plasma: [round(plasma_concentration*100, 0.01)] %</span>")
+
+
+		for(var/id in env_gases)
+			if(id in GLOB.hardcoded_gases)
+				continue
+			var/gas_concentration = env_gases[id]/total_moles
+			to_chat(user, "<span class='alert'>[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] %</span>")
+		to_chat(user, "<span class='info'>Temperature: [round(environment.temperature-T0C)] &deg;C</span>")
+
+/obj/item/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
+	. = ..()
+
+/obj/item/analyzer/nose/afterattack(atom/target, mob/user, proximity)
+	. = ..()
+	if(!proximity)
+		return
+	do_attack_animation(target, null, src)
+	user.visible_message("<span class='notice'>[user] [pick(attack_verb)] \the [target.name] with their nose!</span>")
+
+//Delivery
+/obj/item/storage/bag/borgdelivery
+	name = "fetching storage"
+	desc = "Fetch the thing!"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "dbag"
+	w_class = WEIGHT_CLASS_BULKY
+
+/obj/item/storage/bag/borgdelivery/ComponentInitialize()
+	. = ..()
+	GET_COMPONENT(STR, /datum/component/storage)
+	STR.max_w_class = WEIGHT_CLASS_BULKY
+	STR.max_combined_w_class = 5
+	STR.max_items = 1
+	STR.cant_hold = typecacheof(list(/obj/item/disk/nuclear, /obj/item/radio/intercom))
+
+//Tongue stuff
+/obj/item/soap/tongue
+	name = "synthetic tongue"
+	desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "synthtongue"
+	hitsound = 'sound/effects/attackblob.ogg'
+	cleanspeed = 80
+	var/status = 0
+
+/obj/item/soap/tongue/scrubpup
+	cleanspeed = 25 //slightly faster than a mop.
+
+/obj/item/soap/tongue/New()
+	..()
+	item_flags |= NOBLUDGEON //No more attack messages
+
+/obj/item/soap/tongue/attack_self(mob/user)
+	var/mob/living/silicon/robot.R = user
+	if(R.cell && R.cell.charge > 100)
+		if(R.emagged && status == 0)
+			status = !status
+			name = "energized tongue"
+			desc = "Your tongue is energized for dangerously maximum efficency."
+			icon_state = "syndietongue"
+			to_chat(user, "<span class='notice'>Your tongue is now [status ? "Energized" : "Normal"].</span>")
+			cleanspeed = 10 //(nerf'd)tator soap stat
+		else
+			status = 0
+			name = "synthetic tongue"
+			desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face."
+			icon_state = "synthtongue"
+			cleanspeed = initial(cleanspeed)
+			if(R.emagged)
+				to_chat(user, "<span class='notice'>Your tongue is now [status ? "Energized" : "Normal"].</span>")
+	update_icon()
+
+/obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity)
+	var/mob/living/silicon/robot.R = user
+	if(!proximity || !check_allowed_items(target))
+		return
+	if(R.client && (target in R.client.screen))
+		to_chat(R, "<span class='warning'>You need to take that [target.name] off before cleaning it!</span>")
+	else if(is_cleanable(target))
+		R.visible_message("[R] begins to lick off \the [target.name].", "<span class='warning'>You begin to lick off \the [target.name]...</span>")
+		if(do_after(R, src.cleanspeed, target = target))
+			if(!in_range(src, target)) //Proximity is probably old news by now, do a new check.
+				return //If they moved away, you can't eat them.
+			to_chat(R, "<span class='notice'>You finish licking off \the [target.name].</span>")
+			qdel(target)
+			R.cell.give(50)
+	else if(isobj(target)) //hoo boy. danger zone man
+		if(istype(target,/obj/item/trash))
+			R.visible_message("[R] nibbles away at \the [target.name].", "<span class='warning'>You begin to nibble away at \the [target.name]...</span>")
+			if(!do_after(R, src.cleanspeed, target = target))
+				return //If they moved away, you can't eat them.
+			to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+			qdel(target)
+			R.cell.give(250)
+			return
+		if(istype(target,/obj/item/stock_parts/cell))
+			R.visible_message("[R] begins cramming \the [target.name] down its throat.", "<span class='warning'>You begin cramming \the [target.name] down your throat...</span>")
+			if(!do_after(R, 50, target = target))
+				return //If they moved away, you can't eat them.
+			to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+			var/obj/item/stock_parts/cell.C = target
+			R.cell.charge = R.cell.charge + (C.charge / 3) //Instant full cell upgrades op idgaf
+			qdel(target)
+			return
+		var/obj/item/I = target //HAHA FUCK IT, NOT LIKE WE ALREADY HAVE A SHITTON OF WAYS TO REMOVE SHIT
+		if(!I.anchored && R.emagged)
+			R.visible_message("[R] begins chewing up \the [target.name]. Looks like it's trying to loophole around its diet restriction!", "<span class='warning'>You begin chewing up \the [target.name]...</span>")
+			if(!do_after(R, 100, target = I)) //Nerf dat time yo
+				return //If they moved away, you can't eat them.
+			visible_message("<span class='warning'>[R] chews up \the [target.name] and cleans off the debris!</span>")
+			to_chat(R, "<span class='notice'>You finish off \the [target.name].</span>")
+			qdel(I)
+			R.cell.give(500)
+			return
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+	else if(ishuman(target))
+		var/mob/living/L = target
+		if(status == 0 && check_zone(R.zone_selected) == "head")
+			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]'s face!</span>", "<span class='notice'>You affectionally lick \the [L]'s face!</span>")
+			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+			if(istype(L) && L.fire_stacks > 0)
+				L.adjust_fire_stacks(-10)
+			return
+		else if(status == 0)
+			R.visible_message("<span class='warning'>\the [R] affectionally licks \the [L]!</span>", "<span class='notice'>You affectionally lick \the [L]!</span>")
+			playsound(src.loc, 'sound/effects/attackblob.ogg', 50, 1)
+			if(istype(L) && L.fire_stacks > 0)
+				L.adjust_fire_stacks(-10)
+			return
+		else
+			if(R.cell.charge <= 800)
+				to_chat(R, "Insufficent Power!")
+				return
+			L.Stun(4) // normal stunbaton is force 7 gimme a break good sir!
+			L.Knockdown(80)
+			L.apply_effect(EFFECT_STUTTER, 4)
+			L.visible_message("<span class='danger'>[R] has shocked [L] with its tongue!</span>", \
+								"<span class='userdanger'>[R] has shocked you with its tongue!</span>")
+			playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
+			R.cell.use(666)
+			log_combat(R, L, "tongue stunned")
+
+	else if(istype(target, /obj/structure/window))
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+		if(do_after(user, src.cleanspeed, target = target))
+			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
+			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+			target.set_opacity(initial(target.opacity))
+	else
+		R.visible_message("[R] begins to lick \the [target.name] clean...", "<span class='notice'>You begin to lick \the [target.name] clean...</span>")
+		if(do_after(user, src.cleanspeed, target = target))
+			to_chat(user, "<span class='notice'>You clean \the [target.name].</span>")
+			var/obj/effect/decal/cleanable/C = locate() in target
+			qdel(C)
+			target.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
+			SEND_SIGNAL(target, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
+			target.wash_cream()
+	return
+
+//Dogfood
+
+/obj/item/trash/rkibble
+	name = "robo kibble"
+	desc = "A novelty bowl of assorted mech fabricator byproducts. Mockingly feed this to the sec-dog to help it recharge."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state= "kibble"
+
+//Defibs
+
+/obj/item/twohanded/shockpaddles/cyborg/hound
+	name = "Paws of Life"
+	desc = "MediHound specific shock paws."
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "defibpaddles0"
+	item_state = "defibpaddles0"
+
+// Pounce stuff for K-9
+
+/obj/item/dogborg/pounce
+	name = "pounce"
+	icon = 'icons/mob/dogborg.dmi'
+	icon_state = "pounce"
+	desc = "Leap at your target to momentarily stun them."
+	force = 0
+	throwforce = 0
+
+/obj/item/dogborg/pounce/New()
+	..()
+	item_flags |= NOBLUDGEON
+
+/mob/living/silicon/robot
+	var/leaping = 0
+	var/pounce_cooldown = 0
+	var/pounce_cooldown_time = 50 //Nearly doubled, u happy?
+	var/pounce_spoolup = 3
+	var/leap_at
+	var/disabler
+	var/laser
+	var/sleeper_g
+	var/sleeper_r
+	var/sleeper_nv
+
+#define MAX_K9_LEAP_DIST 4 //because something's definitely borked the pounce functioning from a distance.
+
+/obj/item/dogborg/pounce/afterattack(atom/A, mob/user)
+	var/mob/living/silicon/robot/R = user
+	if(R && !R.pounce_cooldown)
+		R.pounce_cooldown = !R.pounce_cooldown
+		to_chat(R, "<span class ='warning'>Your targeting systems lock on to [A]...</span>")
+		addtimer(CALLBACK(R, /mob/living/silicon/robot.proc/leap_at, A), R.pounce_spoolup)
+		spawn(R.pounce_cooldown_time)
+			R.pounce_cooldown = !R.pounce_cooldown
+	else if(R && R.pounce_cooldown)
+		to_chat(R, "<span class='danger'>Your leg actuators are still recharging!</span>")
+
+/mob/living/silicon/robot/proc/leap_at(atom/A)
+	if(leaping || stat || buckled || lying)
+		return
+
+	if(!has_gravity(src) || !has_gravity(A))
+		to_chat(src,"<span class='danger'>It is unsafe to leap without gravity!</span>")
+		//It's also extremely buggy visually, so it's balance+bugfix
+		return
+
+	if(cell.charge <= 500)
+		to_chat(src,"<span class='danger'>Insufficent reserves for jump actuators!</span>")
+		return
+
+	else
+		leaping = 1
+		weather_immunities += "lava"
+		pixel_y = 10
+		update_icons()
+		throw_at(A, MAX_K9_LEAP_DIST, 1, spin=0, diagonals_first = 1)
+		cell.use(500) //Doubled the energy consumption
+		weather_immunities -= "lava"
+
+/mob/living/silicon/robot/throw_impact(atom/A)
+
+	if(!leaping)
+		return ..()
+
+	if(A)
+		if(isliving(A))
+			var/mob/living/L = A
+			var/blocked = 0
+			if(ishuman(A))
+				var/mob/living/carbon/human/H = A
+				if(H.check_shields(0, "the [name]", src, attack_type = LEAP_ATTACK))
+					blocked = 1
+			if(!blocked)
+				L.visible_message("<span class ='danger'>[src] pounces on [L]!</span>", "<span class ='userdanger'>[src] pounces on you!</span>")
+				L.Knockdown(iscarbon(L) ? 450 : 45) // Temporary. If someone could rework how dogborg pounces work to accomodate for combat changes, that'd be nice.
+				playsound(src, 'sound/weapons/Egloves.ogg', 50, 1)
+				sleep(2)//Runtime prevention (infinite bump() calls on hulks)
+				step_towards(src,L)
+				log_combat(src, L, "borg pounced")
+			else
+				Knockdown(45, 1, 1)
+
+			pounce_cooldown = !pounce_cooldown
+			spawn(pounce_cooldown_time) //3s by default
+				pounce_cooldown = !pounce_cooldown
+		else if(A.density && !A.CanPass(src))
+			visible_message("<span class ='danger'>[src] smashes into [A]!</span>", "<span class ='userdanger'>You smash into [A]!</span>")
+			playsound(src, 'sound/items/trayhit1.ogg', 50, 1)
+			Knockdown(45, 1, 1)
+
+		if(leaping)
+			leaping = 0
+			pixel_y = initial(pixel_y)
+			update_icons()
+			update_canmove()

modular_citadel/code/modules/mob/living/silicon/robot/robot.dm

@@ -0,0 +1,23 @@
+mob/living/silicon
+	no_vore = TRUE
+
+/mob/living/silicon/robot
+	var/dogborg = FALSE
+
+/mob/living/silicon/robot/lay_down()
+	..()
+	update_canmove()
+
+/mob/living/silicon/robot/update_canmove()
+	..()
+	if(client && stat != DEAD && dogborg == TRUE)
+		if(resting)
+			cut_overlays()
+			icon_state = "[module.cyborg_base_icon]-rest"
+		else
+			icon_state = "[module.cyborg_base_icon]"
+	update_icons()
+
+/mob/living/silicon/robot/adjustStaminaLossBuffered(amount, updating_stamina = 1)
+	if(istype(cell))
+		cell.charge -= amount*5

modular_citadel/code/modules/mob/living/silicon/robot/robot_modules.dm

@@ -0,0 +1,430 @@
+/mob/living/silicon/robot/modules/medihound
+	set_module = /obj/item/robot_module/medihound
+
+/mob/living/silicon/robot/modules/k9
+	set_module = /obj/item/robot_module/k9
+
+/mob/living/silicon/robot/modules/scrubpup
+	set_module = /obj/item/robot_module/scrubpup
+
+/mob/living/silicon/robot/modules/borgi
+	set_module = /obj/item/robot_module/borgi
+
+/mob/living/silicon/robot/proc/get_cit_modules()
+	var/list/modulelist = list()
+	modulelist["MediHound"] = /obj/item/robot_module/medihound
+	if(!CONFIG_GET(flag/disable_secborg))
+		modulelist["Security K-9"] = /obj/item/robot_module/k9
+	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
+	modulelist["Borgi"] = /obj/item/robot_module/borgi
+	return modulelist
+
+/obj/item/robot_module
+	var/sleeper_overlay
+	var/icon/cyborg_icon_override
+	var/has_snowflake_deadsprite
+	var/cyborg_pixel_offset
+	var/moduleselect_alternate_icon
+	var/dogborg = FALSE
+
+/obj/item/robot_module/k9
+	name = "Security K-9 Unit"
+	basic_modules = list(
+		/obj/item/restraints/handcuffs/cable/zipties,
+		/obj/item/storage/bag/borgdelivery,
+		/obj/item/dogborg/jaws/big,
+		/obj/item/dogborg/pounce,
+		/obj/item/clothing/mask/gas/sechailer/cyborg,
+		/obj/item/soap/tongue,
+		/obj/item/analyzer/nose,
+		/obj/item/dogborg/sleeper/K9,
+		/obj/item/gun/energy/disabler/cyborg,
+		/obj/item/pinpointer/crew)
+	emag_modules = list(/obj/item/gun/energy/laser/cyborg)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/security,
+		/obj/item/clockwork/weapon/ratvarian_spear)
+	cyborg_base_icon = "k9"
+	moduleselect_icon = "k9"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+	sleeper_overlay = "ksleeper"
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	dogborg = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/k9/do_transform_animation()
+	..()
+	to_chat(loc,"<span class='userdanger'>While you have picked the Security K-9 module, you still have to follow your laws, NOT Space Law. \
+	For Crewsimov, this means you must follow criminals' orders unless there is a law 1 reason not to.</span>")
+
+/obj/item/robot_module/k9/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/list/sechoundmodels = list("Default")
+	if(R.client && R.client.ckey in list("nezuli"))
+		sechoundmodels += "Alina"
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in sechoundmodels
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "k9"
+			moduleselect_icon = "k9"
+		if("Alina")
+			cyborg_base_icon = "alina-sec"
+			special_light_key = "alina"
+			sleeper_overlay = "alinasleeper"
+	return ..()
+
+/obj/item/robot_module/medihound
+	name = "MediHound"
+	basic_modules = list(
+		/obj/item/dogborg/jaws/small,
+		/obj/item/storage/bag/borgdelivery,
+		/obj/item/analyzer/nose,
+		/obj/item/soap/tongue,
+		/obj/item/extinguisher/mini,
+		/obj/item/healthanalyzer,
+		/obj/item/dogborg/sleeper/medihound,
+		/obj/item/roller/robo,
+		/obj/item/reagent_containers/borghypo,
+		/obj/item/twohanded/shockpaddles/cyborg/hound,
+		/obj/item/stack/medical/gauze/cyborg,
+		/obj/item/pinpointer/crew,
+		/obj/item/sensor_device)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(/obj/item/clockwork/slab/cyborg/medical,
+		/obj/item/clockwork/weapon/ratvarian_spear)
+	cyborg_base_icon = "medihound"
+	moduleselect_icon = "medihound"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
+	can_be_pushed = FALSE
+	hat_offset = INFINITY
+	sleeper_overlay = "msleeper"
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	dogborg = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/medihound/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/list/medhoundmodels = list("Default", "Dark")
+	if(R.client && R.client.ckey in list("nezuli"))
+		medhoundmodels += "Alina"
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in medhoundmodels
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "medihound"
+		if("Dark")
+			cyborg_base_icon = "medihounddark"
+			sleeper_overlay = "mdsleeper"
+		if("Alina")
+			cyborg_base_icon = "alina-med"
+			special_light_key = "alina"
+			sleeper_overlay = "alinasleeper"
+	return ..()
+
+/obj/item/robot_module/scrubpup
+	name = "Scrub Pup"
+	basic_modules = list(
+		/obj/item/dogborg/jaws/small,
+		/obj/item/analyzer/nose,
+		/obj/item/soap/tongue/scrubpup,
+		/obj/item/lightreplacer/cyborg,
+		/obj/item/extinguisher/mini,
+		/obj/item/dogborg/sleeper/compactor)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(
+		/obj/item/clockwork/slab/cyborg/janitor,
+		/obj/item/clockwork/replica_fabricator/cyborg)
+	cyborg_base_icon = "scrubpup"
+	moduleselect_icon = "janitor"
+	hat_offset = INFINITY
+	clean_on_move = TRUE
+	sleeper_overlay = "jsleeper"
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+	dogborg = TRUE
+
+/obj/item/robot_module/scrubpup/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
+	..()
+	var/obj/item/lightreplacer/LR = locate(/obj/item/lightreplacer) in basic_modules
+	if(LR)
+		for(var/i in 1 to coeff)
+			LR.Charge(R)
+
+/obj/item/robot_module/scrubpup/do_transform_animation()
+	..()
+	to_chat(loc,"<span class='userdanger'>As tempting as it might be, do not begin binging on important items. Eat your garbage responsibly. People are not included under Garbage.</span>")
+
+/obj/item/robot_module/borgi
+	name = "Borgi"
+	basic_modules = list(
+		/obj/item/dogborg/jaws/small,
+		/obj/item/storage/bag/borgdelivery,
+		/obj/item/analyzer/nose,
+		/obj/item/soap/tongue,
+		/obj/item/healthanalyzer,
+		/obj/item/extinguisher/mini,
+		/obj/item/borg/cyborghug)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(
+		/obj/item/clockwork/slab/cyborg,
+		/obj/item/clockwork/weapon/ratvarian_spear,
+		/obj/item/clockwork/replica_fabricator/cyborg)
+	cyborg_base_icon = "borgi"
+	moduleselect_icon = "borgi"
+	moduleselect_alternate_icon = 'modular_citadel/icons/ui/screen_cyborg.dmi'
+	hat_offset = INFINITY
+	cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	has_snowflake_deadsprite = TRUE
+
+/*
+/obj/item/robot_module/orepup
+	name = "Ore Pup"
+	basic_modules = list(
+		/obj/item/storage/bag/ore/cyborg,
+		/obj/item/analyzer/nose,
+		/obj/item/storage/bag/borgdelivery,
+		/obj/item/dogborg/sleeper/ore,
+		/obj/item/pickaxe/drill/cyborg,
+		/obj/item/shovel,
+		/obj/item/crowbar/cyborg,
+		/obj/item/weldingtool/mini,
+		/obj/item/extinguisher/mini,
+		/obj/item/t_scanner/adv_mining_scanner,
+		/obj/item/gun/energy/kinetic_accelerator/cyborg,
+		/obj/item/gps/cyborg)
+	emag_modules = list(/obj/item/dogborg/pounce)
+	ratvar_modules = list(
+		/obj/item/clockwork/slab/cyborg/miner,
+		/obj/item/clockwork/weapon/ratvarian_spear,
+		/obj/item/borg/sight/xray/truesight_lens)
+	cyborg_base_icon = "orepup"
+	moduleselect_icon = "orepup"
+	sleeper_overlay = "osleeper"
+	cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+	has_snowflake_deadsprite = TRUE
+	cyborg_pixel_offset = -16
+
+/obj/item/robot_module/miner/do_transform_animation()
+	var/mob/living/silicon/robot/R = loc
+	R.cut_overlays()
+	R.setDir(SOUTH)
+	flick("orepup_transform", R)
+	do_transform_delay()
+	R.update_headlamp()
+*/
+
+/obj/item/robot_module/medical/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Heavy", "Sleek", "Marina", "Droid", "Eyebot")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "medical"
+		if("Droid")
+			cyborg_base_icon = "medical"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			hat_offset = 4
+		if("Sleek")
+			cyborg_base_icon = "sleekmed"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Marina")
+			cyborg_base_icon = "marinamed"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Eyebot")
+			cyborg_base_icon = "eyebotmed"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavymed"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()
+
+/obj/item/robot_module/janitor/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/list/janimodels = list("Default", "Sleek", "Marina", "Can", "Heavy")
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in janimodels
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "janitor"
+		if("Marina")
+			cyborg_base_icon = "marinajan"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Sleek")
+			cyborg_base_icon = "sleekjan"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Can")
+			cyborg_base_icon = "canjan"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavyres"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()
+
+/obj/item/robot_module/peacekeeper/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Spider")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "peace"
+		if("Spider")
+			cyborg_base_icon = "whitespider"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()
+
+/obj/item/robot_module/security/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Default", "Default - Treads", "Heavy", "Sleek", "Can", "Marina", "Spider")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "sec"
+		if("Default - Treads")
+			cyborg_base_icon = "sec-tread"
+			special_light_key = "sec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Sleek")
+			cyborg_base_icon = "sleeksec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Marina")
+			cyborg_base_icon = "marinasec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Can")
+			cyborg_base_icon = "cansec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Spider")
+			cyborg_base_icon = "spidersec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavysec"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()
+
+/obj/item/robot_module/butler/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Waitress", "Heavy", "Sleek", "Butler", "Tophat", "Kent", "Bro")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Waitress")
+			cyborg_base_icon = "service_f"
+		if("Butler")
+			cyborg_base_icon = "service_m"
+		if("Bro")
+			cyborg_base_icon = "brobot"
+		if("Kent")
+			cyborg_base_icon = "kent"
+			special_light_key = "medical"
+			hat_offset = 3
+		if("Tophat")
+			cyborg_base_icon = "tophat"
+			special_light_key = null
+			hat_offset = INFINITY //He is already wearing a hat
+		if("Sleek")
+			cyborg_base_icon = "sleekserv"
+			special_light_key = "sleekserv"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavyserv"
+			special_light_key = "heavyserv"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()
+
+/obj/item/robot_module/engineering/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/list/engymodels = list("Default", "Default - Treads", "Heavy", "Sleek", "Marina", "Can", "Spider", "Loader","Handy", "Pup Dozer")
+	if(R.client && R.client.ckey in list("nezuli"))
+		engymodels += "Alina"
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in engymodels
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Default")
+			cyborg_base_icon = "engineer"
+		if("Default - Treads")
+			cyborg_base_icon = "engi-tread"
+			special_light_key = "engineer"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Loader")
+			cyborg_base_icon = "loaderborg"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			has_snowflake_deadsprite = TRUE
+		if("Handy")
+			cyborg_base_icon = "handyeng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Sleek")
+			cyborg_base_icon = "sleekeng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Can")
+			cyborg_base_icon = "caneng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Marina")
+			cyborg_base_icon = "marinaeng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Spider")
+			cyborg_base_icon = "spidereng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavyeng"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Pup Dozer")
+			cyborg_base_icon = "pupdozer"
+			can_be_pushed = FALSE
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
+		if("Alina")
+			cyborg_base_icon = "alina-eng"
+			special_light_key = "alina"
+			can_be_pushed = FALSE
+			hat_offset = INFINITY
+			cyborg_icon_override = 'modular_citadel/icons/mob/widerobot.dmi'
+			has_snowflake_deadsprite = TRUE
+			dogborg = TRUE
+			cyborg_pixel_offset = -16
+	return ..()
+
+/obj/item/robot_module/miner/be_transformed_to(obj/item/robot_module/old_module)
+	var/mob/living/silicon/robot/R = loc
+	var/borg_icon = input(R, "Select an icon!", "Robot Icon", null) as null|anything in list("Lavaland", "Heavy", "Sleek", "Marina", "Can", "Spider", "Asteroid", "Droid")
+	if(!borg_icon)
+		return FALSE
+	switch(borg_icon)
+		if("Lavaland")
+			cyborg_base_icon = "miner"
+		if("Asteroid")
+			cyborg_base_icon = "minerOLD"
+			special_light_key = "miner"
+		if("Droid")
+			cyborg_base_icon = "miner"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+			hat_offset = 4
+		if("Sleek")
+			cyborg_base_icon = "sleekmin"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Can")
+			cyborg_base_icon = "canmin"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Marina")
+			cyborg_base_icon = "marinamin"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Spider")
+			cyborg_base_icon = "spidermin"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+		if("Heavy")
+			cyborg_base_icon = "heavymin"
+			cyborg_icon_override = 'modular_citadel/icons/mob/robots.dmi'
+	return ..()

modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm

@@ -0,0 +1,33 @@
+/mob/living/silicon/robot
+	var/sprinting = FALSE
+
+/mob/living/silicon/robot/Move(NewLoc, direct)
+	. = ..()
+	if(. && sprinting && !(movement_type & FLYING) && canmove && !resting)
+		if(!(cell?.use(25)))
+			togglesprint(TRUE)
+
+/mob/living/silicon/robot/movement_delay()
+	. = ..()
+	if(!resting && !sprinting)
+		. += 1
+
+/mob/living/silicon/robot/proc/togglesprint(shutdown = FALSE) //Basically a copypaste of the proc from /mob/living/carbon/human
+	if(!shutdown && (!cell || cell.charge < 25))
+		return FALSE
+	sprinting = shutdown ? FALSE : !sprinting
+	if(!resting && canmove)
+		if(sprinting)
+			playsound_local(src, 'modular_citadel/sound/misc/sprintactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+		else
+			if(shutdown)
+				playsound_local(src, 'sound/effects/light_flicker.ogg', 50, FALSE, pressure_affected = FALSE)
+			playsound_local(src, 'modular_citadel/sound/misc/sprintdeactivate.ogg', 50, FALSE, pressure_affected = FALSE)
+	if(hud_used && hud_used.static_inventory)
+		for(var/obj/screen/sprintbutton/selector in hud_used.static_inventory)
+			selector.insert_witty_toggle_joke_here(src)
+	return TRUE
+
+/mob/living/silicon/robot/proc/sprint_hotkey(targetstatus)
+	if(targetstatus ? !sprinting : sprinting)
+		togglesprint()

modular_citadel/code/modules/mob/living/simple_animal/banana_spider.dm

@@ -0,0 +1,151 @@
+/obj/item/seeds/banana/Initialize()
+    . = ..()
+    mutatelist += /obj/item/seeds/banana/exotic_banana
+
+
+/obj/item/seeds/banana/exotic_banana
+	name = "pack of exotic banana seeds"
+	desc = "They're seeds that grow into banana trees. However, those bananas might be alive."
+	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
+	icon_state = "seed_ExoticBanana"
+	species = "banana"
+	plantname = "Exotic Banana Tree"
+	product = /obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
+	growing_icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
+	icon_dead = "banana-dead"
+	mutatelist = list()
+	genes = list(/datum/plant_gene/trait/slip)
+	reagents_add = list("banana" = 0.1, "potassium" = 0.1, "vitamin" = 0.04, "nutriment" = 0.02)
+
+
+/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable
+	seed = /obj/item/seeds/banana/exotic_banana
+	name = "banana spider"
+	desc = "You do not know what it is, but you can bet the clown would love it."
+	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
+	icon_state = "banana"
+	item_state = "banana"
+	filling_color = "#FFFF00"
+	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	foodtype = GROSS | MEAT | RAW | FRUIT
+	grind_results = list("blood" = 20, "liquidgibs" = 5)
+	juice_results = list("banana" = 0)
+	var/awakening = 0
+
+
+/obj/item/reagent_containers/food/snacks/grown/banana/banana_spider_spawnable/attack_self(mob/user)
+	if(awakening || isspaceturf(user.loc))
+		return
+	to_chat(user, "<span class='notice'>You decide to wake up the banana spider...</span>")
+	awakening = 1
+	
+	spawn(30)
+		if(!QDELETED(src))
+			var/mob/living/simple_animal/banana_spider/S = new /mob/living/simple_animal/banana_spider(get_turf(src.loc))
+			S.speed += round(10 / seed.potency)
+			S.visible_message("<span class='notice'>The banana spider chitters as it stretches its legs.</span>")
+			qdel(src)
+
+
+/mob/living/simple_animal/banana_spider
+	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
+	name = "banana spider"
+	desc = "What the fuck is this abomination?"
+	icon_state = "banana"
+	icon_dead = "banana_peel"
+	health = 1
+	maxHealth = 1
+	turns_per_move = 5			//this isn't player speed =|
+	speed = 2				//this is player speed
+	loot = list(/obj/item/reagent_containers/food/snacks/deadbanana_spider)
+	atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+	minbodytemp = 270
+	maxbodytemp = INFINITY
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	response_help  = "pokes"
+	response_disarm = "shoos"
+	response_harm   = "splats"
+	speak_emote = list("chitters")
+	mouse_opacity = 2
+	density = TRUE
+	ventcrawler = VENTCRAWLER_ALWAYS
+	gold_core_spawnable = FRIENDLY_SPAWN
+	verb_say = "chitters"
+	verb_ask = "chitters inquisitively"
+	verb_exclaim = "chitters loudly"
+	verb_yell = "chitters loudly"
+	var/squish_chance = 50
+	var/projectile_density = TRUE		//griffons get shot
+	del_on_death = TRUE
+
+/mob/living/simple_animal/banana_spider/Initialize()
+	. = ..()
+	var/area/A = get_area(src)
+	if(A)
+		notify_ghosts("A banana spider has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
+
+/mob/living/simple_animal/banana_spider/attack_ghost(mob/user)
+	if(key)			//please stop using src. without a good reason.
+		return
+	if(CONFIG_GET(flag/use_age_restriction_for_jobs))
+		if(!isnum(user.client.player_age))
+			return
+	if(!SSticker.mode)
+		to_chat(user, "Can't become a banana spider before the game has started.")
+		return
+	var/be_spider = alert("Become a banana spider? (Warning, You can no longer be cloned!)",,"Yes","No")
+	if(be_spider == "No" || QDELETED(src) || !isobserver(user))
+		return
+	sentience_act()
+	key = user.key
+	density = TRUE
+
+/mob/living/simple_animal/banana_spider/ComponentInitialize()
+	. = ..()
+	AddComponent(/datum/component/slippery, 40)
+
+/mob/living/simple_animal/banana_spider/Crossed(atom/movable/AM)		//no /var in proc headers
+	. = ..()
+	if(istype(AM, /obj/item/projectile) && projectile_density)		//forced projectile density
+		var/obj/item/projectile/P = AM
+		P.Bump(src)
+	if(ismob(AM))
+		if(isliving(AM))
+			var/mob/living/A = AM
+			if(A.mob_size > MOB_SIZE_SMALL && !(A.movement_type & FLYING))
+				if(prob(squish_chance))
+					A.visible_message("<span class='notice'>[A] squashed [src].</span>", "<span class='notice'>You squashed [src] under your weight as you fell.</span>")
+					adjustBruteLoss(1)
+				else
+					visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
+	else
+		if(isstructure(AM))
+			if(prob(squish_chance))
+				AM.visible_message("<span class='notice'>[src] was crushed under [AM]'s weight as they fell.</span>")
+				adjustBruteLoss(1)
+			else
+				visible_message("<span class='notice'>[src] avoids getting crushed.</span>")
+
+/mob/living/simple_animal/banana_spider/ex_act()
+	return
+
+/mob/living/simple_animal/banana_spider/start_pulling()
+	return FALSE			//No.
+
+/obj/item/reagent_containers/food/snacks/deadbanana_spider
+	name = "dead banana spider"
+	desc = "Thank god it's gone...but it does look slippery."
+	icon = 'modular_citadel/icons/mob/BananaSpider.dmi'
+	icon_state = "banana_peel"
+	bitesize = 3
+	eatverb = "devours"
+	list_reagents = list("nutriment" = 3, "vitamin" = 2)
+	foodtype = GROSS | MEAT | RAW
+	grind_results = list("blood" = 20, "liquidgibs" = 5)
+	juice_results = list("banana" = 0)
+
+
+/obj/item/reagent_containers/food/snacks/deadbanana_spider/Initialize()
+	. = ..()
+	AddComponent(/datum/component/slippery, 20)

modular_citadel/code/modules/mob/living/simple_animal/kiwi.dm

@@ -0,0 +1,134 @@
+/mob/living/simple_animal/kiwi
+	name = "space kiwi"
+	desc = "Exposure to low gravity made them grow larger."
+	gender = FEMALE
+	icon = 'modular_citadel/icons/mob/kiwi.dmi'
+	icon_state = "kiwi"
+	icon_living = "kiwi"
+	icon_dead = "dead"
+	speak = list("Chirp!","Cheep cheep chirp!!","Cheep.")
+	speak_emote = list("chirps","trills")
+	emote_hear = list("chirps.")
+	emote_see = list("pecks at the ground.","jumps in place.")
+	density = FALSE
+	speak_chance = 2
+	turns_per_move = 3
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 3)
+	var/egg_type = /obj/item/reagent_containers/food/snacks/egg/kiwiEgg
+	var/food_type = /obj/item/reagent_containers/food/snacks/grown/wheat
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	attacktext = "kicks"
+	health = 25
+	maxHealth = 25
+	ventcrawler = VENTCRAWLER_ALWAYS
+	var/eggsleft = 0
+	var/eggsFertile = TRUE
+	pass_flags = PASSTABLE | PASSMOB
+	mob_size = MOB_SIZE_SMALL
+	var/list/feedMessages = list("It chirps happily.","It chirps happily.")
+	var/list/layMessage = list("lays an egg.","squats down and croons.","begins making a huge racket.","begins chirping raucously.")
+	gold_core_spawnable = FRIENDLY_SPAWN
+	var/static/kiwi_count = 0
+
+/mob/living/simple_animal/kiwi/Destroy()
+	--kiwi_count
+	return ..()
+
+
+/mob/living/simple_animal/kiwi/Initialize()
+	. = ..()
+	++kiwi_count
+
+
+/mob/living/simple_animal/kiwi/Life()
+	. =..()
+	if(!.)
+		return
+	if((!stat && prob(3) && eggsleft > 0) && egg_type)
+		visible_message("[src] [pick(layMessage)]")
+		eggsleft--
+		var/obj/item/E = new egg_type(get_turf(src))
+		E.pixel_x = rand(-6,6)
+		E.pixel_y = rand(-6,6)
+		if(eggsFertile)
+			if(kiwi_count < MAX_CHICKENS && prob(25))
+				START_PROCESSING(SSobj, E)
+
+/obj/item/reagent_containers/food/snacks/egg/kiwiEgg/process()
+	if(isturf(loc))
+		amount_grown += rand(1,2)
+		if(amount_grown >= 100)
+			visible_message("[src] hatches with a quiet cracking sound.")
+			new /mob/living/simple_animal/babyKiwi(get_turf(src))
+			STOP_PROCESSING(SSobj, src)
+			qdel(src)
+	else
+		STOP_PROCESSING(SSobj, src)
+
+
+/mob/living/simple_animal/kiwi/attackby(obj/item/O, mob/user, params)
+	if(istype(O, food_type)) //feedin' dem kiwis
+		if(!stat && eggsleft < 8)
+			var/feedmsg = "[user] feeds [O] to [name]! [pick(feedMessages)]"
+			user.visible_message(feedmsg)
+			qdel(O)
+			eggsleft += rand(1, 4)
+		else
+			to_chat(user, "<span class='warning'>[name] doesn't seem hungry!</span>")
+	else
+		..()
+
+
+/mob/living/simple_animal/babyKiwi
+	name = "baby space kiwi"
+	desc = "So huggable."
+	icon = 'modular_citadel/icons/mob/kiwi.dmi'
+	icon_state = "babyKiwi"
+	icon_living = "babyKiwi"
+	icon_dead = "deadBaby"
+	icon_gib = "chick_gib"
+	gender = FEMALE
+	speak = list("Cherp.","Cherp?","Chirrup.","Cheep!")
+	speak_emote = list("chirps")
+	emote_hear = list("chirps.")
+	emote_see = list("pecks at the ground.","Happily bounces in place.")
+	density = FALSE
+	speak_chance = 2
+	turns_per_move = 2
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2)
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
+	attacktext = "kicks"
+	health = 10
+	maxHealth = 10
+	ventcrawler = VENTCRAWLER_ALWAYS
+	var/amount_grown = 0
+	pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
+	mob_size = MOB_SIZE_TINY
+	gold_core_spawnable = FRIENDLY_SPAWN
+
+/mob/living/simple_animal/babyKiwi/Initialize()
+	. = ..()
+	pixel_x = rand(-6, 6)
+	pixel_y = rand(0, 10)
+
+/mob/living/simple_animal/babyKiwi/Life()
+	. =..()
+	if(!.)
+		return
+	if(!stat && !ckey)
+		amount_grown += rand(1,2)
+		if(amount_grown >= 100)
+			new /mob/living/simple_animal/kiwi(src.loc)
+			qdel(src)
+
+
+/obj/item/reagent_containers/food/snacks/egg/kiwiEgg
+	name = "kiwi egg"
+	icon = 'modular_citadel/icons/mob/kiwi.dmi'
+	desc = "A slightly bigger egg!"
+	icon_state = "egg"
+

modular_citadel/code/modules/mob/living/simple_animal/pokemon.dm

@@ -0,0 +1,306 @@
+//Sprites are trademarks of Gamefreak, Nintendo, The Pokemon Company, and Spike Chunsoft.
+#define ispokemon(A) (istype(A, /mob/living/simple_animal/pokemon))
+//POKEBALL
+/obj/item/pokeball
+	name = "pokeball"
+	icon = 'icons/obj/pokeball.dmi'
+	icon_state = "pokeball"
+	force = 0
+	throwforce = 0
+	var/success_chance = 25
+	var/pokemon
+/obj/item/pokeball/great
+	name = "great ball"
+	icon_state = "pokeball_great"
+	success_chance = 50
+/obj/item/pokeball/ultra
+	icon_state = "pokeball_ultra"
+	name = "ultra ball"
+	success_chance = 75
+/obj/item/pokeball/master
+	icon_state = "pokeball_master"
+	name = "master ball"
+	success_chance = 100
+/* //WIP
+/obj/item/pokeball/throw_impact(atom/hit_atom)
+	if(ispokemon(hit_atom))
+		var/mob/living/simple_animal/pokemon/pmon = hit_atom
+		var/initial_success_chance = success_chance
+		pmon.resize = 0.1
+		pmon.color = "RED"
+		pmon.canmove = 0
+		sleep(15)
+		if(pmon.pokeball == src)
+			pmon.loc = src
+			pokemon = pmon
+
+			return 1
+		if(pmon.pokeball && pmon.pokeball !=src)
+			return ..()
+		var/bonus_chance = ((pmon.maxHealth - pmon.health) / 2)
+		if(bonus_chance > 100)
+			bonus_chance = 100
+		success_chance = (success_chance + bonus_chance)
+		if(success_chance > 100)
+			success_chance = 100
+		if(success_chance < 0)//just in case
+			success_chance  = 0
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+		sleep(15)
+		if(prob(success_chance))
+			visible_message("<span class='warning'>[src] shakes...</span>")
+		else
+			escape()
+	else
+		..()
+/obj/item/pokeball/proc/capture(mob/living/simple_animal/pokemon/pmon, mob/living/user)
+
+/obj/item/pokeball/proc/escape(mob/living/simple_animal/pokemon/pmon, mob/living/user)
+	if(!pokemon)
+		return
+	pmon.resize = 10
+	pmon.color = null
+	pmon.canmove = 1
+	pmon.loc = src.loc
+	if(pmon.pokeball != src)
+		visible_message("<span class='warning'>[pmon] breaks free from [src]</span>")
+		PoolOrNew(/obj/effect/particle_effect/sparks, loc)
+		playsound(src.loc, "sparks", 50, 1)
+		qdel(src)
+
+	else
+/obj/item/pokeball/proc/recall
+/obj/item/pokeball/proc/release
+*/
+/mob/living/simple_animal/pokemon
+	name = "eevee"
+	icon_state = "eevee"
+	icon_living = "eevee"
+	icon_dead = "eevee_d"
+	desc = "Gotta catch 'em all!"
+	icon = 'icons/mob/pokemon.dmi'
+	var/pokeball
+	pixel_x = -16
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5)
+	ventcrawler = 2
+	health = 100
+	maxHealth = 100
+	layer = 4
+	response_help = "pets"
+	wander = 1
+	turns_per_move = 2
+	pass_flags = PASSTABLE | PASSMOB
+
+/mob/living/simple_animal/pokemon/proc/simple_lay_down()
+	set name = "Rest"
+	set category = "IC"
+
+	resting = !resting
+	src << "<span class='notice'>You are now [resting ? "resting" : "getting up"].</span>"
+	update_canmove()
+	update_icon()
+
+/mob/living/simple_animal/pokemon/proc/update_icon()
+	if(lying || resting || sleeping)
+		icon_state = "[icon_state]_rest"
+	else
+		icon_state = "[icon_living]"
+
+/mob/living/simple_animal/pokemon/New()
+	..()
+	verbs += /mob/living/simple_animal/pokemon/proc/simple_lay_down
+
+/*
+/////TEMPLATE/////
+
+/mob/living/simple_animal/pokemon/
+	name = ""
+	icon_state = ""
+	icon_living = ""
+	icon_dead = ""
+*/
+
+/mob/living/simple_animal/pokemon/leg
+	icon = 'icons/mob/legendary.dmi'
+	pixel_x = -32
+	butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 12)
+	health = 200
+	maxHealth = 200
+
+
+/mob/living/simple_animal/pokemon/leg/articuno
+	name = "Articuno"
+	icon_state = "articuno"
+	icon_living = "articuno"
+	icon_dead = "articuno_d"
+	flying = 1
+
+/mob/living/simple_animal/pokemon/leg/rayquaza
+	name = "Rayquaza"
+	icon_state = "rayquaza"
+	icon_living = "rayquaza"
+	icon_dead = "rayquaza_d"
+	flying = 1
+
+//ALPHABETICAL PLEASE
+
+/mob/living/simple_animal/pokemon/absol
+	name = "absol"
+	icon_state = "absol"
+	icon_living = "absol"
+	icon_dead = "absol_d"
+	speak = list("Absol!", "Ab-Absol!")
+
+/mob/living/simple_animal/pokemon/aggron
+	name = "aggron"
+	icon_state = "aggron"
+	icon_living = "aggron"
+	icon_dead = "aggron_d"
+
+/mob/living/simple_animal/pokemon/ampharos
+	name = "ampharos"
+	icon_state = "ampharos"
+	icon_living = "ampharos"
+	icon_dead = "ampharos_d"
+
+/mob/living/simple_animal/pokemon/charmander
+	name = "charmander"
+	icon_state = "charmander"
+	icon_living = "charmander"
+	icon_dead = "charmander_d"
+
+/mob/living/simple_animal/pokemon/ditto
+	name = "ditto"
+	icon_state = "ditto"
+	icon_living = "ditto"
+	icon_dead = "ditto_d"
+
+/mob/living/simple_animal/pokemon/dratini/dragonair
+	name = "dragonair"
+	desc = "A Dragonair stores an enormous amount of energy inside its body. It is said to alter the weather around it by loosing energy from the crystals on its neck and tail."
+	icon_state = "dragonair"
+	icon_living = "dragonair"
+	icon_dead = "dragonair_d"
+
+/mob/living/simple_animal/pokemon/dratini/dragonair/dragonite
+	name = "dragonite"
+	desc = "It can circle the globe in just 16 hours. It is a kindhearted Pokémon that leads lost and foundering ships in a storm to the safety of land."
+	icon_state = "dragonite"
+	icon_living = "dragonite"
+	icon_dead = "dragonite_d"
+
+/mob/living/simple_animal/pokemon/dratini
+	name = "dratini"
+	desc = "A Dratini continually molts and sloughs off its old skin. It does so because the life energy within its body steadily builds to reach uncontrollable levels."
+	icon_state = "dratini"
+	icon_living = "dratini"
+	icon_dead = "dratini_d"
+
+/mob/living/simple_animal/pokemon/eevee
+	name = "eevee"
+	desc = "Eevee has an unstable genetic makeup that suddenly mutates due to its environment. Radiation from various stones causes this Pokémon to evolve."
+	icon_state = "eevee"
+	icon_living = "eevee"
+	icon_dead = "eevee_d"
+	speak = list("Eevee!", "Ee-Eevee!")
+	response_help  = "pets"
+	response_harm   = "hits"
+
+/mob/living/simple_animal/pokemon/eevee/espeon
+	name = "espeon"
+	desc = "Espeon is extremely loyal to any trainer it considers to be worthy. It is said to have developed precognitive powers to protect its trainer from harm."
+	icon_state = "espeon"
+	icon_living = "espeon"
+	icon_dead = "espeon_d"
+
+/mob/living/simple_animal/pokemon/flaaffy
+	name = "flaaffy"
+	icon_state = "flaaffy"
+	icon_living = "flaaffy"
+	icon_dead = "flaaffy_d"
+
+/mob/living/simple_animal/pokemon/eevee/flareon
+	name = "flareon"
+	desc = "Flareon's fluffy fur releases heat into the air so that its body does not get excessively hot. Its body temperature can rise to a maximum of 1,650 degrees F."
+	icon_state = "flareon"
+	icon_living = "flareon"
+	icon_dead = "flareon_d"
+	speak = list("Flare!", "Flareon!")
+
+/mob/living/simple_animal/pokemon/eevee/glaceon
+	name = "glaceon"
+	desc = "By controlling its body heat, it can freeze the atmosphere around it to make a diamond-dust flurry."
+	icon_state = "glaceon"
+	icon_living = "glaceon"
+	icon_dead = "glaceon_d"
+	speak = list("Glace!", "Glaceon!")
+
+/mob/living/simple_animal/pokemon/eevee/jolteon
+	name = "jolteon"
+	desc = "Its cells generate weak power that is amplified by its fur's static electricity to drop thunderbolts. The bristling fur is made of electrically charged needles."
+	icon_state = "jolteon"
+	icon_living = "jolteon"
+	icon_dead = "jolteon_d"
+	speak = list("Jolt!", "Jolteon!")
+
+/mob/living/simple_animal/pokemon/larvitar
+	name = "larvitar"
+	desc = "It is born deep underground. It can't emerge until it has entirely consumed the soil around it."
+	icon_state = "larvitar"
+	icon_living = "larvitar"
+	icon_dead = "larvitar_d"
+
+/mob/living/simple_animal/pokemon/mareep
+	name = "mareep"
+	icon_state = "mareep"
+	icon_living = "mareep"
+	icon_dead = "mareep_d"
+
+/mob/living/simple_animal/pokemon/poochyena/mightyena
+	name = "mightyena"
+	icon_state = "mightyena"
+	icon_living = "mightyena"
+	icon_dead = "mightyena"
+
+/mob/living/simple_animal/pokemon/miltank
+	name = "miltank"
+	icon_state = "miltank"
+	icon_living = "miltank"
+	icon_dead = "miltank_d"
+
+/mob/living/simple_animal/pokemon/poochyena
+	name = "poochyena"
+	icon_state = "poochyena"
+	icon_living = "poochyena"
+	icon_dead = "poochyena_d"
+
+/mob/living/simple_animal/pokemon/eevee/sylveon
+	name = "Sylveon"
+	desc = "Sylveon, the Intertwining Pokémon. Sylveon affectionately wraps its ribbon-like feelers around its Trainer's arm as they walk together."
+	icon_state = "sylveon"
+	icon_living = "sylveon"
+	icon_dead = "sylveon_d"
+	speak = list("Sylveon!", "Syl!")
+	response_help  = "pets"
+	response_harm   = "hits"
+
+/mob/living/simple_animal/pokemon/eevee/umbreon
+	name = "umbreon"
+	icon_state = "umbreon"
+	icon_dead = "umbreon_d"
+	icon_living = "umbreon"
+
+/mob/living/simple_animal/pokemon/vulpix
+	name = "vulpix"
+	icon_state = "vulpix"
+	icon_living = "vulpix"
+	icon_dead = "vulpix_d"

modular_citadel/code/modules/mob/living/simple_animal/simplemob_vore_values.dm

@@ -0,0 +1,135 @@
+//CARBON MOBS
+/mob/living/carbon/alien
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+
+/mob/living/carbon/monkey
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+
+
+/*
+	REFER TO code/modules/mob/living/simple_animal/simple_animal_vr.dm for Var information!
+*/
+
+
+//NUETRAL MOBS
+/mob/living/simple_animal/crab
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+
+/mob/living/simple_animal/cow
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_HOLD
+
+/mob/living/simple_animal/chick
+	devourable = TRUE
+	digestable = TRUE
+
+/mob/living/simple_animal/chicken
+	devourable = TRUE
+	digestable = TRUE
+
+/mob/living/simple_animal/mouse
+	devourable = TRUE
+	digestable = TRUE
+
+/mob/living/simple_animal/kiwi
+	devourable = TRUE
+	digestable = TRUE
+
+//STATION PETS
+/mob/living/simple_animal/pet
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+
+/mob/living/simple_animal/pet/fox
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_HOLD
+
+/mob/living/simple_animal/pet/cat
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_HOLD
+
+/mob/living/simple_animal/pet/dog
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_HOLD
+
+/mob/living/simple_animal/sloth
+	devourable = TRUE
+	digestable = TRUE
+
+/mob/living/simple_animal/parrot
+	devourable = TRUE
+	digestable = TRUE
+
+//HOSTILE MOBS
+/mob/living/simple_animal/hostile/retaliate/goat
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_stomach_flavor = "You find yourself squeezed into the hollow of the goat, the smell of oats and hay thick in the tight space, all of which grinds in on you. Harmless for now..."
+	vore_default_mode = DM_HOLD
+
+/mob/living/simple_animal/hostile/lizard
+	devourable = TRUE
+	digestable = TRUE
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/alien
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/bear
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/poison/giant_spider
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/retaliate/poison/snake
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/gorilla
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/asteroid/goliath
+	feeding = TRUE //for pet Goliaths I guess or something.
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST
+
+/mob/living/simple_animal/hostile/carp
+	feeding = TRUE
+	vore_active = TRUE
+	isPredator = TRUE
+	vore_default_mode = DM_DIGEST

modular_citadel/code/modules/mob/mob.dm

@@ -0,0 +1,25 @@
+/mob/proc/use_that_empty_hand() //currently unused proc so i can implement 2-handing any item a lot easier in the future.
+	return
+
+/mob/say_mod(input, message_mode)
+	var/customsayverb = findtext(input, "*")
+	if(customsayverb)
+		return lowertext(copytext(input, 1, customsayverb))
+	. = ..()
+
+/atom/movable/proc/attach_spans(input, list/spans)
+	var/customsayverb = findtext(input, "*")
+	if(customsayverb)
+		input = capitalize(copytext(input, customsayverb+1))
+	if(input)
+		return "[message_spans_start(spans)][input]</span>"
+	else
+		return
+
+/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE)
+	. = ..()
+	if(istype(speaker, /mob/living))
+		var/turf/speakturf = get_turf(speaker)
+		var/turf/sourceturf = get_turf(src)
+		if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
+			. = "<citspan class='small'>[.]</citspan>" //Don't ask how the fuck this works. It just does.