Merge branch 'magrifles_again' of github.com-kevinz000:Citadel-Station-13/Citadel-Station-13 into magrifles_again

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

@@ -18,9 +18,13 @@
 					return FALSE
 	return .
 
-/mob/living/carbon/proc/toggle_combat_mode()
+/mob/living/carbon/proc/toggle_combat_mode(forced)
 	if(recoveringstam)
 		return TRUE
+	if(!forced)
+		for(var/datum/status_effect/S in status_effects)
+			if(S.blocks_combatmode)
+				return TRUE
 	combatmode = !combatmode
 	if(voremode)
 		toggle_vore_mode()

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

@@ -1,12 +1,3 @@
-/mob/living/carbon/human/species/mammal
-	race = /datum/species/mammal
-
-/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
 

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

@@ -116,7 +116,7 @@
 			to_chat(src, "<span class='notice'>You're too exhausted to keep going...</span>")
 			resting = TRUE
 			if(combatmode)
-				toggle_combat_mode()
+				toggle_combat_mode(TRUE)
 			recoveringstam = TRUE
 			filters += CIT_FILTER_STAMINACRIT
 			update_canmove()

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

@@ -13,7 +13,7 @@
 /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))
+	if(BORG_SEC_AVAILABLE)
 		modulelist["Security K-9"] = /obj/item/robot_module/k9
 	modulelist["Scrub Puppy"] = /obj/item/robot_module/scrubpup
 	modulelist["Borgi"] = /obj/item/robot_module/borgi

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

@@ -11,6 +11,7 @@
 	. = ..()
 	if(!resting && !sprinting)
 		. += 1
+	. += speed
 
 /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))

modular_citadel/code/modules/projectiles/projectile/energy.dm

@@ -1,2 +0,0 @@
-/obj/item/projectile/energy/electrode
-	stamina = 36

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

@@ -1,11 +1,3 @@
-/datum/reagent/space_cleaner/reaction_obj(obj/O, reac_volume)
-	if(istype(O, /obj/effect/decal/cleanable) || istype(O, /obj/item/projectile/bullet/reusable/foam_dart) || istype(O, /obj/item/ammo_casing/caseless/foam_dart))
-		qdel(O)
-	else
-		if(O)
-			O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
-			SEND_SIGNAL(O, COMSIG_COMPONENT_CLEAN_ACT, CLEAN_STRENGTH_BLOOD)
-
 /datum/reagent/syndicateadrenals
 	name = "Syndicate Adrenaline"
 	id = "syndicateadrenals"

modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm

@@ -327,10 +327,10 @@
 
 //So slimes can play too.
 /datum/chemical_reaction/fermi/enthrall/slime
-	required_catalysts = list("slimejelly" = 1)
+	required_catalysts = list("jellyblood" = 1)
 
 /datum/chemical_reaction/fermi/enthrall/slime/FermiFinish(datum/reagents/holder, var/atom/my_atom)
-	var/datum/reagent/toxin/slimejelly/B = locate(/datum/reagent/toxin/slimejelly) in my_atom.reagents.reagent_list//The one line change.
+	var/datum/reagent/blood/jellyblood/B = locate(/datum/reagent/blood/jellyblood) in my_atom.reagents.reagent_list//The one line change.
 	var/datum/reagent/fermi/enthrall/E = locate(/datum/reagent/fermi/enthrall) in my_atom.reagents.reagent_list
 	if(!B.data)
 		var/list/seen = viewers(5, get_turf(my_atom))

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -2,7 +2,7 @@
 /datum/reagent/consumable/semen
 	name = "Semen"
 	id = "semen"
-	description = "Sperm from some animal. Useless for anything but insemination, really."
+	description = "Sperm from some animal. I bet you'll drink this out of a bucket someday."
 	taste_description = "something salty"
 	taste_mult = 2 //Not very overpowering flavor
 	data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
@@ -39,7 +39,9 @@
 	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/semen/replace_decal(obj/effect/decal/cleanable/semen/S)
-	S.add_blood_DNA(return_blood_DNA())
+	if(S.blood_DNA)
+		blood_DNA |= S.blood_DNA.Copy()
+	..()
 
 /datum/reagent/consumable/femcum
 	name = "Female Ejaculate"
@@ -71,7 +73,8 @@
 	add_blood_DNA(list("Non-human DNA" = "A+"))
 
 /obj/effect/decal/cleanable/femcum/replace_decal(obj/effect/decal/cleanable/femcum/F)
-	F.add_blood_DNA(return_blood_DNA())
+	if(F.blood_DNA)
+		blood_DNA |= F.blood_DNA.Copy()
 	..()
 
 /datum/reagent/consumable/femcum/reaction_turf(turf/T, reac_volume)