basically i fucking hate map merge conflicts

code/__DEFINES/citadel_defines.dm

@@ -25,6 +25,7 @@
 #define GENITAL_CAN_AROUSE		(1<<8)
 #define GENITAL_UNDIES_HIDDEN	(1<<9)
 #define UPDATE_OWNER_APPEARANCE	(1<<10)
+#define GENITAL_CAN_TAUR		(1<<11)
 
 
 #define DEF_VAGINA_SHAPE	"Human"

code/__DEFINES/dcs/flags.dm

@@ -39,3 +39,17 @@
 //Ouch my toes!
 #define CALTROP_BYPASS_SHOES 1
 #define CALTROP_IGNORE_WALKERS 2
+
+#define SPELL_SKIP_ALL_REQS		(1<<0)
+#define SPELL_SKIP_CENTCOM		(1<<1)
+#define SPELL_SKIP_STAT			(1<<2)
+#define SPELL_SKIP_CLOTHES		(1<<3)
+#define SPELL_SKIP_ANTIMAGIC	(1<<4)
+#define SPELL_SKIP_VOCAL		(1<<5)
+#define SPELL_SKIP_MOBTYPE		(1<<6)
+#define SPELL_WIZARD_HAT		(1<<7)
+#define SPELL_WIZARD_ROBE		(1<<8)
+#define SPELL_CULT_HELMET		(1<<9)
+#define SPELL_CULT_ARMOR		(1<<10)
+#define SPELL_WIZARD_GARB		(SPELL_WIZARD_HAT|SPELL_WIZARD_ROBE)
+#define SPELL_CULT_GARB			(SPELL_CULT_HELMET|SPELL_CULT_ARMOR)

code/__DEFINES/dcs/signals.dm

@@ -149,7 +149,9 @@
 #define COMSIG_MOB_DEATH "mob_death"							//from base of mob/death(): (gibbed)
 	#define COMPONENT_BLOCK_DEATH_BROADCAST 1					//stops the death from being broadcasted in deadchat.
 #define COMSIG_MOB_GHOSTIZE "mob_ghostize"						//from base of mob/Ghostize(): (can_reenter_corpse, special, penalize)
-	#define COMPONENT_BLOCK_GHOSTING 1
+	#define COMPONENT_BLOCK_GHOSTING (1<<0)
+	#define COMPONENT_DO_NOT_PENALIZE_GHOSTING (1<<1)
+	#define COMPONENT_FREE_GHOSTING (1<<2)
 #define COMSIG_MOB_ALLOWED "mob_allowed"						//from base of obj/allowed(mob/M): (/obj) returns bool, if TRUE the mob has id access to the obj
 #define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic"			//from base of mob/anti_magic_check(): (mob/user, magic, holy, tinfoil, chargecost, self, protection_sources)
 	#define COMPONENT_BLOCK_MAGIC 1
@@ -177,6 +179,8 @@
 //	#define SPEECH_FORCED 7
 #define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain"			//from base of /datum/antagonist/on_gain(): (antag_datum)
 
+#define COMSIG_MOB_SPELL_CAST_CHECK "mob_spell_cast_check"			//called from base of /obj/effect/proc_holder/spell/cast_check(): (spell)
+
 // /mob/living signals
 #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs"	//from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)
 #define COMSIG_LIVING_RESIST "living_resist"					//from base of mob/living/resist() (/mob/living)

code/__DEFINES/traits.dm

@@ -147,6 +147,7 @@
 #define TRAIT_NOPULSE			"nopulse"		// Your heart doesn't beat.
 #define TRAIT_EXEMPT_HEALTH_EVENTS	"exempt-health-events"
 #define TRAIT_NO_MIDROUND_ANTAG	"no-midround-antag" //can't be turned into an antag by random events
+#define TRAIT_PASSTABLE			"passtable"
 
 // mobility flag traits
 // IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
@@ -173,6 +174,9 @@
 
  //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
+#define VEHICLE_TRAIT "vehicle" // inherited from riding vehicles
+#define INNATE_TRAIT "innate"
+
 
 // item traits
 #define TRAIT_NODROP            "nodrop"

code/__HELPERS/mobs.dm

@@ -184,6 +184,7 @@
 		"cock_length"		= COCK_SIZE_DEF,
 		"cock_diameter_ratio"	= COCK_DIAMETER_RATIO_DEF,
 		"cock_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
+		"cock_taur"			= FALSE,
 		"has_balls" 		= FALSE,
 		"balls_color" 		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"balls_size"		= BALLS_SIZE_DEF,
@@ -579,3 +580,16 @@ GLOBAL_LIST_EMPTY(species_list)
 		chosen = pick(mob_spawn_meancritters)
 	var/mob/living/simple_animal/C = new chosen(spawn_location)
 	return C
+
+/proc/passtable_on(target, source)
+	var/mob/living/L = target
+	if(!HAS_TRAIT(L, TRAIT_PASSTABLE) && L.pass_flags & PASSTABLE)
+		ADD_TRAIT(L, TRAIT_PASSTABLE, INNATE_TRAIT)
+	ADD_TRAIT(L, TRAIT_PASSTABLE, source)
+	L.pass_flags |= PASSTABLE
+
+/proc/passtable_off(target, source)
+	var/mob/living/L = target
+	REMOVE_TRAIT(L, TRAIT_PASSTABLE, source)
+	if(!HAS_TRAIT(L, TRAIT_PASSTABLE))
+		L.pass_flags &= ~PASSTABLE

code/__HELPERS/time.dm

@@ -25,7 +25,8 @@ GLOBAL_VAR_INIT(midnight_rollovers, 0)
 GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 /proc/update_midnight_rollover()
 	if (world.timeofday < GLOB.rollovercheck_last_timeofday) //TIME IS GOING BACKWARDS!
-		return GLOB.midnight_rollovers++
+		GLOB.midnight_rollovers++
+	GLOB.rollovercheck_last_timeofday = world.timeofday
 	return GLOB.midnight_rollovers
 
 /proc/weekdayofthemonth()

code/datums/action.dm

@@ -659,7 +659,7 @@
 		return FALSE
 	var/obj/effect/proc_holder/spell/S = target
 	if(owner)
-		return S.can_cast(owner)
+		return S.can_cast(owner, FALSE, TRUE)
 	return FALSE
 
 /datum/action/spell_action/alien

code/datums/components/crafting/recipes/recipes_clothing.dm

@@ -33,6 +33,13 @@
 				/obj/item/organ/ears/cat = 1)
 	category = CAT_CLOTHING
 
+/datum/crafting_recipe/papermask
+	name = "Paper Mask"
+	result = /obj/item/clothing/mask/paper
+	time = 10
+	reqs = list(/obj/item/paper = 20)
+	category = CAT_CLOTHING
+
 ////////
 //Huds//
 ////////

code/datums/elements/ghost_role_eligibility.dm

@@ -1,15 +1,21 @@
 /datum/element/ghost_role_eligibility
-	element_flags = ELEMENT_DETACH
+	element_flags = ELEMENT_DETACH | ELEMENT_BESPOKE
+	id_arg_index = 3
 	var/list/timeouts = list()
 	var/list/mob/eligible_mobs = list()
+	var/penalizing = FALSE
+	var/free_ghost = FALSE
 
-/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE)
+/datum/element/ghost_role_eligibility/Attach(datum/target,penalize = FALSE,free_ghosting = FALSE, penalize_on_ghost = FALSE)
 	. = ..()
 	if(!ismob(target))
 		return ELEMENT_INCOMPATIBLE
+	penalizing = penalize_on_ghost
+	free_ghost = free_ghosting
 	var/mob/M = target
 	if(!(M in eligible_mobs))
 		eligible_mobs += M
+		RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/get_ghost_flags)
 	if(penalize) //penalizing them from making a ghost role / midround antag comeback right away.
 		var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
 		var/roundstart_quit_limit = CONFIG_GET(number/roundstart_suicide_time_limit) MINUTES
@@ -32,6 +38,7 @@
 	. = ..()
 	if(M in eligible_mobs)
 		eligible_mobs -= M
+		UnregisterSignal(M, COMSIG_MOB_GHOSTIZE)
 
 /datum/element/ghost_role_eligibility/proc/get_all_ghost_role_eligible(silent = FALSE)
 	var/list/candidates = list()
@@ -56,3 +63,11 @@
 	if(!silent && M.client)
 		to_chat(M, "<span class='warning'>You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].</span>")
 	return FALSE
+
+/datum/element/ghost_role_eligibility/proc/get_ghost_flags()
+	. = 0
+	if(!penalizing)
+		. |= COMPONENT_DO_NOT_PENALIZE_GHOSTING
+	if(free_ghost)
+		. |= COMPONENT_FREE_GHOSTING
+	return .

code/datums/elements/mob_holder.dm

@@ -76,6 +76,7 @@
 	lefthand_file = 'icons/mob/animals_held_lh.dmi'
 	icon_state = ""
 	w_class = WEIGHT_CLASS_BULKY
+	dynamic_hair_suffix = ""
 	var/mob/living/held_mob
 
 /obj/item/clothing/head/mob_holder/Initialize(mapload, mob/living/target, worn_state, alt_worn, right_hand, left_hand, slots = NONE)
@@ -162,6 +163,11 @@
 		L.visible_message("<span class='warning'>[held_mob] escapes from [L]!</span>", "<span class='warning'>[held_mob] escapes your grip!</span>")
 	release()
 
+/obj/item/clothing/head/mob_holder/mob_can_equip(mob/living/M, mob/living/equipper, slot, disable_warning = FALSE, bypass_equip_delay_self = FALSE)
+	if(!ishuman(M)) //monkeys holding monkeys holding monkeys...
+		return FALSE
+	return ..()
+
 /obj/item/clothing/head/mob_holder/assume_air(datum/gas_mixture/env)
 	var/atom/location = loc
 	if(!loc)

code/datums/elements/spellcasting.dm

@@ -0,0 +1,37 @@
+/datum/element/spellcasting //allows to cast certain spells or skip requirements.
+	element_flags = ELEMENT_BESPOKE|ELEMENT_DETACH
+	id_arg_index = 2
+	var/cast_flags
+	var/cast_slots
+	var/list/users_by_item = list()
+
+/datum/element/spellcasting/Attach(datum/target, _flags, _slots)
+	. = ..()
+	if(isitem(target))
+		RegisterSignal(target, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
+		RegisterSignal(target, COMSIG_ITEM_DROPPED, .proc/on_drop)
+	else if(ismob(target))
+		RegisterSignal(target, COMSIG_MOB_SPELL_CAST_CHECK, .proc/on_cast)
+	else
+		return ELEMENT_INCOMPATIBLE
+	cast_flags = _flags
+	cast_slots = _slots
+
+/datum/element/spellcasting/Detach(datum/target)
+	. = ..()
+	UnregisterSignal(target, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED, COMSIG_MOB_SPELL_CAST_CHECK))
+	if(users_by_item[target])
+		var/mob/user = users_by_item[target]
+		UnregisterSignal(user, COMSIG_MOB_SPELL_CAST_CHECK)
+
+/datum/element/spellcasting/proc/on_equip(datum/source, mob/equipper, slot)
+	if(slot in cast_slots)
+		RegisterSignal(equipper, COMSIG_MOB_SPELL_CAST_CHECK, .proc/on_cast)
+		users_by_item[source] = equipper
+
+/datum/element/spellcasting/proc/on_drop(datum/source, mob/user)
+	UnregisterSignal(user, COMSIG_MOB_SPELL_CAST_CHECK)
+	users_by_item -= source
+
+/datum/element/spellcasting/proc/on_cast(mob/caster, obj/effect/proc_holder/spell)
+	return cast_flags

code/datums/martial/sleeping_carp.dm

@@ -63,11 +63,11 @@
 	playsound(get_turf(A), 'sound/effects/hit_kick.ogg', 50, TRUE, -1)
 	if((D.mobility_flags & MOBILITY_STAND))
 		D.apply_damage(10, BRUTE, BODY_ZONE_HEAD)
-		D.DefaultCombatKnockdown(50)
+		D.DefaultCombatKnockdown(50, override_hardstun = 0.01, override_stamdmg = 0)
 		D.adjustStaminaLoss(40) //A cit specific change form the tg port to really punish anyone who tries to stand up
 		D.visible_message("<span class='warning'>[A] kicks [D] in the head, sending them face first into the floor!</span>", \
 					"<span class='userdanger'>You are kicked in the head by [A], sending you crashing to the floor!</span>", "<span class='hear'>You hear a sickening sound of flesh hitting flesh!</span>", COMBAT_MESSAGE_RANGE, A)
-	if(!(D.mobility_flags & MOBILITY_STAND))
+	else if(!(D.mobility_flags & MOBILITY_STAND))
 		D.apply_damage(5, BRUTE, BODY_ZONE_HEAD)
 		D.adjustStaminaLoss(40)
 		D.drop_all_held_items()

code/datums/martial/wrestling.dm

@@ -18,6 +18,8 @@
 	var/datum/action/drop/drop = new/datum/action/drop()
 
 /datum/martial_art/wrestling/proc/check_streak(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
+	if(!can_use(A, D))
+		return 0
 	switch(streak)
 		if("drop")
 			streak = ""
@@ -448,6 +450,8 @@
 /datum/martial_art/wrestling/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
 	if(check_streak(A,D))
 		return 1
+	if(!can_use(A,D))
+		return ..()
 	if(A.pulling == D || A == D) // don't stun grab yoursel
 		return FALSE
 	A.start_pulling(D)
@@ -476,3 +480,19 @@
 	if(H.get_item_by_slot(SLOT_BELT) == src)
 		style.remove(H)
 	return
+
+//Subtype of wrestling, reserved for the wrestling belts found in the holodeck
+/datum/martial_art/wrestling/holodeck
+	name = "Holodeck Wrestling"
+
+/obj/item/storage/belt/champion/wrestling/holodeck
+	name = "Holodeck Wrestling Belt"
+	style = new /datum/martial_art/wrestling/holodeck
+
+//Make sure that moves can only be used on people wearing the holodeck belt
+/datum/martial_art/wrestling/holodeck/can_use(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
+	if(!(istype(D.mind?.martial_art, /datum/martial_art/wrestling/holodeck)))
+		return 0
+	else
+		return ..()
+

code/datums/mind.dm

@@ -470,7 +470,6 @@
 				/datum/objective/steal,
 				/datum/objective/download,
 				/datum/objective/nuclear,
-				/datum/objective/capture,
 				/datum/objective/absorb,
 				/datum/objective/custom
 			)

code/datums/mutations/_mutations.dm

@@ -31,6 +31,7 @@
 	//MUT_EXTRA - A mutation that is in the mutations tab, and can be given and taken away through though the DNA console. Has a 0 before it's name in the mutation section of the dna console
 	//MUT_OTHER Cannot be interacted with by players through normal means. I.E. wizards mutate
 
+	var/list/conflicts //any mutations that might conflict. put mutation typepath defines in here. make sure to enter it both ways (so that A conflicts with B, and B with A)
 	var/can_chromosome = CHROMOSOME_NONE //can we take chromosomes? 0: CHROMOSOME_NEVER never,  1:CHROMOSOME_NONE yeah, 2: CHROMOSOME_USED no, already have one
 	var/chromosome_name   //purely cosmetic
 	var/modified = FALSE  //ugly but we really don't want chromosomes and on_acquiring to overlap and apply double the powers
@@ -60,6 +61,14 @@
 		return TRUE
 	if(limb_req && !H.get_bodypart(limb_req))
 		return TRUE
+	for(var/M in H.dna.mutations)//check for conflicting powers
+		var/datum/mutation/human/mewtayshun = M
+		if(LAZYLEN(mewtayshun.conflicts))
+			for(var/cons in mewtayshun.conflicts)
+				var/datum/mutation/human/conflicter = cons
+				if(conflicter == type)
+					to_chat(H, "<span class='warning'>You feel your genes resisting something.</span>")
+					return TRUE
 	owner = H
 	dna = H.dna
 	dna.mutations += src

code/datums/mutations/actions.dm

@@ -41,7 +41,7 @@
 	desc = "You can breathe fire at a target."
 	school = "evocation"
 	charge_max = 600
-	clothes_req = FALSE
+	clothes_req = NONE
 	range = 20
 	base_icon_state = "fireball"
 	action_icon_state = "fireball0"
@@ -121,7 +121,7 @@
 	name = "Convoke Void" //magic the gathering joke here
 	desc = "A rare genome that attracts odd forces not usually observed. May sometimes pull you in randomly."
 	school = "evocation"
-	clothes_req = FALSE
+	clothes_req = NONE
 	charge_max = 600
 	invocation = "DOOOOOOOOOOOOOOOOOOOOM!!!"
 	invocation_type = "shout"
@@ -155,7 +155,7 @@
 	dropmessage = "You let the electricity from your hand dissipate."
 	hand_path = /obj/item/melee/touch_attack/shock
 	charge_max = 400
-	clothes_req = FALSE
+	clothes_req = NONE
 	action_icon_state = "zap"
 
 /obj/item/melee/touch_attack/shock
@@ -211,7 +211,7 @@
 	name = "Remember the Scent"
 	desc = "Get a scent off of the item you're currently holding to track it. With an empty hand, you'll track the scent you've remembered."
 	charge_max = 100
-	clothes_req = FALSE
+	clothes_req = NONE
 	range = -1
 	include_user = TRUE
 	action_icon_state = "nose"
@@ -289,8 +289,7 @@
 /obj/effect/proc_holder/spell/self/self_amputation
 	name = "Drop a limb"
 	desc = "Concentrate to make a random limb pop right off your body."
-	clothes_req = FALSE
-	human_req = FALSE
+	clothes_req = NONE
 	charge_max = 100
 	action_icon_state = "autotomy"
 
@@ -327,8 +326,7 @@
 /obj/effect/proc_holder/spell/self/lay_genetic_web
 	name = "Lay Web"
 	desc = "Drops a web. Only you will be able to traverse your web easily, making it pretty good for keeping you safe."
-	clothes_req = FALSE
-	human_req = FALSE
+	clothes_req = NONE
 	charge_max = 4 SECONDS //the same time to lay a web
 	action_icon = 'icons/mob/actions/actions_genetic.dmi'
 	action_icon_state = "lay_web"
@@ -369,8 +367,7 @@
 /obj/effect/proc_holder/spell/self/tongue_spike
 	name = "Launch spike"
 	desc = "Shoot your tongue out in the direction you're facing, embedding it and dealing damage until they remove it."
-	clothes_req = FALSE
-	human_req = TRUE
+	clothes_req = NONE
 	charge_max = 100
 	action_icon = 'icons/mob/actions/actions_genetic.dmi'
 	action_icon_state = "spike"

code/datums/mutations/body.dm

@@ -75,20 +75,21 @@
 	quality = POSITIVE
 	difficulty = 16
 	instability = 5
+	conflicts = list(GIGANTISM)
 	locked = TRUE    // Default intert species for now, so locked from regular pool.
 
 /datum/mutation/human/dwarfism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())
 		return
 	owner.transform = owner.transform.Scale(1, 0.8)
-	owner.pass_flags |= PASSTABLE
+	passtable_on(owner, GENETIC_MUTATION)
 	owner.visible_message("<span class='danger'>[owner] suddenly shrinks!</span>", "<span class='notice'>Everything around you seems to grow..</span>")
 
 /datum/mutation/human/dwarfism/on_losing(mob/living/carbon/human/owner)
 	if(..())
 		return
 	owner.transform = owner.transform.Scale(1, 1.25)
-	owner.pass_flags &= ~PASSTABLE
+	passtable_off(owner, GENETIC_MUTATION)
 	owner.visible_message("<span class='danger'>[owner] suddenly grows!</span>", "<span class='notice'>Everything around you seems to shrink..</span>")
 
 
@@ -333,6 +334,7 @@
 	desc = "The cells within the subject spread out to cover more area, making the subject appear larger."
 	quality = MINOR_NEGATIVE
 	difficulty = 12
+	conflicts = list(DWARFISM)
 
 /datum/mutation/human/gigantism/on_acquiring(mob/living/carbon/human/owner)
 	if(..())

code/game/area/areas/holodeck.dm

@@ -99,6 +99,9 @@
 /area/holodeck/rec_center/winterwonderland
 	name = "Holodeck - Winter Wonderland"
 
+/area/holodeck/rec_center/wrestlingarena
+	name = "Holodeck - Wrestling Arena"
+
 // Bad programs
 
 /area/holodeck/rec_center/burn

code/game/gamemodes/dynamic/dynamic.dm

@@ -511,7 +511,7 @@ GLOBAL_VAR_INIT(dynamic_storyteller_type, /datum/dynamic_storyteller/classic)
 	drafted_rules -= starting_rule
 
 	starting_rule.trim_candidates()
-	starting_rule.scale_up(extra_rulesets_amount, threat)
+	starting_rule.scale_up(extra_rulesets_amount, threat_level)
 	if (starting_rule.pre_execute())
 		log_threat("[starting_rule.ruletype] - <b>[starting_rule.name]</b> [starting_rule.cost + starting_rule.scaled_times * starting_rule.scaling_cost] threat", verbose = TRUE)
 		if(starting_rule.flags & HIGHLANDER_RULESET)

code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm

@@ -241,5 +241,5 @@
 	requirements = list(10,10,10,10,10,10,10,10,10,10)
 	high_population_requirement = 10
 	repeatable = TRUE
-	flags = TRAITOR_RULESET
+	flags = TRAITOR_RULESET | MINOR_RULESET
 	property_weights = list("story_potential" = 2, "trust" = -1, "extended" = 2)

code/game/gamemodes/dynamic/dynamic_storytellers.dm

@@ -53,6 +53,8 @@ Property weights are:
 		var/turf/T = get_turf(H)
 		if(H.stat != DEAD && is_station_level(T.z) && !("Station" in H.faction))
 			threat += H.threat()
+	for(var/obj/item/phylactery/P in GLOB.poi_list)
+		threat += 25 // can't be giving them too much of a break
 	for (var/mob/M in mode.current_players[CURRENT_LIVING_PLAYERS])
 		if (M?.mind?.assigned_role && M.stat != DEAD)
 			var/datum/job/J = SSjob.GetJob(M.mind.assigned_role)
@@ -135,17 +137,19 @@ Property weights are:
 			if (GLOB.dynamic_classic_secret && !((rule.flags & TRAITOR_RULESET) || (rule.flags & MINOR_RULESET)))
 				continue
 			rule.trim_candidates()
-			var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
-			/*	Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
-				pick this particular ruleset. 
-				Let's use a toy example: there's 60 threat level and 10 threat spent.
-				We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
-				Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
-				When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
-				is 2.26 times as likely to be picked, all other things considered.
-				Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
-			*/
-			var/threat_weight = 1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0))
+			var/threat_weight = 1
+			if(!(rule.flags & MINOR_RULESET)) // makes the traitor rulesets always possible anyway
+				var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
+				/*	Basically, the closer the cost is to the current threat-level-away-from-threat, the more likely it is to
+					pick this particular ruleset. 
+					Let's use a toy example: there's 60 threat level and 10 threat spent.
+					We want to pick a ruleset that's close to that, so we run the below equation, on two rulesets.
+					Ruleset 1 has 30 cost, ruleset 2 has 5 cost.
+					When we do the math, ruleset 1's threat_weight is 0.538, and ruleset 2's is 0.238, meaning ruleset 1
+					is 2.26 times as likely to be picked, all other things considered.
+					Of course, we don't want it to GUARANTEE the closest, that's no fun, so it's just a weight.
+				*/
+				threat_weight = 1-abs(1-LOGISTIC_FUNCTION(2,0.05,cost_difference,0))
 			if (rule.ready())
 				var/property_weight = 0
 				for(var/property in property_weights)
@@ -168,8 +172,10 @@ Property weights are:
 
 			rule.candidates = list(newPlayer)
 			rule.trim_candidates()
-			var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
-			var/threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
+			var/threat_weight = 1
+			if(!(rule.flags & MINOR_RULESET))
+				var/cost_difference = abs(rule.cost-(mode.threat_level-mode.threat))
+				threat_weight = 1-abs(1-(LOGISTIC_FUNCTION(2,0.05,cost_difference,0)))
 			if (rule.ready())
 				var/property_weight = 0
 				for(var/property in property_weights)
@@ -200,7 +206,7 @@ Property weights are:
 	weight = 1
 	event_frequency_lower = 2 MINUTES
 	event_frequency_upper = 10 MINUTES
-	flags = WAROPS_ALWAYS_ALLOWED | FORCE_IF_WON
+	flags = WAROPS_ALWAYS_ALLOWED
 	min_players = 40
 	var/refund_cooldown = 0
 	
@@ -245,7 +251,10 @@ Property weights are:
 	config_tag = "random"
 	weight = 1
 	desc = "No weighting at all; every ruleset has the same chance of happening. Cooldowns vary wildly. As random as it gets."
-	forced_threat_level = 100
+
+/datum/dynamic_storyteller/random/on_start()
+	..()
+	GLOB.dynamic_forced_threat_level = rand(0,100)
 
 /datum/dynamic_storyteller/random/get_midround_cooldown()
 	return rand(GLOB.dynamic_midround_delay_min/2, GLOB.dynamic_midround_delay_max*2)
@@ -318,9 +327,10 @@ Property weights are:
 	property_weights = list("story_potential" = 2)
 
 
-/datum/dynamic_storyteller/story/do_process()
+/datum/dynamic_storyteller/story/calculate_threat()
 	var/current_time = (world.time / SSautotransfer.targettime)*180
-	mode.threat_level = round(mode.initial_threat_level*(sin(current_time)+0.5),0.1)
+	mode.threat_level = round(mode.initial_threat_level*(sin(current_time)+0.25),0.1)
+	..()
 
 /datum/dynamic_storyteller/classic
 	name = "Classic"

code/game/gamemodes/objective.dm

@@ -663,7 +663,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	if(count)
 		target_amount = count
 	update_explanation_text()
-
+/*
 /datum/objective/capture
 	name = "capture"
 	var/captured_amount = 0
@@ -709,7 +709,7 @@ GLOBAL_LIST_EMPTY(possible_items_special)
 	if(count)
 		target_amount = count
 	update_explanation_text()
-
+*/
 //Changeling Objectives
 
 /datum/objective/absorb

code/game/gamemodes/objective_sabotage.dm

@@ -77,14 +77,14 @@
 
 /datum/sabotage_objective/processing/supermatter/can_run()
 	return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines)
-
+/*
 /datum/sabotage_objective/station_integrity
 	name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal."
 	sabotage_type = "integrity"
 
 /datum/sabotage_objective/station_integrity/check_conditions()
 	return 5-(max(SSticker.station_integrity*4,320)/80)
-
+*/
 /datum/sabotage_objective/cloner
 	name = "Destroy all Nanotrasen cloning machines."
 	sabotage_type = "cloner"
@@ -98,6 +98,9 @@
 	special_equipment = list(/obj/item/aiModule/syndicate)
 	excludefromjob = list("Chief Engineer","Research Director","Head of Personnel","Captain","Chief Medical Officer","Head Of Security")
 
+/datum/sabotage_objective/ai_law/can_run()
+	return length(active_ais())
+
 /datum/sabotage_objective/ai_law/check_conditions()
 	for (var/i in GLOB.ai_list)
 		var/mob/living/silicon/ai/aiPlayer = i

code/game/machinery/Sleeper.dm

@@ -207,11 +207,14 @@
 
 /obj/machinery/sleeper/ui_data()
 	var/list/data = list()
+	var/chemical_list = list()
+	var/blood_percent = 0
+
 	data["occupied"] = occupant ? 1 : 0
 	data["open"] = state_open
-	data["efficiency"] = efficiency
-	data["current_vol"] = reagents.total_volume
-	data["tot_capacity"] = reagents.maximum_volume
+	data["blood_levels"] = blood_percent
+	data["blood_status"] = "Patient either has no blood, or does not require it to function."
+	data["chemical_list"] = chemical_list
 
 	data["chems"] = list()
 	for(var/chem in available_chems)
@@ -247,10 +250,13 @@
 		data["occupant"]["fireLoss"] = mob_occupant.getFireLoss()
 		data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss()
 		data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN)
-		data["occupant"]["reagents"] = list()
-		if(mob_occupant.reagents && mob_occupant.reagents.reagent_list.len)
+		
+		if(mob_occupant.reagents.reagent_list.len)
 			for(var/datum/reagent/R in mob_occupant.reagents.reagent_list)
-				data["occupant"]["reagents"] += list(list("name" = R.name, "volume" = R.volume))
+				chemical_list += list(list("name" = R.name, "volume" = R.volume))
+		else
+			chemical_list = "Patient has no reagents."
+
 		data["occupant"]["failing_organs"] = list()
 		var/mob/living/carbon/C = mob_occupant
 		if(C)
@@ -259,21 +265,25 @@
 					continue
 				data["occupant"]["failing_organs"] += list(list("name" = Or.name))
 
-		if(mob_occupant.has_dna()) // Blood-stuff is mostly a copy-paste from the healthscanner.
-			var/blood_id = C.get_blood_id()
-			if(blood_id)
-				data["occupant"]["blood"] = list() // We can start populating this list.
-				var/blood_type = C.dna.blood_type
-				if(!(blood_id in GLOB.blood_reagent_types)) // special blood substance
-					var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id]
-					if(R)
-						blood_type = R.name
-					else
-						blood_type = blood_id
-				data["occupant"]["blood"]["maxBloodVolume"] = (BLOOD_VOLUME_NORMAL*C.blood_ratio)
-				data["occupant"]["blood"]["currentBloodVolume"] = C.blood_volume
-				data["occupant"]["blood"]["dangerBloodVolume"] = BLOOD_VOLUME_SAFE
-				data["occupant"]["blood"]["bloodType"] = blood_type
+		if(istype(C)) //Non-carbons shouldn't be able to enter sleepers, but this is to prevent runtimes if something ever breaks
+			if(mob_occupant.has_dna()) // Blood-stuff is mostly a copy-paste from the healthscanner.
+				blood_percent = round((C.blood_volume / BLOOD_VOLUME_NORMAL)*100)
+				var/blood_id = C.get_blood_id()
+				var/blood_warning = ""
+				if(blood_percent < 80)
+					blood_warning = "Patient has low blood levels."
+				if(blood_percent < 60)
+					blood_warning = "Patient has DANGEROUSLY low blood levels."
+				if(blood_id)
+					var/blood_type = C.dna.blood_type
+					if(!(blood_id in GLOB.blood_reagent_types)) // special blood substance
+						var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id]
+						if(R)
+							blood_type = R.name
+						else
+							blood_type = blood_id
+					data["blood_status"] = "Patient has [blood_type] type blood. [blood_warning]"
+				data["blood_levels"] = blood_percent
 	return data
 
 /obj/machinery/sleeper/ui_act(action, params)
@@ -309,14 +319,14 @@
 			if(allowed(usr))
 				if(!is_operational())
 					return
-				reagents.remove_reagent(chem, 10)
+				reagents.remove_reagent(chem, 1000)
 				return
 			if(chem in available_chems)
 				if(!is_operational())
 					return
 				/*var/datum/reagent/R = reagents.has_reagent(chem) //For when purity effects are in
 				if(R.purity < 0.8)*/
-				reagents.remove_reagent(chem, 10)
+				reagents.remove_reagent(chem, 1000)
 			else
 				visible_message("<span class='warning'>Access Denied.</span>")
 				playsound(src, 'sound/machines/terminal_prompt_deny.ogg', 50, 0)

code/game/machinery/computer/arcade/minesweeper.dm

@@ -159,6 +159,8 @@
 										if(CHECK_BITFIELD(obj_flags, EMAGGED) && !exploding_hell)
 											exploding_hell  = TRUE
 											explode_EVERYTHING()
+											if(QDELETED(src))
+												return
 										if(mine_sound)
 											switch(rand(1,3))	//Play every time a mine is hit
 												if(1)
@@ -367,10 +369,10 @@
 	var/row_limit = rows-1
 	var/column_limit = columns-1
 	var/mine_limit_v2 = mine_limit
-	if(rows > 11)
-		row_limit = 10
-	if(columns > 11)
-		column_limit = 10
+	if(rows > 21)
+		row_limit = 20
+	if(columns > 21)
+		column_limit = 20
 	if(mine_limit > (rows*columns) * 0.25)
 		mine_limit_v2 = 24
 	message_admins("[key_name_admin(user)] failed an emagged Minesweeper arcade and has unleashed an explosion armageddon of size [row_limit],[column_limit] around [ADMIN_LOOKUPFLW(user.loc)]!")
@@ -378,12 +380,27 @@
 		explosion(loc, 2, 5, 10, 15)	//Thought you could survive by putting as few mines as possible, huh??
 	else
 		explosion(loc, 1, 3, rand(1,5), rand(1,10))
-	for(var/y69=y-row_limit;y69<y+row_limit;y69++)	//Create a shitton of explosions in irl turfs if we lose, it will probably kill us
-		for(var/x69=x-column_limit;x69<x+column_limit;x69++)
-			if(prob(mine_limit_v2))	//Probability of explosion happening, according to how many mines were on the board... up to a limit
-				var/explosionloc
-				explosionloc = locate(y69,x69,z)
-				explosion(explosionloc, 0, rand(1,2),rand(1,5),rand(3,10), adminlog = FALSE)
+	var/list/targets = list()
+	var/cur_y = y - round(row_limit * 0.5, 1)
+	var/start_x = x - round(column_limit * 0.5, 1)
+	for(var/row in table) //translate the mines locations into actual turf coordinates.
+		if(!locate(cur_y, start_x, z))
+			continue
+		var/cur_x = start_x
+		for(var/column in row)
+			var/coord_value = table[row][column]
+			if(coord_value == 10 || coord_value == 0) //there is a mine in here.
+				var/turf/target = locate(cur_y, cur_x, z)
+				if(!target)
+					continue
+				targets += target
+			cur_x++
+		cur_y++
+	var/num_explosions = 0
+	for(var/T in shuffle(targets)) //Create a shitton of explosions in irl turfs if we lose, it will probably kill us
+		addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, rand(1,2),rand(1,5),rand(3,10), FALSE), 15 * ++num_explosions)
+		if(num_explosions == mine_limit_v2)
+			return
 
 #undef MINESWEEPERIMG
 #undef MINESWEEPER_GAME_MAIN_MENU

code/game/objects/effects/contraband.dm

@@ -384,8 +384,8 @@
 	desc = "The POWER that gamers CRAVE! In partnership with Vlad's Salad."
 	icon_state = "poster39"
 
-/obj/structure/sign/poster/contraband/sun_kist
-	name = "Sun-kist"
+/obj/structure/sign/poster/contraband/starkist
+	name = "Star-kist"
 	desc = "Drink the stars!"
 	icon_state = "poster40"
 

code/game/objects/items/candle.dm

@@ -13,6 +13,7 @@
 	var/lit = FALSE
 	var/infinite = FALSE
 	var/start_lit = FALSE
+	var/heats_space = TRUE
 
 /obj/item/candle/Initialize()
 	. = ..()
@@ -35,7 +36,7 @@
 	return ..()
 
 /obj/item/candle/get_temperature()
-	return lit * heat
+	return lit * heat * heats_space
 
 /obj/item/candle/proc/light(show_message)
 	if(!lit)
@@ -67,7 +68,8 @@
 		new /obj/item/trash/candle(loc)
 		qdel(src)
 	update_icon()
-	open_flame()
+	if(heats_space)
+		open_flame()
 
 /obj/item/candle/attack_self(mob/user)
 	if(put_out_candle())
@@ -77,4 +79,7 @@
 	infinite = TRUE
 	start_lit = TRUE
 
+/obj/item/candle/infinite/hugbox
+	heats_space = FALSE
+
 #undef CANDLE_LUMINOSITY

code/game/objects/items/handcuffs.dm

@@ -113,24 +113,24 @@
 	desc = "Looks like some cables tied together. Could be used to tie something up."
 	icon_state = "cuff"
 	item_state = "coil"
-	item_color = "red"
-	color = "#ff0000"
+	color =  "red"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
 	custom_materials = list(/datum/material/iron=150, /datum/material/glass=75)
 	breakouttime = 300 //Deciseconds = 30s
-	cuffsound = 'sound/weapons/cablecuff.ogg'
-
-/obj/item/restraints/handcuffs/cable/Initialize(mapload, param_color)
-	. = ..()
-
-	var/list/cable_colors = GLOB.cable_colors
-	item_color = param_color || item_color || pick(cable_colors)
-	if(cable_colors[item_color])
-		item_color = cable_colors[item_color]
-	color = null
-	add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
+	cuffsound = 'sound/weapons/cablecuff.ogg' 
 
+/obj/item/restraints/handcuffs/cable/attack_self(mob/user)
+	to_chat(user, "<span class='notice'>You start unwinding the cable restraints back into coil</span>")
+	if(!do_after(user, 25, TRUE, user))
+		return
+	qdel(src)
+	var/obj/item/stack/cable_coil/coil = new(get_turf(user))
+	coil.amount = 15
+	user.put_in_hands(coil)
+	coil.color = color
+	to_chat(user, "<span class='notice'>You unwind the cable restraints back into coil</span>")
+	
 /obj/item/restraints/handcuffs/cable/red
 	item_color = "red"
 	color = "#ff0000"
@@ -162,6 +162,13 @@
 /obj/item/restraints/handcuffs/cable/white
 	item_color = "white"
 
+/obj/item/restraints/handcuffs/cable/random
+
+/obj/item/restraints/handcuffs/cable/random/Initialize(mapload)
+	. = ..()
+	var/list/cable_colors = GLOB.cable_colors
+	color = pick(cable_colors)
+
 /obj/item/restraints/handcuffs/cable/attackby(obj/item/I, mob/user, params)
 	..()
 	if(istype(I, /obj/item/stack/rods))

code/game/objects/items/holy_weapons.dm

@@ -494,7 +494,7 @@
 		S.ckey = C.ckey
 		S.status_flags |= GODMODE
 		S.language_holder = user.language_holder.copy(S)
-		S.AddElement(/datum/element/ghost_role_eligibility)
+		S.AddElement(/datum/element/ghost_role_eligibility,penalize_on_ghost = TRUE)
 		START_PROCESSING(SSprocessing,src)
 		var/input = stripped_input(S,"What are you named?", ,"", MAX_NAME_LEN)
 

code/game/objects/items/implants/implant_spell.dm

@@ -21,7 +21,7 @@
 		if (!spell)
 			return FALSE
 		if (autorobeless && spell.clothes_req)
-			spell.clothes_req = FALSE
+			spell.clothes_req = NONE
 		target.AddSpell(spell)
 		return TRUE
 

code/game/objects/items/pinpointer.dm

@@ -83,7 +83,7 @@
 
 /obj/item/pinpointer/crew/proc/trackable(mob/living/carbon/human/H)
 	var/turf/here = get_turf(src)
-	if((H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under))
+	if(H && (H.z == 0 || H.z == here.z) && istype(H.w_uniform, /obj/item/clothing/under))
 		var/obj/item/clothing/under/U = H.w_uniform
 
 		// Suit sensors must be on maximum.

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -182,8 +182,8 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
 	new/datum/stack_recipe("crate", /obj/structure/closet/crate, 5, time = 90,  one_per_turf = TRUE), \
 	null, \
 	new /datum/stack_recipe_list("airlock assemblies", list( \
-		new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 6, time = 50, one_per_turf = 1, on_floor = 1), \
-		new/datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 8, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("high security airlock assembly", /obj/structure/door_assembly/door_assembly_highsecurity, 4, time = 50, one_per_turf = 1, on_floor = 1), \
+		new/datum/stack_recipe("vault door assembly", /obj/structure/door_assembly/door_assembly_vault, 6, time = 50, one_per_turf = 1, on_floor = 1), \
 	)), \
 ))
 

code/game/objects/items/stunbaton.dm

@@ -15,7 +15,7 @@
 	attack_verb = list("beaten")
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 50, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
 
-	var/stamforce = 25
+	var/stamforce = 35
 	var/status = FALSE
 	var/knockdown = TRUE
 	var/obj/item/stock_parts/cell/cell

code/game/objects/items/weaponry.dm

@@ -498,7 +498,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	icon_state = "catwhip"
 
 /obj/item/melee/skateboard
-	name = "skateboard"
+	name = "improvised skateboard"
 	desc = "A skateboard. It can be placed on its wheels and ridden, or used as a strong weapon."
 	icon_state = "skateboard"
 	item_state = "skateboard"
@@ -506,11 +506,37 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
 	throwforce = 4
 	w_class = WEIGHT_CLASS_NORMAL
 	attack_verb = list("smacked", "whacked", "slammed", "smashed")
+	///The vehicle counterpart for the board
+	var/board_item_type = /obj/vehicle/ridden/scooter/skateboard
 
 /obj/item/melee/skateboard/attack_self(mob/user)
-	new /obj/vehicle/ridden/scooter/skateboard(get_turf(user))
+	if(!user.canUseTopic(src, TRUE, FALSE, TRUE))
+		return
+	var/obj/vehicle/ridden/scooter/skateboard/S = new board_item_type(get_turf(user))
+	S.buckle_mob(user)
 	qdel(src)
 
+/obj/item/melee/skateboard/pro
+	name = "skateboard"
+	desc = "A RaDSTORMz brand professional skateboard. It looks sturdy and well made."
+	icon_state = "skateboard2"
+	item_state = "skateboard2"
+	board_item_type = /obj/vehicle/ridden/scooter/skateboard/pro
+
+/obj/item/melee/skateboard/hoverboard
+	name = "hoverboard"
+	desc = "A blast from the past, so retro!"
+	icon_state = "hoverboard_red"
+	item_state = "hoverboard_red"
+	board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard
+
+/obj/item/melee/skateboard/hoverboard/admin
+	name = "\improper Board Of Directors"
+	desc = "The engineering complexity of a spaceship concentrated inside of a board. Just as expensive, too."
+	icon_state = "hoverboard_nt"
+	item_state = "hoverboard_nt"
+	board_item_type = /obj/vehicle/ridden/scooter/skateboard/hoverboard/admin
+
 /obj/item/melee/baseball_bat
 	name = "baseball bat"
 	desc = "There ain't a skull in the league that can withstand a swatter."

code/game/objects/structures/door_assembly.dm

@@ -243,6 +243,7 @@
 				//door.req_access = req_access
 				door.electronics = electronics
 				door.heat_proof = heat_proof_finished
+				door.security_level = 0
 				if(electronics.one_access)
 					door.req_one_access = electronics.accesses
 				else

code/game/objects/structures/door_assembly_types.dm

@@ -114,7 +114,7 @@
 	airlock_type = /obj/machinery/door/airlock/highsecurity
 	noglass = TRUE
 	material_type = /obj/item/stack/sheet/plasteel
-	material_amt = 6
+	material_amt = 4
 
 /obj/structure/door_assembly/door_assembly_vault
 	name = "vault door assembly"
@@ -124,7 +124,7 @@
 	airlock_type = /obj/machinery/door/airlock/vault
 	noglass = TRUE
 	material_type = /obj/item/stack/sheet/plasteel
-	material_amt = 8
+	material_amt = 6
 
 /obj/structure/door_assembly/door_assembly_shuttle
 	name = "shuttle airlock assembly"

code/game/objects/structures/ghost_role_spawners.dm

@@ -674,17 +674,14 @@
 		O.equip(new_spawn, FALSE, new_spawn.client)
 		SSjob.equip_loadout(null, new_spawn, FALSE)
 		SSquirks.AssignQuirks(new_spawn, new_spawn.client, TRUE, TRUE, null, FALSE, new_spawn)
-		new_spawn.AddElement(/datum/element/ghost_role_eligibility)
+		new_spawn.AddElement(/datum/element/ghost_role_eligibility, free_ghosting = TRUE)
 		new_spawn.AddElement(/datum/element/dusts_on_catatonia)
 		new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type,/area/hilbertshotel))
 		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
 		ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT)
-		ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still elegible for ghost roles popups.
+		ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still eligible for ghost roles popups.
 		ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT)
-		to_chat(new_spawn,"<span class='boldwarning'>You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
-		to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
-		var/datum/action/ghost/G = new(new_spawn)
-		G.Grant(new_spawn)
+		to_chat(new_spawn,"<span class='boldwarning'>Ghosting is free!</span>")
 		var/datum/action/toggle_dead_chat_mob/D = new(new_spawn)
 		D.Grant(new_spawn)
 

code/modules/antagonists/abductor/abductee/abductee.dm

@@ -31,4 +31,5 @@
 
 /datum/antagonist/abductee/remove_innate_effects(mob/living/mob_override)
 	update_abductor_icons_removed(mob_override ? mob_override.mind : owner)
-	qdel(brain_trauma)
+	if(!QDELETED(brain_trauma))
+		qdel(brain_trauma)

code/modules/antagonists/cult/cult_items.dm

@@ -353,6 +353,11 @@
 	brightness_on = 0
 	actions_types = list()
 
+
+/obj/item/clothing/head/helmet/space/hardsuit/cult/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_CULT_HELMET, ITEM_SLOT_HEAD)
+
 /obj/item/clothing/suit/space/hardsuit/cult
 	name = "\improper Nar'Sien hardened armor"
 	icon_state = "cult_armor"
@@ -363,6 +368,10 @@
 	armor = list("melee" = 70, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 40, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult
 
+/obj/item/clothing/suit/space/hardsuit/cult/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_CULT_ARMOR, ITEM_SLOT_OCLOTHING)
+
 /obj/item/sharpener/cult
 	name = "eldritch whetstone"
 	desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone."

code/modules/antagonists/revenant/revenant_abilities.dm

@@ -117,7 +117,7 @@
 	tinfoil_check = FALSE
 
 /obj/effect/proc_holder/spell/aoe_turf/revenant
-	clothes_req = 0
+	clothes_req = NONE
 	action_icon = 'icons/mob/actions/actions_revenant.dmi'
 	action_background_icon_state = "bg_revenant"
 	panel = "Revenant Abilities (Locked)"
@@ -135,7 +135,7 @@
 	else
 		name = "[initial(name)] ([cast_amount]E)"
 
-/obj/effect/proc_holder/spell/aoe_turf/revenant/can_cast(mob/living/simple_animal/revenant/user = usr)
+/obj/effect/proc_holder/spell/aoe_turf/revenant/can_cast(mob/living/simple_animal/revenant/user = usr, skipcharge = FALSE, silent = FALSE)
 	if(charge_counter < charge_max)
 		return FALSE
 	if(!istype(user)) //Badmins, no. Badmins, don't do it.

code/modules/antagonists/santa/santa.dm

@@ -18,7 +18,7 @@
 
 	owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/presents)
 	var/obj/effect/proc_holder/spell/targeted/area_teleport/teleport/telespell = new
-	telespell.clothes_req = 0 //santa robes aren't actually magical.
+	telespell.clothes_req = NONE //santa robes aren't actually magical.
 	owner.AddSpell(telespell) //does the station have chimneys? WHO KNOWS!
 
 /datum/antagonist/santa/proc/give_objective()

code/modules/antagonists/wizard/equipment/spellbook.dm

@@ -104,7 +104,7 @@
 		dat += " Cooldown:[S.charge_max/10]"
 	dat += " Cost:[cost]<br>"
 	dat += "<i>[S.desc][desc]</i><br>"
-	dat += "[S.clothes_req?"Needs wizard garb":"Can be cast without wizard garb"]<br>"
+	dat += "[S.clothes_req & SPELL_WIZARD_GARB ? "Needs wizard garb" : "Can be cast without wizard garb"]<br>"
 	return dat
 
 /datum/spellbook_entry/fireball

code/modules/awaymissions/mission_code/Academy.dm

@@ -309,7 +309,7 @@
 	name = "Summon Servant"
 	desc = "This spell can be used to call your servant, whenever you need it."
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "JE VES"
 	invocation_type = "whisper"
 	range = -1

code/modules/cargo/packs/emergency.dm

@@ -287,7 +287,7 @@
 
 /datum/supply_pack/emergency/specialops
 	name = "Special Ops Supplies"
-	desc = "(*!&@#TOO CHEAP FOR THAT NULL_ENTRY, HUH OPERATIVE? WELL, THIS LITTLE ORDER CAN STILL HELP YOU OUT IN A PINCH. CONTAINS A BOX OF FIVE EMP GRENADES, THREE SMOKEBOMBS, AN INCENDIARY GRENADE, AND A \"SLEEPY PEN\" FULL OF NICE TOXINS!#@*$"
+	desc = "(*!&@#NEED SOMETHING TO DEAL WITH THE GREYTIDE, HUH OPERATIVE? WELL, THIS LITTLE ORDER CAN HELP YOU OUT IN A PINCH. CONTAINS A BOX OF FIVE EMP GRENADES, THREE SMOKEBOMBS, AN INCENDIARY GRENADE, AND A \"SLEEPY PEN\" FULL OF NICE TOXINS!#@*$"
 	hidden = TRUE
 	cost = 2200
 	contains = list(/obj/item/storage/box/emps,

code/modules/client/preferences.dm

@@ -125,6 +125,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"cock_length" = COCK_SIZE_DEF,
 		"cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF,
 		"cock_color" = "fff",
+		"cock_taur" = FALSE,
 		"has_balls" = FALSE,
 		"balls_color" = "fff",
 		"balls_shape" = DEF_BALLS_SHAPE,
@@ -762,7 +763,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					else
 						dat += "<b>Penis Color:</b></a><BR>"
 						dat += "<span style='border: 1px solid #161616; background-color: #[features["cock_color"]];'>&nbsp;&nbsp;&nbsp;</span> <a href='?_src_=prefs;preference=cock_color;task=input'>Change</a><br>"
-					dat += "<b>Penis Shape:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=cock_shape;task=input'>[features["cock_shape"]]</a>"
+					var/tauric_shape = FALSE
+					if(features["cock_taur"])
+						var/datum/sprite_accessory/penis/P = GLOB.cock_shapes_list[features["cock_shape"]]
+						if(P.taur_icon && pref_species.mutant_bodyparts["taur"])
+							var/datum/sprite_accessory/taur/T = GLOB.taur_list[features["taur"]]
+							if(T.taur_mode & P.accepted_taurs)
+								tauric_shape = TRUE
+					dat += "<b>Penis Shape:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=cock_shape;task=input'>[features["cock_shape"]][tauric_shape ? " (Taur)" : ""]</a>"
 					dat += "<b>Penis Length:</b> <a style='display:block;width:120px' href='?_src_=prefs;preference=cock_length;task=input'>[features["cock_length"]] inch(es)</a>"
 					dat += "<b>Penis Visibility:</b><a style='display:block;width:100px' href='?_src_=prefs;preference=cock_visibility;task=input'>[features["cock_visibility"]]</a>"
 					dat += "<b>Has Testicles:</b><a style='display:block;width:50px' href='?_src_=prefs;preference=has_balls'>[features["has_balls"] == TRUE ? "Yes" : "No"]</a>"
@@ -1610,7 +1618,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
 
 				if("mutant_color2")
-					var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference") as color|null
+					var/new_mutantcolor = input(user, "Choose your character's secondary alien/mutant color:", "Character Preference","#"+features["mcolor2"]) as color|null
 					if(new_mutantcolor)
 						var/temp_hsv = RGBtoHSV(new_mutantcolor)
 						if(new_mutantcolor == "#000000")
@@ -1621,7 +1629,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 							to_chat(user, "<span class='danger'>Invalid color. Your color is not bright enough.</span>")
 
 				if("mutant_color3")
-					var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference") as color|null
+					var/new_mutantcolor = input(user, "Choose your character's tertiary alien/mutant color:", "Character Preference","#"+features["mcolor3"]) as color|null
 					if(new_mutantcolor)
 						var/temp_hsv = RGBtoHSV(new_mutantcolor)
 						if(new_mutantcolor == "#000000")
@@ -1922,7 +1930,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				//Genital code
 				if("cock_color")
-					var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
+					var/new_cockcolor = input(user, "Penis color:", "Character Preference","#"+features["cock_color"]) as color|null
 					if(new_cockcolor)
 						var/temp_hsv = RGBtoHSV(new_cockcolor)
 						if(new_cockcolor == "#000000")
@@ -1941,8 +1949,19 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 
 				if("cock_shape")
 					var/new_shape
-					new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in GLOB.cock_shapes_list
+					var/list/hockeys = list()
+					if(pref_species.mutant_bodyparts["taur"])
+						var/datum/sprite_accessory/taur/T = GLOB.taur_list[features["taur"]]
+						for(var/A in GLOB.cock_shapes_list)
+							var/datum/sprite_accessory/penis/P = GLOB.cock_shapes_list[A]
+							if(P.taur_icon && T.taur_mode & P.accepted_taurs)
+								LAZYSET(hockeys, "[A] (Taur)", A)
+					new_shape = input(user, "Penis shape:", "Character Preference") as null|anything in (GLOB.cock_shapes_list + hockeys)
 					if(new_shape)
+						features["cock_taur"] = FALSE
+						if(hockeys[new_shape])
+							new_shape = hockeys[new_shape]
+							features["cock_taur"] = TRUE
 						features["cock_shape"] = new_shape
 
 				if("cock_visibility")
@@ -1951,7 +1970,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["cock_visibility"] = n_vis
 
 				if("balls_color")
-					var/new_ballscolor = input(user, "Testicles Color:", "Character Preference") as color|null
+					var/new_ballscolor = input(user, "Testicles Color:", "Character Preference","#"+features["balls_color"]) as color|null
 					if(new_ballscolor)
 						var/temp_hsv = RGBtoHSV(new_ballscolor)
 						if(new_ballscolor == "#000000")
@@ -1978,7 +1997,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["breasts_shape"] = new_shape
 
 				if("breasts_color")
-					var/new_breasts_color = input(user, "Breast Color:", "Character Preference") as color|null
+					var/new_breasts_color = input(user, "Breast Color:", "Character Preference","#"+features["breasts_color"]) as color|null
 					if(new_breasts_color)
 						var/temp_hsv = RGBtoHSV(new_breasts_color)
 						if(new_breasts_color == "#000000")
@@ -2000,7 +2019,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["vag_shape"] = new_shape
 
 				if("vag_color")
-					var/new_vagcolor = input(user, "Vagina color:", "Character Preference") as color|null
+					var/new_vagcolor = input(user, "Vagina color:", "Character Preference","#"+features["vag_color"]) as color|null
 					if(new_vagcolor)
 						var/temp_hsv = RGBtoHSV(new_vagcolor)
 						if(new_vagcolor == "#000000")

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	27
+#define SAVEFILE_VERSION_MAX	28
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -151,6 +151,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(tennis == "Hidden")
 			features["balls_visibility"] = GEN_VISIBLE_NEVER
 
+	if(current_version < 28)
+		var/hockey
+		S["feature_cock_shape"] >> hockey
+		var/list/malformed_hockeys = list("Taur, Flared" = "Flared", "Taur, Knotted" = "Knotted", "Taur, Tapered" = "Tapered")
+		if(malformed_hockeys[hockey])
+			features["cock_shape"] = malformed_hockeys[hockey]
+			features["cock_taur"] = TRUE
+
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
 		return
@@ -457,6 +465,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_cock_color"]				>> features["cock_color"]
 	S["feature_cock_length"]			>> features["cock_length"]
 	S["feature_cock_diameter"]			>> features["cock_diameter"]
+	S["feature_cock_taur"]				>> features["cock_taur"]
 	S["feature_cock_visibility"]		>> features["cock_visibility"]
 	//balls features
 	S["feature_has_balls"]				>> features["has_balls"]
@@ -673,6 +682,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["feature_cock_shape"], features["cock_shape"])
 	WRITE_FILE(S["feature_cock_color"], features["cock_color"])
 	WRITE_FILE(S["feature_cock_length"], features["cock_length"])
+	WRITE_FILE(S["feature_cock_taur"], features["cock_taur"])
 	WRITE_FILE(S["feature_cock_visibility"], features["cock_visibility"])
 
 	WRITE_FILE(S["feature_has_balls"], features["has_balls"])

code/modules/clothing/masks/miscellaneous.dm

@@ -343,3 +343,45 @@
 	desc =  "A bandana made from durathread, you wish it would provide some protection to its wearer, but it's far too thin..."
 	icon_state = "banddurathread"
 
+/obj/item/clothing/mask/paper
+	name = "paper mask"
+	desc = "A neat, circular mask made out of paper."
+	icon_state = "plainmask"
+	item_state = "plainmask"
+	flags_inv = HIDEFACE|HIDEFACIALHAIR
+	resistance_flags = FLAMMABLE
+	max_integrity = 100
+	actions_types = list(/datum/action/item_action/adjust)
+
+
+/obj/item/clothing/mask/paper/ui_action_click(mob/user)
+	if(!istype(user) || user.incapacitated())
+		return
+
+	var/list/options = list()
+	options["Blank"] = "plainmask"
+	options["Neutral"] = "neutralmask"
+	options["Eyes"] = "eyemask"
+	options["Sleeping"] ="sleepingmask"
+	options["Heart"] = "heartmask"
+	options["Core"] = "coremask"
+	options["Plus"] = "plusmask"
+	options["Square"] ="squaremask"
+	options["Bullseye"] = "bullseyemask"
+	options["Vertical"] = "verticalmask"
+	options["Horizontal"] = "horizontalmask"
+	options["X"] ="xmask"
+	options["Bugeyes"] = "bugmask"
+	options["Double"] = "doublemask"
+	options["Mark"] = "markmask"
+
+	var/choice = input(user,"What symbol would you want on this mask?","Morph Mask") in options
+
+	if(src && choice && !user.incapacitated() && in_range(user,src))
+		icon_state = options[choice]
+		user.update_inv_wear_mask()
+		for(var/X in actions)
+			var/datum/action/A = X
+			A.UpdateButtonIcon()
+		to_chat(user, "<span class='notice'>Your paper mask now has a [choice] symbol!</span>")
+		return 1

code/modules/clothing/spacesuits/hardsuit.dm

@@ -422,6 +422,10 @@
 	heat_protection = HEAD												//Uncomment to enable firesuit protection
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 
+/obj/item/clothing/head/helmet/space/hardsuit/wizard/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_WIZARD_HAT, ITEM_SLOT_HEAD)
+
 /obj/item/clothing/suit/space/hardsuit/wizard
 	icon_state = "hardsuit-wiz"
 	name = "gem-encrusted hardsuit"
@@ -436,9 +440,10 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/wizard
 	mutantrace_variation = STYLE_DIGITIGRADE
 
-/obj/item/clothing/suit/space/hardsuit/wizard/Initialize()
+/obj/item/clothing/suit/space/hardsuit/wizard/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/anti_magic, TRUE, FALSE, FALSE, ITEM_SLOT_OCLOTHING, INFINITY, FALSE)
+	AddElement(/datum/element/spellcasting, SPELL_WIZARD_ROBE, ITEM_SLOT_OCLOTHING)
 
 	//Medical hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/medical

code/modules/clothing/suits/wiz_robe.dm

@@ -9,6 +9,12 @@
 	equip_delay_other = 50
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	dog_fashion = /datum/dog_fashion/head/blue_wizard
+	var/magic_flags = SPELL_WIZARD_HAT
+
+/obj/item/clothing/head/wizard/ComponentInitialize()
+	. = ..()
+	if(magic_flags)
+		AddElement(/datum/element/spellcasting, magic_flags, ITEM_SLOT_HEAD)
 
 /obj/item/clothing/head/wizard/red
 	name = "red wizard hat"
@@ -36,7 +42,7 @@
 	permeability_coefficient = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FLAMMABLE
-	dog_fashion = /datum/dog_fashion/head/blue_wizard
+	magic_flags = NONE
 
 /obj/item/clothing/head/wizard/marisa
 	name = "witch hat"
@@ -50,6 +56,7 @@
 	icon_state = "magus"
 	item_state = "magus"
 	dog_fashion = null
+	magic_flags = SPELL_WIZARD_HAT|SPELL_CULT_HELMET
 
 /obj/item/clothing/head/wizard/santa
 	name = "Santa's hat"
@@ -72,6 +79,12 @@
 	strip_delay = 50
 	equip_delay_other = 50
 	resistance_flags = FIRE_PROOF | ACID_PROOF
+	var/magic_flags = SPELL_WIZARD_ROBE
+
+/obj/item/clothing/suit/wizrobe/ComponentInitialize()
+	. = ..()
+	if(magic_flags)
+		AddElement(/datum/element/spellcasting, magic_flags, ITEM_SLOT_OCLOTHING)
 
 /obj/item/clothing/suit/wizrobe/red
 	name = "red wizard robe"
@@ -102,13 +115,14 @@
 	desc = "A set of armored robes that seem to radiate a dark power."
 	icon_state = "magusblue"
 	item_state = "magusblue"
+	magic_flags = SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR
 
 /obj/item/clothing/suit/wizrobe/magusred
 	name = "\improper Magus robe"
 	desc = "A set of armored robes that seem to radiate a dark power."
 	icon_state = "magusred"
 	item_state = "magusred"
-
+	magic_flags = SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR
 
 /obj/item/clothing/suit/wizrobe/santa
 	name = "Santa's suit"
@@ -117,33 +131,27 @@
 	item_state = "santa"
 
 /obj/item/clothing/suit/wizrobe/fake
-	name = "wizard robe"
 	desc = "A rather dull blue robe meant to mimick real wizard robes."
 	icon_state = "wizard-fake"
-	item_state = "wizrobe"
 	gas_transfer_coefficient = 1
 	permeability_coefficient = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FLAMMABLE
+	magic_flags = NONE
 
 /obj/item/clothing/head/wizard/marisa/fake
-	name = "witch hat"
-	desc = "Strange-looking hat-wear, makes you want to cast fireballs."
-	icon_state = "marisa"
 	gas_transfer_coefficient = 1
 	permeability_coefficient = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FLAMMABLE
+	magic_flags = NONE
 
 /obj/item/clothing/suit/wizrobe/marisa/fake
-	name = "witch robe"
-	desc = "Magic is all about the spell power, ZE!"
-	icon_state = "marisa"
-	item_state = "marisarobe"
 	gas_transfer_coefficient = 1
 	permeability_coefficient = 1
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	resistance_flags = FLAMMABLE
+	magic_flags = NONE
 
 /obj/item/clothing/suit/wizrobe/paper
 	name = "papier-mache robe" // no non-latin characters!
@@ -198,6 +206,10 @@
 	slowdown = 0
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
+/obj/item/clothing/suit/space/hardsuit/shielded/wizard/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_WIZARD_HAT, ITEM_SLOT_HEAD)
+
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard
 	name = "battlemage helmet"
 	desc = "A suitably impressive helmet.."
@@ -209,6 +221,10 @@
 	actions_types = null //No inbuilt light
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 
+/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_WIZARD_ROBE, ITEM_SLOT_OCLOTHING)
+
 /obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard/attack_self(mob/user)
 	return
 

code/modules/events/sentience.dm

@@ -59,7 +59,7 @@
 		SA.del_on_death = FALSE
 
 		spawned_mobs += SA
-		SA.AddElement(/datum/element/ghost_role_eligibility)
+		SA.AddElement(/datum/element/ghost_role_eligibility, penalize_on_ghost = TRUE)
 		to_chat(SA, "<span class='userdanger'>Hello world!</span>")
 		to_chat(SA, "<span class='warning'>Due to freak radiation and/or chemicals \
 			and/or lucky chance, you have gained human level intelligence \

code/modules/events/wizard/aid.dm

@@ -15,7 +15,7 @@
 			var/spell_improved = FALSE
 			for(var/obj/effect/proc_holder/spell/S in L.mind.spell_list)
 				if(S.clothes_req)
-					S.clothes_req = 0
+					S.clothes_req = NONE
 					spell_improved = TRUE
 			if(spell_improved)
 				to_chat(L, "<span class='notice'>You suddenly feel like you never needed those garish robes in the first place...</span>")

code/modules/hydroponics/plant_genes.dm

@@ -301,6 +301,9 @@
 	rate = 0.04
 	glow_color = "#AAD84B"
 
+/datum/plant_gene/trait/glow/shadow/glow_power(obj/item/seeds/S)
+	return -max(S.potency*(rate*0.2), 0.2)
+
 /datum/plant_gene/trait/glow/white
 	name = "White Bioluminescence"
 	glow_color = "#FFFFFF"

code/modules/mob/dead/observer/observer.dm

@@ -263,14 +263,15 @@ Works together with spawning an observer, noted above.
 */
 
 /mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE)
-	penalize = suiciding || penalize // suicide squad.
+	var/sig_flags = SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special, penalize)
+	penalize = !(sig_flags & COMPONENT_DO_NOT_PENALIZE_GHOSTING) && (suiciding || penalize) // suicide squad.
 	voluntary_ghosted = voluntary
-	if(!key || key[1] == "@" || (SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special, penalize) & COMPONENT_BLOCK_GHOSTING))
+	if(!key || key[1] == "@" || (sig_flags & COMPONENT_BLOCK_GHOSTING))
 		return //mob has no key, is an aghost or some component hijacked.
 	stop_sound_channel(CHANNEL_HEARTBEAT) //Stop heartbeat sounds because You Are A Ghost Now
 	var/mob/dead/observer/ghost = new(get_turf(src), src)	// Transfer safety to observer spawning proc.
 	SStgui.on_transfer(src, ghost) // Transfer NanoUIs.
-	ghost.can_reenter_corpse = can_reenter_corpse
+	ghost.can_reenter_corpse = can_reenter_corpse || (sig_flags & COMPONENT_FREE_GHOSTING)
 	if (client && client.prefs && client.prefs.auto_ooc)
 		if (!(client.prefs.chat_toggles & CHAT_OOC))
 			client.prefs.chat_toggles ^= CHAT_OOC
@@ -297,12 +298,17 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 			penalty = CANT_REENTER_ROUND
 
-	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE, FALSE, (stat == DEAD)? penalty : 0, (stat == DEAD)? TRUE : FALSE) & COMPONENT_BLOCK_GHOSTING)
+	var/sig_flags = SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, (stat == DEAD) ? TRUE : FALSE, FALSE, (stat == DEAD)? penalty : 0, (stat == DEAD)? TRUE : FALSE)
+
+	if(sig_flags & COMPONENT_BLOCK_GHOSTING)
 		return
 
+	if(sig_flags & COMPONENT_DO_NOT_PENALIZE_GHOSTING)
+		penalty = 0
+
 	if(stat != DEAD)
 		succumb()
-	if(stat == DEAD)
+	if(stat == DEAD || sig_flags & COMPONENT_FREE_GHOSTING)
 		ghostize(1)
 	else
 		var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
@@ -321,7 +327,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	set name = "Ghost"
 	set desc = "Relinquish your life and enter the land of the dead."
 
-	if(SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, FALSE, FALSE) & COMPONENT_BLOCK_GHOSTING)
+	var/sig_flags = SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, FALSE, FALSE)
+
+	if(sig_flags & COMPONENT_BLOCK_GHOSTING)
 		return
 
 	var/penalty = CONFIG_GET(number/suicide_reenter_round_timer) MINUTES
@@ -333,10 +341,16 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		if(penalty - SSshuttle.realtimeofstart > maximumRoundEnd + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
 			penalty = CANT_REENTER_ROUND
 
-	var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
-	if(response != "Ghost")
-		return
-	ghostize(0, penalize = TRUE)
+	if(sig_flags & COMPONENT_DO_NOT_PENALIZE_GHOSTING)
+		penalty = 0
+
+	if(sig_flags & COMPONENT_FREE_GHOSTING)
+		ghostize(1)
+	else
+		var/response = alert(src, "Are you -sure- you want to ghost?\n(You are alive. If you ghost whilst alive you won't be able to re-enter this round [penalty ? "or play ghost roles [penalty == CANT_REENTER_ROUND ? "until the round is over" : "for the next [DisplayTimeText(penalty)]"]" : ""]! You can't change your mind so choose wisely!!)","Are you sure you want to ghost?","Ghost","Stay in body")
+		if(response != "Ghost")
+			return
+		ghostize(0, penalize = TRUE)
 
 
 
@@ -670,7 +684,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		return 0
 
 	transfer_ckey(target, FALSE)
-	target.AddElement(/datum/element/ghost_role_eligibility)
+	target.AddElement(/datum/element/ghost_role_eligibility, penalize_on_ghost = FALSE, free_ghosting = TRUE)
 	target.faction = list("neutral")
 	return 1
 

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

@@ -1474,13 +1474,17 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			else
 				user.do_attack_animation(target, ATTACK_EFFECT_PUNCH)
 
-		user.adjustStaminaLossBuffered(5) //CITADEL CHANGE - makes punching cause staminaloss
+		user.adjustStaminaLossBuffered(3.5) //CITADEL CHANGE - makes punching cause staminaloss
 
 		var/damage = rand(user.dna.species.punchdamagelow, user.dna.species.punchdamagehigh)
+		var/puncherstam = user.getStaminaLoss()
+		var/puncherbrute = user.getBruteLoss()
+		var/punchedstam = target.getStaminaLoss()
+		var/punchedbrute = target.getBruteLoss()
 
 		//CITADEL CHANGES - makes resting and disabled combat mode reduce punch damage, makes being out of combat mode result in you taking more damage
-		if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && damage < user.dna.species.punchstunthreshold)
-			damage = user.dna.species.punchstunthreshold - 1
+		if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+			damage *= 1.5
 		if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 			damage *= 0.5
 		if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
@@ -1494,7 +1498,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage)
 				miss_chance = 0
 			else
-				miss_chance = min((user.dna.species.punchdamagehigh/user.dna.species.punchdamagelow) + user.getStaminaLoss() + (user.getBruteLoss()*0.5), 100) //old base chance for a miss + various damage. capped at 100 to prevent weirdness in prob()
+				miss_chance = min(10 + ((puncherstam + puncherbrute)*0.5), 100) //probability of miss has a base of 10, and modified based on half your stamina and brute total. Capped at max 100 and min 0 to prevent weirdness in prob()
 
 		if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted
 			playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1)
@@ -1529,13 +1533,14 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			log_combat(user, target, "punched")
 
 		if((target.stat != DEAD) && damage >= user.dna.species.punchstunthreshold)
-			target.visible_message("<span class='danger'>[user] knocks [target] down!</span>", \
-							"<span class='userdanger'>You're knocked down by [user]!</span>", "<span class='hear'>You hear aggressive shuffling followed by a loud thud!</span>", COMBAT_MESSAGE_RANGE, user)
-			to_chat(user, "<span class='danger'>You knock [target] down!</span>")
-			var/knockdown_duration = 40 + (target.getStaminaLoss() + (target.getBruteLoss()*0.5))*0.8 - armor_block
-			target.DefaultCombatKnockdown(knockdown_duration)
-			target.forcesay(GLOB.hit_appends)
-			log_combat(user, target, "got a stun punch with their previous punch")
+			if((punchedstam > 50) && prob(punchedstam*0.5)) //If our punch victim has been hit above the threshold, and they have more than 50 stamina damage, roll for stun, probability of 1% per 2 stamina damage
+				target.visible_message("<span class='danger'>[user] knocks [target] down!</span>", \
+								"<span class='userdanger'>You're knocked down by [user]!</span>", "<span class='hear'>You hear aggressive shuffling followed by a loud thud!</span>", COMBAT_MESSAGE_RANGE, user)
+				to_chat(user, "<span class='danger'>You knock [target] down!</span>")
+				var/knockdown_duration = 40 + (punchedstam + (punchedbrute*0.5))*0.8 - armor_block
+				target.DefaultCombatKnockdown(knockdown_duration)
+				target.forcesay(GLOB.hit_appends)
+				log_combat(user, target, "got a stun punch with their previous punch")
 		else if(!(target.mobility_flags & MOBILITY_STAND))
 			target.forcesay(GLOB.hit_appends)
 

code/modules/mob/living/carbon/human/species_types/dwarves.dm

@@ -92,6 +92,8 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 	//These count in on_life ticks which should be 2 seconds per every increment of 1 in a perfect world.
 	var/dwarf_filth_ticker = 0 //Currently set =< 4, that means this will fire the proc around every 4-8 seconds.
 	var/dwarf_eth_ticker = 0 //Currently set =< 1, that means this will fire the proc around every 2 seconds
+	var/last_filth_spam
+	var/last_alcohol_spam
 
 /obj/item/organ/dwarfgland/prepare_eat()
 	var/obj/S = ..()
@@ -136,40 +138,39 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 			filth_counter += 10 //Dwarves could technically chainstun each other in a vomit tantrum spiral.
 	switch(filth_counter)
 		if(11 to 25)
-			if(prob(25))
-				to_chat(owner, "<span class = 'danger'>Someone should really clean up in here!</span>")
+			if(last_filth_spam + 40 SECONDS < world.time)
+				to_chat(owner, "<span class = 'warning'>Someone should really clean up in here!</span>")
+				last_filth_spam = world.time
 		if(26 to 50)
-			if(prob(30)) //Probability the message appears
+			if(prob(6)) //And then the probability they vomit along with it.
 				to_chat(owner, "<span class = 'danger'>The stench makes you queasy.</span>")
-				if(prob(20)) //And then the probability they vomit along with it.
-					owner.vomit(20) //I think vomit should stay over a disgust adjustment.
+				owner.vomit(10) //I think vomit should stay over a disgust adjustment.
 		if(51 to 75)
-			if(prob(35))
+			if(prob(9))
 				to_chat(owner, "<span class = 'danger'>By Armok! You won't be able to keep alcohol down at all!</span>")
-				if(prob(25))
-					owner.vomit(20) //Its more funny
+				owner.vomit(20) //Its more funny
 		if(76 to 100)
-			if(prob(40))
+			if(prob(11))
 				to_chat(owner, "<span class = 'userdanger'>You can't live in such FILTH!</span>")
-				if(prob(25))
-					owner.adjustToxLoss(10) //Now they start dying.
-					owner.vomit(20)
+				owner.adjustToxLoss(10) //Now they start dying.
+				owner.vomit(20)
 		if(101 to INFINITY) //Now they will really start dying
-			if(prob(40))
+			if(last_filth_spam + 12 SECONDS < world.time)
 				to_chat(owner, "<span class = 'userdanger'> THERES TOO MUCH FILTH, OH GODS THE FILTH!</span>")
+				last_filth_spam = world.time
+			if(prob(40))
 				owner.adjustToxLoss(15)
-				owner.vomit(40)
+				owner.vomit(30)
 	CHECK_TICK //Check_tick right here, its motherfuckin magic. (To me at least)
 
 //Handles the dwarf alcohol cycle tied to on_life, it ticks in dwarf_cycle_ticker.
 /obj/item/organ/dwarfgland/proc/dwarf_eth_cycle()
 	//BOOZE POWER
+	var/init_stored_alcohol = stored_alcohol
 	for(var/datum/reagent/R in owner.reagents.reagent_list)
 		if(istype(R, /datum/reagent/consumable/ethanol))
 			var/datum/reagent/consumable/ethanol/E = R
-			stored_alcohol += (E.boozepwr / 50)
-			if(stored_alcohol > max_alcohol) //Dwarves technically start at 250 alcohol stored.
-				stored_alcohol = max_alcohol
+			stored_alcohol = CLAMP(stored_alcohol + E.boozepwr / 50, 0, max_alcohol)
 	var/heal_amt = heal_rate
 	stored_alcohol -= alcohol_rate //Subtracts alcohol_Rate from stored alcohol so EX: 250 - 0.25 per each loop that occurs.
 	if(stored_alcohol > 400) //If they are over 400 they start regenerating
@@ -177,16 +178,27 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
 		owner.adjustFireLoss(-heal_amt) //Unless they drink casually all the time.
 		owner.adjustOxyLoss(-heal_amt)
 		owner.adjustCloneLoss(-heal_amt) //Also they will probably get brain damage if thats a thing here.
-	if(prob(25))
-		switch(stored_alcohol)
-			if(0 to 24)
+	if(init_stored_alcohol + 0.5 < stored_alcohol) //recovering stored alcohol at a steady rate of +0.75, no spam.
+		return
+	switch(stored_alcohol)
+		if(0 to 24)
+			if(last_alcohol_spam + 8 SECONDS < world.time)
 				to_chat(owner, "<span class='userdanger'>DAMNATION INCARNATE, WHY AM I CURSED WITH THIS DRY-SPELL? I MUST DRINK.</span>")
-				owner.adjustToxLoss(35)
-			if(25 to 50)
+				last_alcohol_spam = world.time
+			owner.adjustToxLoss(10)
+		if(25 to 50)
+			if(last_alcohol_spam + 20 SECONDS < world.time)
 				to_chat(owner, "<span class='danger'>Oh DAMN, I need some brew!</span>")
-			if(51 to 75)
+				last_alcohol_spam = world.time
+		if(51 to 75)
+			if(last_alcohol_spam + 35 SECONDS < world.time)
 				to_chat(owner, "<span class='warning'>Your body aches, you need to get ahold of some booze...</span>")
-			if(76 to 100)
+				last_alcohol_spam = world.time
+		if(76 to 100)
+			if(last_alcohol_spam + 40 SECONDS < world.time)
 				to_chat(owner, "<span class='notice'>A pint of anything would really hit the spot right now.</span>")
-			if(101 to 150)
+				last_alcohol_spam = world.time
+		if(101 to 150)
+			if(last_alcohol_spam + 50 SECONDS < world.time)
 				to_chat(owner, "<span class='notice'>You feel like you could use a good brew.</span>")
+				last_alcohol_spam = world.time

code/modules/mob/living/carbon/human/species_types/vampire.dm

@@ -146,5 +146,7 @@
 	if(transfer_name)
 		H.name = caster.name
 
-	clothes_req = 0
-	human_req = 0
+
+	clothes_req = NONE
+	mobs_whitelist = null
+	mobs_blacklist = null

code/modules/mob/living/living_defense.dm

@@ -193,17 +193,6 @@
 	if(user == anchored || !isturf(user.loc))
 		return FALSE
 
-	//pacifist vore check.
-	if(user.pulling && HAS_TRAIT(user, TRAIT_PACIFISM) && user.voremode) //they can only do heals, noisy guts, absorbing (technically not harm)
-		if(ismob(user.pulling))
-			var/mob/P = user.pulling
-			if(src != user)
-				to_chat(user, "<span class='notice'>You can't risk digestion!</span>")
-				return FALSE
-			else
-				user.vore_attack(user, P, user)
-				return
-
 	//normal vore check.
 	if(user.pulling && user.grab_state == GRAB_AGGRESSIVE && user.voremode)
 		if(ismob(user.pulling))

code/modules/mob/living/simple_animal/friendly/gondola.dm

@@ -33,6 +33,10 @@
 	if (!(istype(src, /mob/living/simple_animal/pet/gondola/gondolapod)))
 		CreateGondola()
 
+/mob/living/simple_animal/pet/gondola/ComponentInitialize()
+	. = ..()
+	AddElement(/datum/element/spellcasting, SPELL_SKIP_VOCAL) // so they can cast spells despite being silent.
+
 /mob/living/simple_animal/pet/gondola/proc/CreateGondola()
 	icon_state = null
 	icon_living = null

code/modules/mob/living/simple_animal/guardian/guardian.dm

@@ -112,6 +112,9 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
 			attacktext = "bites"
 			attack_sound = 'sound/weapons/bite.ogg'
 			recolorentiresprite = TRUE
+	if(!recolorentiresprite) //we want this to proc before stand logs in, so the overlay isnt gone for some reason
+		cooloverlay = mutable_appearance(icon, theme)
+		add_overlay(cooloverlay)
 
 /mob/living/simple_animal/hostile/guardian/Login() //if we have a mind, set its name to ours when it logs in
 	..()

code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm

@@ -762,7 +762,7 @@ Difficulty: Very Hard
 	name = "Exit Possession"
 	desc = "Exits the body you are possessing."
 	charge_max = 60
-	clothes_req = 0
+	clothes_req = NONE
 	invocation_type = "none"
 	max_targets = 1
 	range = -1

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -26,7 +26,6 @@
 	pull_force = MOVE_FORCE_OVERPOWERING
 	mob_size = MOB_SIZE_LARGE
 	layer = LARGE_MOB_LAYER //Looks weird with them slipping under mineral walls and cameras and shit otherwise
-	mouse_opacity = MOUSE_OPACITY_OPAQUE // Easier to click on in melee, they're giant targets anyway
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
 	var/list/crusher_loot
 	var/medal_type

code/modules/mob/living/simple_animal/hostile/statue.dm

@@ -169,7 +169,7 @@
 	desc = "You will trigger a large amount of lights around you to flicker."
 
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	range = 14
 
 /obj/effect/proc_holder/spell/aoe_turf/flicker_lights/cast(list/targets,mob/user = usr)
@@ -185,7 +185,7 @@
 
 	message = "<span class='notice'>You glare your eyes.</span>"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	range = 10
 
 /obj/effect/proc_holder/spell/aoe_turf/blindness/cast(list/targets,mob/user = usr)
@@ -201,7 +201,7 @@
 	desc = "Toggle your nightvision mode."
 
 	charge_max = 10
-	clothes_req = 0
+	clothes_req = NONE
 
 	message = "<span class='notice'>You toggle your night vision!</span>"
 	range = -1

code/modules/mob/living/simple_animal/hostile/wizard.dm

@@ -43,23 +43,23 @@
 /mob/living/simple_animal/hostile/wizard/Initialize()
 	. = ..()
 	fireball = new /obj/effect/proc_holder/spell/aimed/fireball
-	fireball.clothes_req = 0
-	fireball.human_req = 0
-	fireball.player_lock = 0
+	fireball.clothes_req = NONE
+	fireball.mobs_whitelist = null
+	fireball.player_lock = FALSE
 	AddSpell(fireball)
 	var/obj/item/implant/exile/I = new
 	I.implant(src, null, TRUE)
 
 	mm = new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile
-	mm.clothes_req = 0
-	mm.human_req = 0
-	mm.player_lock = 0
+	mm.clothes_req = NONE
+	mm.mobs_whitelist = null
+	mm.player_lock = FALSE
 	AddSpell(mm)
 
 	blink = new /obj/effect/proc_holder/spell/targeted/turf_teleport/blink
-	blink.clothes_req = 0
-	blink.human_req = 0
-	blink.player_lock = 0
+	blink.clothes_req = NONE
+	blink.mobs_whitelist = null
+	blink.player_lock = FALSE
 	blink.outer_tele_radius = 3
 	AddSpell(blink)
 

code/modules/mob/mob.dm

@@ -632,7 +632,7 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 
 /mob/proc/add_spells_to_statpanel(list/spells)
 	for(var/obj/effect/proc_holder/spell/S in spells)
-		if(S.can_be_cast_by(src))
+		if((!S.mobs_blacklist || !S.mobs_blacklist[src]) && (!S.mobs_whitelist || S.mobs_whitelist[src]))
 			switch(S.charge_type)
 				if("recharge")
 					statpanel("[S.panel]","[S.charge_counter/10.0]/[S.charge_max/10]",S)

code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm

@@ -57,12 +57,12 @@ It is possible to destroy the net by the occupant or someone else.
 				continue//So all they're left with are shoes and uniform.
 			H.dropItemToGround(W)
 		H.dna.species.give_important_for_life(H)	// After we remove items, at least give them what they need to live.
+/*
 	var/datum/antagonist/antag_datum
 	for(var/datum/antagonist/ninja/AD in GLOB.antagonists) //Because only ninjas get capture objectives; They're not doable without the suit.
 		if(AD.owner == master)
 			antag_datum = AD
 			break
-
 	for(var/datum/objective/capture/capture in antag_datum)
 		if(istype(affecting, /mob/living/carbon/human)) //Humans.
 			if(affecting.stat == DEAD)//Dead folks are worth less.
@@ -87,7 +87,7 @@ It is possible to destroy the net by the occupant or someone else.
 				capture.captured_amount+=1
 				continue
 			capture.captured_amount+=2
-
+*/
 
 	affecting.revive(1, 1)	//Basically a revive and full heal, including limbs/organs
 							//In case people who have been captured dead want to hang out at the holding area

code/modules/ninja/suit/suit.dm

@@ -22,7 +22,7 @@ Contents:
 	armor = list("melee" = 60, "bullet" = 50, "laser" = 30,"energy" = 15, "bomb" = 30, "bio" = 30, "rad" = 30, "fire" = 100, "acid" = 100)
 	strip_delay = 12
 
-	actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjasmoke, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninjanet, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth, /datum/action/item_action/toggle_glove)
+	actions_types = list(/datum/action/item_action/initialize_ninja_suit, /datum/action/item_action/ninjasmoke, /datum/action/item_action/ninjaboost, /datum/action/item_action/ninjapulse, /datum/action/item_action/ninjastar, /datum/action/item_action/ninja_sword_recall, /datum/action/item_action/ninja_stealth, /datum/action/item_action/toggle_glove)
 
 		//Important parts of the suit.
 	var/mob/living/carbon/human/affecting = null
@@ -175,9 +175,6 @@ Contents:
 	if(istype(action, /datum/action/item_action/ninjastar))
 		ninjastar()
 		return TRUE
-	if(istype(action, /datum/action/item_action/ninjanet))
-		ninjanet()
-		return TRUE
 	if(istype(action, /datum/action/item_action/ninja_sword_recall))
 		ninja_sword_recall()
 		return TRUE

code/modules/power/cable.dm

@@ -196,7 +196,7 @@ By design, d1 is the smallest direction and d2 is the highest
 
 /obj/structure/cable/proc/update_stored(length = 1, colorC = "red")
 	stored.amount = length
-	stored.item_color = colorC
+	stored.color = colorC
 	stored.update_icon()
 
 ////////////////////////////////////////////
@@ -469,7 +469,6 @@ By design, d1 is the smallest direction and d2 is the highest
 // Definitions
 ////////////////////////////////
 
-GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restraints", /obj/item/restraints/handcuffs/cable, 15)))
 
 /obj/item/stack/cable_coil
 	name = "cable coil"
@@ -482,7 +481,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	max_amount = MAXCOIL
 	amount = MAXCOIL
 	merge_type = /obj/item/stack/cable_coil // This is here to let its children merge between themselves
-	item_color = "red"
+	color = "red"
 	desc = "A coil of insulated power cable."
 	throwforce = 0
 	w_class = WEIGHT_CLASS_SMALL
@@ -504,7 +503,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 /obj/item/stack/cable_coil/cyborg/attack_self(mob/user)
 	var/cable_color = input(user,"Pick a cable color.","Cable Color") in list("red","yellow","green","blue","pink","orange","cyan","white")
-	item_color = cable_color
+	color = cable_color
 	update_icon()
 
 /obj/item/stack/cable_coil/suicide_act(mob/user)
@@ -514,18 +513,11 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 		user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return(OXYLOSS)
 
-/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null, param_color = null)
+/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null)
 	. = ..()
-
-	var/list/cable_colors = GLOB.cable_colors
-	item_color = param_color || item_color || pick(cable_colors)
-	if(cable_colors[item_color])
-		item_color = cable_colors[item_color]
-
 	pixel_x = rand(-2,2)
 	pixel_y = rand(-2,2)
 	update_icon()
-	recipes = GLOB.cable_coil_recipes
 
 ///////////////////////////////////
 // General procedures
@@ -541,7 +533,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	if(affecting && affecting.status == BODYPART_ROBOTIC)
 		if(user == H)
 			user.visible_message("<span class='notice'>[user] starts to fix some of the wires in [H]'s [affecting.name].</span>", "<span class='notice'>You start fixing some of the wires in [H]'s [affecting.name].</span>")
-			if(!do_mob(user, H, 50))
+			if(!do_after(user, H, 50))
 				return
 		if(item_heal_robotic(H, user, 0, 15))
 			use(1)
@@ -553,8 +545,6 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 /obj/item/stack/cable_coil/update_icon()
 	icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
 	name = "cable [amount < 3 ? "piece" : "coil"]"
-	color = null
-	add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
 
 /obj/item/stack/cable_coil/attack_hand(mob/user)
 	. = ..()
@@ -562,9 +552,28 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 		return
 	var/obj/item/stack/cable_coil/new_cable = ..()
 	if(istype(new_cable))
-		new_cable.item_color = item_color
+		new_cable.color = color
 		new_cable.update_icon()
 
+/obj/item/stack/cable_coil/attack_self(mob/user)
+	if(!check_cable_amount(user))
+		return
+	to_chat(user, "<span class='notice'>You start making some cable restraints.</span>")
+	if(do_after(user, 30, TRUE, user) && check_cable_amount(user))
+		amount -= 15
+		var/obj/item/restraints/handcuffs/cable/result = new(get_turf(user))
+		user.put_in_hands(result)
+		result.color = color 
+		to_chat(user, "<span class='notice'>You make some restraints out of cable</span>")
+		return
+	to_chat(user, "<span class='notice'>You fail to make cable restraints, you need to stand still while doing so.</span>")
+
+/obj/item/stack/cable_coil/proc/check_cable_amount(user)
+	if(amount < 15) //We dont care about cyborgs here, so we dont use get_amount()
+		to_chat(user, "<span class='notice'>You dont have enough cable coil to make restraints out of them</span>")
+		return FALSE
+	return TRUE
+
 //add cables to the stack
 /obj/item/stack/cable_coil/proc/give(extra)
 	if(amount + extra > max_amount)
@@ -581,7 +590,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 
 /obj/item/stack/cable_coil/proc/get_new_cable(location)
 	var/path = /obj/structure/cable
-	return new path(location, item_color)
+	return new path(location, color)
 
 // called when cable_coil is clicked on a turf
 /obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user, dirnew)
@@ -738,7 +747,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 		C.d2 = nd2
 
 		//updates the stored cable coil
-		C.update_stored(2, item_color)
+		C.update_stored(2, color)
 
 		C.add_fingerprint(user)
 		C.update_icon()
@@ -769,40 +778,36 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 /////////////////////////////
 
 /obj/item/stack/cable_coil/red
-	item_color = "red"
-	color = "#ff0000"
+	color = "red"
 
 /obj/item/stack/cable_coil/yellow
-	item_color = "yellow"
-	color = "#ffff00"
+	color = "yellow"
 
 /obj/item/stack/cable_coil/blue
-	item_color = "blue"
-	color = "#1919c8"
+	color = "blue"
 
 /obj/item/stack/cable_coil/green
-	item_color = "green"
-	color = "#00aa00"
+	color = "green"
 
 /obj/item/stack/cable_coil/pink
-	item_color = "pink"
 	color = "#ff3ccd"
 
 /obj/item/stack/cable_coil/orange
-	item_color = "orange"
 	color = "#ff8000"
 
 /obj/item/stack/cable_coil/cyan
-	item_color = "cyan"
-	color = "#00ffff"
+	color = "cyan"
 
 /obj/item/stack/cable_coil/white
-	item_color = "white"
+	color = "white"
 
 /obj/item/stack/cable_coil/random
-	item_color = null
 	color = "#ffffff"
 
+/obj/item/stack/cable_coil/random/Initialize(mapload, new_amount = null, param_color = null)
+	. = ..()
+	var/list/cable_colors = GLOB.cable_colors
+	color = pick(cable_colors)
 
 /obj/item/stack/cable_coil/random/five
 	amount = 5
@@ -820,36 +825,33 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	update_icon()
 
 /obj/item/stack/cable_coil/cut/red
-	item_color = "red"
-	color = "#ff0000"
+	color = "red"
 
 /obj/item/stack/cable_coil/cut/yellow
-	item_color = "yellow"
-	color = "#ffff00"
+	color = "yellow"
 
 /obj/item/stack/cable_coil/cut/blue
-	item_color = "blue"
-	color = "#1919c8"
+	color = "blue"
 
 /obj/item/stack/cable_coil/cut/green
-	item_color = "green"
-	color = "#00aa00"
+	color = "green"
 
 /obj/item/stack/cable_coil/cut/pink
-	item_color = "pink"
 	color = "#ff3ccd"
-
 /obj/item/stack/cable_coil/cut/orange
-	item_color = "orange"
 	color = "#ff8000"
 
 /obj/item/stack/cable_coil/cut/cyan
-	item_color = "cyan"
-	color = "#00ffff"
+	color = "cyan"
 
 /obj/item/stack/cable_coil/cut/white
-	item_color = "white"
+	color = "white"
 
 /obj/item/stack/cable_coil/cut/random
-	item_color = null
-	color = "#ffffff"
+	color = "#ffffff"
+
+/obj/item/stack/cable_coil/cut/random/Initialize(mapload, new_amount = null, param_color = null)
+	. = ..()
+	var/list/cable_colors = GLOB.cable_colors
+	color = pick(cable_colors)
+	

code/modules/projectiles/gun.dm

@@ -41,7 +41,7 @@
 	var/firing = FALSE
 	/// Used in gun-in-mouth execution/suicide and similar, while TRUE nothing should work on this like firing or modification and so on and so forth.
 	var/busy_action = FALSE
-	var/weapon_weight = WEAPON_LIGHT	//currently only used for inaccuracy
+	var/weapon_weight = WEAPON_LIGHT	//used for inaccuracy and wielding requirements/penalties
 	var/spread = 0						//Spread induced by the gun itself.
 	var/burst_spread = 0				//Spread induced by the gun itself during burst fire per iteration. Only checked if spread is 0.
 	var/randomspread = 1				//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.

code/modules/projectiles/guns/ballistic/magweapon.dm

@@ -1,10 +1,10 @@
 /obj/item/gun/ballistic/automatic/magrifle
-	name = "\improper Magnetic Rifle"
+	name = "magnetic rifle"
 	desc = "A simple upscalling of the technologies used in the magpistol, the magrifle is capable of firing slightly larger slugs in bursts. Compatible with the magpistol's slugs."
 	icon_state = "magrifle"
 	item_state = "arg"
 	force = 10
-	slot_flags = NONE
+	slot_flags = ITEM_SLOT_BACK
 	mag_type = /obj/item/ammo_box/magazine/mmag
 	fire_sound = 'sound/weapons/magrifle.ogg'
 	can_suppress = FALSE
@@ -17,6 +17,7 @@
 	inaccuracy_modifier = 0
 	dualwield_spread_mult = 1.4
 	weapon_weight = WEAPON_MEDIUM
+	w_class = WEIGHT_CLASS_BULKY
 	var/obj/item/stock_parts/cell/cell
 	var/cell_type = /obj/item/stock_parts/cell/magnetic
 
@@ -63,12 +64,13 @@
 	spawnwithmagazine = FALSE
 
 /obj/item/gun/ballistic/automatic/magrifle/hyperburst
-	name = "\improper Hyper-Burst Rifle"
+	name = "\improper Hyper-Burst rifle"
 	desc = "An extremely beefed up version of a stolen Nanotrasen weapon prototype, this 'rifle' is more like a cannon, with an extremely large bore barrel capable of generating several smaller magnetic 'barrels' to simultaneously launch multiple projectiles at once."
 	icon_state = "hyperburst"
-	item_state = "arg"
+	slot_flags = NONE //too lazy for the sprites rn and it's pretty stronk anyway.
 	mag_type = /obj/item/ammo_box/magazine/mhyper
 	fire_sound = 'sound/weapons/magburst.ogg'
+	w_class = WEIGHT_CLASS_HUGE
 	fire_delay = 40
 	recoil = 2
 	weapon_weight = WEAPON_HEAVY
@@ -83,6 +85,8 @@
 	name = "magpistol"
 	desc = "A handgun utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities."
 	icon_state = "magpistol"
+	w_class = WEIGHT_CLASS_NORMAL
+	slot_flags = ITEM_SLOT_BELT
 	fire_sound = 'sound/weapons/magpistol.ogg'
 	mag_type = /obj/item/ammo_box/magazine/mmag/small
 	fire_delay = 2

code/modules/projectiles/guns/energy/laser.dm

@@ -24,6 +24,7 @@
 	icon_state = "toyburst"
 	obj_flags = NONE
 	fire_delay = 40
+	w_class = WEIGHT_CLASS_HUGE
 	weapon_weight = WEAPON_HEAVY
 	selfcharge = EGUN_SELFCHARGE
 	charge_delay = 2
@@ -56,12 +57,14 @@
 /obj/item/gun/energy/laser/carbine
 	name = "laser carbine"
 	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun."
-	icon = 'icons/obj/guns/energy.dmi'
 	icon_state = "lasernew"
-	item_state = "laser"
+	item_state = "lasernew"
+	slot_flags = ITEM_SLOT_BACK
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_MEDIUM
+	inaccuracy_modifier = 0.5
 	force = 10
 	throwforce = 10
-	ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
 	cell_type = /obj/item/stock_parts/cell/lascarbine
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -189,96 +189,139 @@
 	if(beaker)
 		for(var/datum/reagent/R in beaker.reagents.reagent_list)
 			beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
-		data["beakerContents"] = beakerContents
+	data["beakerContents"] = beakerContents
 
 	var/bufferContents[0]
 	if(reagents.total_volume)
 		for(var/datum/reagent/N in reagents.reagent_list)
 			bufferContents.Add(list(list("name" = N.name, "id" = ckey(N.name), "volume" = N.volume))) // ^
-		data["bufferContents"] = bufferContents
+	data["bufferContents"] = bufferContents
 
 	//Calculated at init time as it never changes
 	data["pillStyles"] = pillStyles
-
 	return data
 
 /obj/machinery/chem_master/ui_act(action, params)
 	if(..())
 		return
+
 	switch(action)
 		if("eject")
 			replace_beaker(usr)
 			. = TRUE
 
-		if("ejectp")
+		if("ejectPillBottle")
 			replace_pillbottle(usr)
 			. = TRUE
 
-		if("transferToBuffer")
-			if(beaker)
-				var/reagent = GLOB.name2reagent[params["id"]]
-				var/amount = text2num(params["amount"])
-				if (amount > 0)
-					end_fermi_reaction()
-					beaker.reagents.trans_id_to(src, reagent, amount)
-					. = TRUE
-				else if (amount == -1) // -1 means custom amount
-					useramount = input("Enter the Amount you want to transfer:", name, useramount) as num|null
-					if (useramount > 0)
-						end_fermi_reaction()
-						beaker.reagents.trans_id_to(src, reagent, useramount)
-						. = TRUE
-
-		if("transferFromBuffer")
+		if("transfer")
+			if(!beaker)
+				return FALSE
 			var/reagent = GLOB.name2reagent[params["id"]]
 			var/amount = text2num(params["amount"])
-			if (amount > 0)
-				if(mode)
-					reagents.trans_id_to(beaker, reagent, amount)
-					. = TRUE
-				else
-					reagents.remove_reagent(reagent, amount)
-					. = TRUE
-			else if (amount == -1) // -1 means custom amount
-				useramount = input("Enter the Amount you want to transfer:", name, useramount) as num|null
-				if (useramount > 0)
-					end_fermi_reaction()
-					reagents.trans_id_to(beaker, reagent, useramount)
-					. = TRUE
+			var/to_container = params["to"]
+			// Custom amount
+			if (amount == -1)
+				amount = text2num(input(
+					"Enter the amount you want to transfer:",
+					name, ""))
+			if (amount == null || amount <= 0)
+				return FALSE
+			if (to_container == "buffer")
+				end_fermi_reaction()
+				beaker.reagents.trans_id_to(src, reagent, amount)
+				return TRUE
+			if (to_container == "beaker" && mode)
+				end_fermi_reaction()
+				reagents.trans_id_to(beaker, reagent, amount)
+				return TRUE
+			if (to_container == "beaker" && !mode)
+				end_fermi_reaction()
+				reagents.remove_reagent(reagent, amount)
+				return TRUE
+			return FALSE
 
 		if("toggleMode")
 			mode = !mode
 			. = TRUE
 
-		if("createPill")
-			var/many = params["many"]
+		if("pillStyle")
+			var/id = text2num(params["id"])
+			chosenPillStyle = id
+			return TRUE
+
+		if("create")
 			if(reagents.total_volume == 0)
-				return
-			if(!condi)
-				var/amount = 1
-				var/vol_each = min(reagents.total_volume, 50)
-				if(text2num(many))
-					amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many pills?", amount) as num|null), 0, 10)
-					if(!amount)
-						return
-					vol_each = min(reagents.total_volume / amount, 50)
-				var/name = html_decode(stripped_input(usr,"Name:","Name your pill!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
-				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-					return
+				return FALSE
+			var/item_type = params["type"]
+			// Get amount of items
+			var/amount = text2num(params["amount"])
+			if(amount == null)
+				amount = text2num(input(usr,
+					"Max 10. Buffer content will be split evenly.",
+					"How many to make?", 1))
+			amount = clamp(round(amount), 0, 10)
+			if (amount <= 0)
+				return FALSE
+			// Get units per item
+			var/vol_each = text2num(params["volume"])
+			var/vol_each_text = params["volume"]
+			var/vol_each_max = reagents.total_volume / amount
+			if (item_type == "pill")
+				vol_each_max = min(50, vol_each_max)
+			else if (item_type == "patch")
+				vol_each_max = min(40, vol_each_max)
+			else if (item_type == "bottle")
+				vol_each_max = min(30, vol_each_max)
+			else if (item_type == "condimentPack")
+				vol_each_max = min(10, vol_each_max)
+			else if (item_type == "condimentBottle")
+				vol_each_max = min(50, vol_each_max)
+			else if (item_type == "hypoVial")
+				vol_each_max = min(60, vol_each_max)
+			else if (item_type == "smartDart")
+				vol_each_max = min(20, vol_each_max)
+			else
+				return FALSE
+			if(vol_each_text == "auto")
+				vol_each = vol_each_max
+			if(vol_each == null)
+				vol_each = text2num(input(usr,
+					"Maximum [vol_each_max] units per item.",
+					"How many units to fill?",
+					vol_each_max))
+			vol_each = clamp(vol_each, 0, vol_each_max)
+			if(vol_each <= 0)
+				return FALSE
+			// Get item name
+			var/name = params["name"]
+			var/name_has_units = item_type == "pill" || item_type == "patch"
+			if(!name)
+				var/name_default = reagents.get_master_reagent_name()
+				if (name_has_units)
+					name_default += " ([vol_each]u)"
+				name = stripped_input(usr,
+					"Name:",
+					"Give it a name!",
+					name_default,
+					MAX_NAME_LEN)
+			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !issilicon(usr)))
+				return FALSE
+			// Start filling
+			if(item_type == "pill")
 				var/obj/item/reagent_containers/pill/P
 				var/target_loc = drop_location()
 				var/drop_threshold = INFINITY
 				if(bottle)
-					var/datum/component/storage/STRB = bottle.GetComponent(/datum/component/storage)
+					var/datum/component/storage/STRB = bottle.GetComponent(
+						/datum/component/storage)
 					if(STRB)
 						drop_threshold = STRB.max_items - bottle.contents.len
-						target_loc = bottle
-
-				for(var/i in 1 to amount)
-					if(i <= drop_threshold)
-						P = new(target_loc)
+				for(var/i = 0; i < amount; i++)
+					if(i < drop_threshold)
+						P = new/obj/item/reagent_containers/pill(target_loc)
 					else
-						P = new(drop_location())
+						P = new/obj/item/reagent_containers/pill(drop_location())
 					P.name = trim("[name] pill")
 					if(chosenPillStyle == RANDOM_PILL_STYLE)
 						P.icon_state ="pill[rand(1,21)]"
@@ -287,171 +330,62 @@
 					if(P.icon_state == "pill4")
 						P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality."
 					adjust_item_drop_location(P)
-					reagents.trans_to(P,vol_each)
-			else
-				var/name = html_decode(stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN))
-				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-					return
-				var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
-
-				P.originalname = name
-				P.name = trim("[name] pack")
-				P.desc = "A small condiment pack. The label says it contains [name]."
-				reagents.trans_to(P,10)
-			. = TRUE
-
-		if("pillStyle")
-			var/id = text2num(params["id"])
-			chosenPillStyle = id
-
-		if("createPatch")
-			var/many = params["many"]
-			if(reagents.total_volume == 0)
-				return
-			var/amount = 1
-			var/vol_each = min(reagents.total_volume, 40)
-			if(text2num(many))
-				amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many patches?", amount) as num|null), 0, 10)
-				if(!amount)
-					return
-				vol_each = min(reagents.total_volume / amount, 40)
-			var/name = html_decode(stripped_input(usr,"Name:","Name your patch!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
-			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-				return
-			var/obj/item/reagent_containers/pill/P
-
-			for(var/i = 0; i < amount; i++)
-				P = new/obj/item/reagent_containers/pill/patch(drop_location())
-				P.name = trim("[name] patch")
-				adjust_item_drop_location(P)
-				reagents.trans_to(P,vol_each)
-			. = TRUE
-
-		if("createBottle")
-			var/many = params["many"]
-			if(reagents.total_volume == 0)
-				return
-
-			if(condi)
-				var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
-				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-					return
-				var/obj/item/reagent_containers/food/condiment/P = new(drop_location())
-				P.originalname = name
-				P.name = trim("[name] bottle")
-				reagents.trans_to(P, P.volume)
-			else
-				var/amount_full = 0
-				var/vol_part = min(reagents.total_volume, 30)
-				if(text2num(many))
-					amount_full = round(reagents.total_volume / 30)
-					vol_part = ((reagents.total_volume*1000) % 30000) / 1000 //% operator doesn't support decimals.
-				var/name = html_decode(stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
-				if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-					return
-
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "patch")
+				var/obj/item/reagent_containers/pill/patch/P
+				for(var/i = 0; i < amount; i++)
+					P = new/obj/item/reagent_containers/pill/patch(drop_location())
+					P.name = trim("[name] patch")
+					adjust_item_drop_location(P)
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "bottle")
 				var/obj/item/reagent_containers/glass/bottle/P
-				for(var/i = 0; i < amount_full; i++)
+				for(var/i = 0; i < amount; i++)
 					P = new/obj/item/reagent_containers/glass/bottle(drop_location())
 					P.name = trim("[name] bottle")
 					adjust_item_drop_location(P)
-					reagents.trans_to(P, 30)
-
-				if(vol_part)
-					P = new/obj/item/reagent_containers/glass/bottle(drop_location())
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "condimentPack")
+				var/obj/item/reagent_containers/food/condiment/pack/P
+				for(var/i = 0; i < amount; i++)
+					P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
+					P.originalname = name
+					P.name = trim("[name] pack")
+					P.desc = "A small condiment pack. The label says it contains [name]."
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "condimentBottle")
+				var/obj/item/reagent_containers/food/condiment/P
+				for(var/i = 0; i < amount; i++)
+					P = new/obj/item/reagent_containers/food/condiment(drop_location())
+					P.originalname = name
 					P.name = trim("[name] bottle")
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "hypoVial")
+				var/obj/item/reagent_containers/glass/bottle/vial/small/P
+				for(var/i = 0; i < amount; i++)
+					P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
+					P.name = trim("[name] hypovial")
 					adjust_item_drop_location(P)
-					reagents.trans_to(P, vol_part)
-			. = TRUE
-		//CITADEL ADD Hypospray Vials
-		if("createVial")
-			var/many = params["many"]
-			if(reagents.total_volume == 0)
-				return
+					reagents.trans_to(P, vol_each)
+				return TRUE
+			if(item_type == "smartDart")
+				var/obj/item/reagent_containers/syringe/dart/P
+				for(var/i = 0; i < amount; i++)
+					P = new /obj/item/reagent_containers/syringe/dart(drop_location())
+					P.name = trim("[name] SmartDart")
+					adjust_item_drop_location(P)
+					reagents.trans_to(P, vol_each)
+					P.mode=!mode
+					P.update_icon()
+				return TRUE
+			return FALSE
 
-			var/amount_full = 0
-			var/vol_part = min(reagents.total_volume, 60)
-			if(text2num(many))
-				amount_full = round(reagents.total_volume / 60)
-				vol_part = reagents.total_volume % 60
-			var/name = html_decode(stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN))
-			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-				return
-
-			var/obj/item/reagent_containers/glass/bottle/vial/small/P
-			for(var/i = 0; i < amount_full; i++)
-				P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
-				P.name = trim("[name] hypovial")
-				adjust_item_drop_location(P)
-				reagents.trans_to(P, 60)
-
-			if(vol_part)
-				P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
-				P.name = trim("[name] hypovial")
-				adjust_item_drop_location(P)
-				reagents.trans_to(P, vol_part)
-			. = TRUE
-
-		if("createDart")
-			for(var/datum/reagent/R in reagents.reagent_list)
-				if(!(istype(R, /datum/reagent/medicine)))
-					visible_message("<b>The [src]</b> beeps, \"<span class='warning'>SmartDarts are insoluble with non-medicinal compounds.\"</span>")
-					return
-
-			var/many = params["many"]
-			if(reagents.total_volume == 0)
-				return
-			var/amount = 1
-			var/vol_each = min(reagents.total_volume, 20)
-			if(text2num(many))
-				amount = CLAMP(round(input(usr, "Max 10. Buffer content will be split evenly.", "How many darts?", amount) as num|null), 0, 10)
-				if(!amount)
-					return
-				vol_each = min(reagents.total_volume / amount, 20)
-
-			var/name = html_decode(stripped_input(usr,"Name:","Name your SmartDart!", "[reagents.get_master_reagent_name()] ([vol_each]u)", MAX_NAME_LEN))
-			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, !hasSiliconAccessInArea(usr)))
-				return
-
-			var/obj/item/reagent_containers/syringe/dart/D
-			for(var/i = 0; i < amount; i++)
-				D = new /obj/item/reagent_containers/syringe/dart(drop_location())
-				D.name = trim("[name] SmartDart")
-				adjust_item_drop_location(D)
-				reagents.trans_to(D, vol_each)
-				D.mode=!mode
-				D.update_icon()
-			. = TRUE
-
-		//END CITADEL ADDITIONS
-		if("analyzeBeak")
-			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
-			if(R)
-				var/state = "Unknown"
-				if(initial(R.reagent_state) == 1)
-					state = "Solid"
-				else if(initial(R.reagent_state) == 2)
-					state = "Liquid"
-				else if(initial(R.reagent_state) == 3)
-					state = "Gas"
-				var/const/P = 3 //The number of seconds between life ticks
-				var/T = initial(R.metabolization_rate) * (60 / P)
-				var/datum/chemical_reaction/Rcr = get_chemical_reaction(R)
-				if(Rcr && Rcr.FermiChem)
-					fermianalyze = TRUE
-					var/pHpeakCache = (Rcr.OptimalpHMin + Rcr.OptimalpHMax)/2
-					var/datum/reagent/targetReagent = beaker.reagents.has_reagent(R)
-
-					if(!targetReagent)
-						CRASH("Tried to find a reagent that doesn't exist in the chem_master!")
-					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = targetReagent.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
-				else
-					fermianalyze = FALSE
-					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
-				screen = "analyze"
-				return
-
-		if("analyzeBuff")
+		if("analyze")
 			var/datum/reagent/R = GLOB.name2reagent[params["id"]]
 			if(R)
 				var/state = "Unknown"
@@ -476,7 +410,7 @@
 					fermianalyze = FALSE
 					analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
 				screen = "analyze"
-				return
+				return TRUE
 
 		if("goScreen")
 			screen = params["screen"]
@@ -527,4 +461,4 @@
 	condi = TRUE
 
 #undef PILL_STYLE_COUNT
-#undef RANDOM_PILL_STYLE
+#undef RANDOM_PILL_STYLE

code/modules/reagents/chemistry/reagents/drink_reagents.dm

@@ -864,12 +864,13 @@
 	glass_icon_state = "red_queen"
 	glass_name = "Red Queen"
 	glass_desc = "DRINK ME."
-	var/current_size = 1
+	var/current_size = RESIZE_DEFAULT_SIZE
 
 /datum/reagent/consumable/red_queen/on_mob_life(mob/living/carbon/H)
 	if(prob(75))
 		return ..()
 	var/newsize = pick(0.5, 0.75, 1, 1.50, 2)
+	newsize *= RESIZE_DEFAULT_SIZE
 	H.resize = newsize/current_size
 	current_size = newsize
 	H.update_transform()
@@ -878,7 +879,8 @@
 	..()
 
 /datum/reagent/consumable/red_queen/on_mob_end_metabolize(mob/living/M)
-	M.resize = 1/current_size
+	M.resize = RESIZE_DEFAULT_SIZE/current_size
+	current_size = RESIZE_DEFAULT_SIZE
 	M.update_transform()
 	..()
 

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

@@ -1917,22 +1917,22 @@
 	name = "Growth Serum"
 	description = "A commercial chemical designed to help older men in the bedroom."//not really it just makes you a giant
 	color = "#ff0000"//strong red. rgb 255, 0, 0
-	var/current_size = 1
+	var/current_size = RESIZE_DEFAULT_SIZE
 	taste_description = "bitterness" // apparently what viagra tastes like
 
 /datum/reagent/growthserum/on_mob_life(mob/living/carbon/H)
 	var/newsize = current_size
 	switch(volume)
 		if(0 to 19)
-			newsize = 1.25
+			newsize = 1.25*RESIZE_DEFAULT_SIZE
 		if(20 to 49)
-			newsize = 1.5
+			newsize = 1.5*RESIZE_DEFAULT_SIZE
 		if(50 to 99)
-			newsize = 2
+			newsize = 2*RESIZE_DEFAULT_SIZE
 		if(100 to 199)
-			newsize = 2.5
+			newsize = 2.5*RESIZE_DEFAULT_SIZE
 		if(200 to INFINITY)
-			newsize = 3.5
+			newsize = 3.5*RESIZE_DEFAULT_SIZE
 
 	H.resize = newsize/current_size
 	current_size = newsize
@@ -1940,7 +1940,8 @@
 	..()
 
 /datum/reagent/growthserum/on_mob_end_metabolize(mob/living/M)
-	M.resize = 1/current_size
+	M.resize = RESIZE_DEFAULT_SIZE/current_size
+	current_size = RESIZE_DEFAULT_SIZE
 	M.update_transform()
 	..()
 

code/modules/research/designs/machine_desings/machine_designs_all_misc.dm

@@ -45,7 +45,7 @@
 
 /datum/design/board/vendor
 	name = "Machine Design (Vendor Board)"
-	desc = "The circuit board for a Vendor."
+	desc = "The circuit board for a Vendor. Use a screwdriver to turn the \"brand selection\" dial."
 	id = "vendor"
 	build_path = /obj/item/circuitboard/machine/vendor
 	category = list ("Misc. Machinery")

code/modules/research/techweb/all_nodes.dm

@@ -237,7 +237,7 @@
 	display_name = "Games and Toys"
 	description = "For the slackers on the station."
 	prereq_ids = list("comptech")
-	design_ids = list("arcade_battle", "arcade_orion", "slotmachine", "autoylathe")
+	design_ids = list("arcade_battle", "arcade_orion", "arcade_minesweeper", "slotmachine", "autoylathe")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1000)
 
 /////////////////////////Bluespace tech/////////////////////////

code/modules/spells/spell.dm

@@ -109,10 +109,9 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	var/holder_var_type = "bruteloss" //only used if charge_type equals to "holder_var"
 	var/holder_var_amount = 20 //same. The amount adjusted with the mob's var when the spell is used
 
-	var/clothes_req = 1 //see if it requires clothes
-	var/cult_req = 0 //SPECIAL SNOWFLAKE clothes required for cult only spells
-	var/human_req = 0 //spell can only be cast by humans
-	var/nonabstract_req = 0 //spell can only be cast by mobs that are physical entities
+	var/clothes_req = SPELL_WIZARD_GARB //see if it requires clothes
+	var/list/mobs_whitelist //spell can only be casted by mobs in this typecache.
+	var/list/mobs_blacklist //The opposite of the above.
 	var/stat_allowed = 0 //see if it requires being conscious/alive, need to set to 1 for ghostpells
 	var/phase_allowed = 0 // If true, the spell can be cast while phased, eg. blood crawling, ethereal jaunting
 	var/antimagic_allowed = TRUE // If false, the spell cannot be cast while under the effect of antimagic
@@ -144,79 +143,17 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	action_background_icon_state = "bg_spell"
 	base_action = /datum/action/spell_action/spell
 
-/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = 0,mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
-	if(player_lock)
-		if(!user.mind || !(src in user.mind.spell_list) && !(src in user.mob_spell_list))
-			to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
-			return FALSE
-	else
-		if(!(src in user.mob_spell_list))
-			return FALSE
+/obj/effect/proc_holder/spell/Initialize()
+	. = ..()
+	if(mobs_whitelist)
+		mobs_whitelist = typecacheof(mobs_whitelist)
+	if(mobs_blacklist)
+		mobs_blacklist = typecacheof(mobs_blacklist)
 
-	var/turf/T = get_turf(user)
-	if(is_centcom_level(T.z) && !centcom_cancast) //Certain spells are not allowed on the centcom zlevel
-		to_chat(user, "<span class='notice'>You can't cast this spell here.</span>")
+/obj/effect/proc_holder/spell/proc/cast_check(skipcharge = FALSE, mob/user = usr) //checks if the spell can be cast based on its settings; skipcharge is used when an additional cast_check is called inside the spell
+	if(!can_cast(user, skipcharge))
 		return FALSE
 
-	if(!skipcharge)
-		if(!charge_check(user))
-			return FALSE
-
-	if(user.stat && !stat_allowed)
-		to_chat(user, "<span class='notice'>Not when you're incapacitated.</span>")
-		return FALSE
-
-	if(!antimagic_allowed)
-		var/antimagic = user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE)
-		if(antimagic)
-			if(isitem(antimagic))
-				to_chat(user, "<span class='notice'>[antimagic] is interfering with your magic.</span>")
-			else
-				to_chat(user, "<span class='notice'>Magic seems to flee from you, you can't gather enough power to cast this spell.</span>")
-			return FALSE
-
-	if(!phase_allowed && istype(user.loc, /obj/effect/dummy))
-		to_chat(user, "<span class='notice'>[name] cannot be cast unless you are completely manifested in the material plane.</span>")
-		return FALSE
-
-	if(ishuman(user))
-
-		var/mob/living/carbon/human/H = user
-
-		if((invocation_type == "whisper" || invocation_type == "shout") && !H.can_speak_vocal())
-			to_chat(user, "<span class='notice'>You can't get the words out!</span>")
-			return FALSE
-
-		var/list/casting_clothes = typecacheof(list(/obj/item/clothing/suit/wizrobe,
-		/obj/item/clothing/suit/space/hardsuit/wizard,
-		/obj/item/clothing/head/wizard,
-		/obj/item/clothing/head/helmet/space/hardsuit/wizard,
-		/obj/item/clothing/suit/space/hardsuit/shielded/wizard,
-		/obj/item/clothing/head/helmet/space/hardsuit/shielded/wizard))
-
-		if(clothes_req) //clothes check
-			if(!is_type_in_typecache(H.wear_suit, casting_clothes))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my robe.</span>")
-				return FALSE
-			if(!is_type_in_typecache(H.head, casting_clothes))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my hat.</span>")
-				return FALSE
-		if(cult_req) //CULT_REQ CLOTHES CHECK
-			if(!istype(H.wear_suit, /obj/item/clothing/suit/magusred) && !istype(H.wear_suit, /obj/item/clothing/suit/space/hardsuit/cult))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my armor.</span>")
-				return FALSE
-			if(!istype(H.head, /obj/item/clothing/head/magus) && !istype(H.head, /obj/item/clothing/head/helmet/space/hardsuit/cult))
-				to_chat(H, "<span class='notice'>I don't feel strong enough without my helmet.</span>")
-				return FALSE
-	else
-		if(clothes_req || human_req)
-			to_chat(user, "<span class='notice'>This spell can only be cast by humans!</span>")
-			return FALSE
-		if(nonabstract_req && (isbrain(user) || ispAI(user)))
-			to_chat(user, "<span class='notice'>This spell can only be cast by physical beings!</span>")
-			return FALSE
-
-
 	if(!skipcharge)
 		switch(charge_type)
 			if("recharge")
@@ -227,7 +164,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 				adjust_var(user, holder_var_type, holder_var_amount)
 	if(action)
 		action.UpdateButtonIcon()
-	return 1
+	return TRUE
 
 /obj/effect/proc_holder/spell/proc/charge_check(mob/user, silent = FALSE)
 	switch(charge_type)
@@ -482,11 +419,6 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 /obj/effect/proc_holder/spell/proc/updateButtonIcon(status_only, force)
 	action.UpdateButtonIcon(status_only, force)
 
-/obj/effect/proc_holder/spell/proc/can_be_cast_by(mob/caster)
-	if((human_req || clothes_req) && !ishuman(caster))
-		return 0
-	return 1
-
 /obj/effect/proc_holder/spell/targeted/proc/los_check(mob/A,mob/B)
 	//Checks for obstacles from A to B
 	var/obj/dummy = new(A.loc)
@@ -499,24 +431,65 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 	qdel(dummy)
 	return 1
 
-/obj/effect/proc_holder/spell/proc/can_cast(mob/user = usr)
-	if(((!user.mind) || !(src in user.mind.spell_list)) && !(src in user.mob_spell_list))
+/obj/effect/proc_holder/spell/proc/can_cast(mob/user = usr, skipcharge = FALSE, silent = FALSE)
+	var/magic_flags = SEND_SIGNAL(user, COMSIG_MOB_SPELL_CAST_CHECK, src)
+	if(magic_flags & SPELL_SKIP_ALL_REQS)
+		return TRUE
+
+	if(player_lock && (!user.mind || !(src in user.mind.spell_list)))
+		if(!silent)
+			to_chat(user, "<span class='warning'>You shouldn't have this spell! Something's wrong.</span>")
 		return FALSE
 
-	if(!charge_check(user,TRUE))
+	if(!(src in user.mob_spell_list))
 		return FALSE
 
-	if(user.stat && !stat_allowed)
-		return FALSE
-
-	if(!antimagic_allowed && user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE))
-		return FALSE
-
-	if(!ishuman(user))
-		if(clothes_req || human_req)
+	if(!centcom_cancast && !(magic_flags & SPELL_SKIP_CENTCOM)) //Certain spells are not allowed on the centcom zlevel
+		var/turf/T = get_turf(user)
+		if(is_centcom_level(T.z))
+			if(!silent)
+				to_chat(user, "<span class='notice'>You can't cast this spell here.</span>")
 			return FALSE
-		if(nonabstract_req && (isbrain(user) || ispAI(user)))
+
+	if(!skipcharge)
+		if(!charge_check(user))
 			return FALSE
+
+	if(user.stat && !stat_allowed && !(magic_flags & SPELL_SKIP_STAT))
+		if(!silent)
+			to_chat(user, "<span class='notice'>Not when you're incapacitated.</span>")
+		return FALSE
+
+	if(!phase_allowed && istype(user.loc, /obj/effect/dummy))
+		if(!silent)
+			to_chat(user, "<span class='notice'>[name] cannot be cast unless you are completely manifested in the material plane.</span>")
+		return FALSE
+
+	if(clothes_req && !(magic_flags & SPELL_SKIP_CLOTHES))
+		var/met_requirements = magic_flags & (clothes_req)
+		if(met_requirements != clothes_req)
+			if(!silent)
+				var/the_many_hats = met_requirements & (clothes_req & (SPELL_WIZARD_HAT|SPELL_CULT_HELMET))
+				var/the_many_suits = met_requirements & (clothes_req & (SPELL_WIZARD_ROBE|SPELL_CULT_ARMOR))
+				var/without_hat_robe = the_many_suits ? "a proper headwear" : the_many_hats ? "a proper suit" : "proper garments"
+				to_chat(user, "<span class='notice'>I don't feel strong enough to cast this spell without [without_hat_robe].</span>")
+			return FALSE
+
+	if(!antimagic_allowed && !(magic_flags & SPELL_SKIP_ANTIMAGIC) && user.anti_magic_check(TRUE, FALSE, chargecost = 0, self = TRUE))
+		return FALSE
+
+
+	if(!(magic_flags & SPELL_SKIP_VOCAL) && (invocation_type in list("whisper", "shout")) && isliving(user))
+		var/mob/living/L = user
+		if(!L.can_speak_vocal())
+			if(!silent)
+				to_chat(L, "<span class='notice'>You can't get the words out!</span>")
+			return FALSE
+
+	if(!(magic_flags & SPELL_SKIP_MOBTYPE) && ((mobs_whitelist && !mobs_whitelist[user]) || (mobs_blacklist && mobs_blacklist[user])))
+		if(!silent)
+			to_chat(user, "<span class='notice'>This spell can't be casted in this current form!</span>")
+		return FALSE
 	return TRUE
 
 /obj/effect/proc_holder/spell/self //Targets only the caster. Good for buffs and heals, but probably not wise for fireballs (although they usually fireball themselves anyway, honke)
@@ -531,8 +504,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
 /obj/effect/proc_holder/spell/self/basic_heal //This spell exists mainly for debugging purposes, and also to show how casting works
 	name = "Lesser Heal"
 	desc = "Heals a small amount of brute and burn damage."
-	human_req = 1
-	clothes_req = 0
+	mobs_whitelist = list(/mob/living/carbon/human)
+	clothes_req = NONE
 	charge_max = 100
 	cooldown_min = 50
 	invocation = "Victus sano!"

code/modules/spells/spell_types/aimed.dm

@@ -16,7 +16,7 @@
 	if(!istype(user))
 		return
 	var/msg
-	if(!can_cast(user))
+	if(!can_cast(user, FALSE, TRUE))
 		msg = "<span class='warning'>You can no longer cast [name]!</span>"
 		remove_ranged_ability(msg)
 		return
@@ -95,7 +95,6 @@
 	desc = "Fire a high powered lightning bolt at your foes!"
 	school = "evocation"
 	charge_max = 150
-	clothes_req = 1
 	invocation = "ZAP MUTHA'FUCKA"
 	invocation_type = "shout"
 	cooldown_min = 30
@@ -113,7 +112,7 @@
 	desc = "This spell fires a fireball at a target and does not require wizard garb."
 	school = "evocation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "ONI SOMA"
 	invocation_type = "shout"
 	range = 20
@@ -131,7 +130,7 @@
 	desc = "Blazing hot rapid-fire homing cards. Banish your foes with its mystical power!"
 	school = "evocation"
 	charge_max = 50
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "Sigi'lu M'Fan 'Tasia"
 	invocation_type = "shout"
 	range = 40

code/modules/spells/spell_types/area_teleport.dm

@@ -1,7 +1,7 @@
 /obj/effect/proc_holder/spell/targeted/area_teleport
 	name = "Area teleport"
 	desc = "This spell teleports you to a type of area of your selection."
-	nonabstract_req = 1
+	mobs_blacklist = list(/mob/living/brain, /mob/living/silicon/pai)
 
 	var/randomise_selection = 0 //if it lets the usr choose the teleport loc or picks it from the list
 	var/invocation_area = 1 //if the invocation appends the selected area

code/modules/spells/spell_types/barnyard.dm

@@ -5,7 +5,7 @@
 	charge_type = "recharge"
 	charge_max	= 150
 	charge_counter = 0
-	clothes_req = 0
+	clothes_req = NONE
 	stat_allowed = 0
 	invocation = "KN'A FTAGHU, PUCK 'BTHNK!"
 	invocation_type = "shout"

code/modules/spells/spell_types/bloodcrawl.dm

@@ -2,7 +2,7 @@
 	name = "Blood Crawl"
 	desc = "Use pools of blood to phase out of existence."
 	charge_max = 0
-	clothes_req = 0
+	clothes_req = NONE
 	//If you couldn't cast this while phased, you'd have a problem
 	phase_allowed = 1
 	selection_type = "range"

code/modules/spells/spell_types/charge.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "DIRI CEL"
 	invocation_type = "whisper"
 	range = -1

code/modules/spells/spell_types/conjure.dm

@@ -60,7 +60,7 @@
 	name = "Link Worlds"
 	desc = "A whole new dimension for you to play with! They won't be happy about it, though."
 	invocation = "WTF"
-	clothes_req = FALSE
+	clothes_req = NONE
 	charge_max = 600
 	cooldown_min = 200
 	summon_type = list(/obj/structure/spawner/nether)
@@ -74,7 +74,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	var/obj/item/item
 	var/item_type = /obj/item/banhammer
 	school = "conjuration"

code/modules/spells/spell_types/construct_spells.dm

@@ -7,7 +7,7 @@
 	action_background_icon_state = "bg_demon"
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/construct/lesser/cult
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 	charge_max = 2500
 
 
@@ -17,7 +17,7 @@
 
 	school = "transmutation"
 	charge_max = 50
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 2
@@ -37,7 +37,7 @@
 
 	school = "conjuration"
 	charge_max = 20
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -53,7 +53,7 @@
 
 	school = "conjuration"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -70,7 +70,7 @@
 
 	school = "conjuration"
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -83,7 +83,7 @@
 
 	school = "conjuration"
 	charge_max = 2400
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = 0
@@ -94,7 +94,7 @@
 	summon_type = list(/obj/item/soulstone)
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/cult
-	cult_req = 1
+	clothes_req = SPELL_CULT_GARB
 	charge_max = 3600
 
 /obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone/noncult
@@ -105,7 +105,7 @@
 	desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
 	school = "transmutation"
 	charge_max = 400
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	wall_type = /obj/effect/forcefield/cult
@@ -121,7 +121,7 @@
 
 	school = "transmutation"
 	charge_max = 250
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -143,7 +143,7 @@
 
 	school = "evocation"
 	charge_max = 400
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	proj_type = "/obj/effect/proc_holder/spell/targeted/inflict_handler/magic_missile/lesser"
@@ -161,7 +161,7 @@
 
 	school = "conjuration"
 	charge_max = 200
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
@@ -185,7 +185,7 @@
 	stat_allowed = FALSE
 
 	school = "evocation"
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -232,7 +232,7 @@
 	stat_allowed = FALSE
 
 	school = "evocation"
-	clothes_req = FALSE
+	clothes_req = NONE
 	invocation = "none"
 	invocation_type = "none"
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
@@ -294,7 +294,7 @@
 	proj_lifespan = 15
 	proj_step_delay = 7
 	charge_max = 350
-	clothes_req = FALSE
+	clothes_req = NONE
 	action_icon = 'icons/mob/actions/actions_cult.dmi'
 	action_icon_state = "cultfist"
 	action_background_icon_state = "bg_demon"

code/modules/spells/spell_types/devil.dm

@@ -4,7 +4,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	item_type = /obj/item/twohanded/pitchfork/demonic
 
 	school = "conjuration"
@@ -37,7 +37,7 @@
 	invocation = "Just sign on the dotted line."
 	include_user = 0
 	range = 5
-	clothes_req = 0
+	clothes_req = NONE
 
 	school = "conjuration"
 	charge_max = 150
@@ -79,7 +79,7 @@
 
 	school = "evocation"
 	charge_max = 80
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "Your very soul will catch fire!"
 	invocation_type = "shout"
 	range = 2
@@ -92,7 +92,7 @@
 	name = "Infernal Jaunt"
 	desc = "Use hellfire to phase out of existence."
 	charge_max = 200
-	clothes_req = 0
+	clothes_req = NONE
 	selection_type = "range"
 	range = -1
 	cooldown_min = 0
@@ -167,7 +167,7 @@
 	name = "Sin Touch"
 	desc = "Subtly encourage someone to sin."
 	charge_max = 1800
-	clothes_req = 0
+	clothes_req = NONE
 	selection_type = "range"
 	range = 2
 	cooldown_min = 0
@@ -206,7 +206,7 @@
 	desc = "When what a Devil really needs is funk."
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 
 	school = "conjuration"
 	charge_max = 10

code/modules/spells/spell_types/devil_boons.dm

@@ -4,7 +4,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	school = "conjuration"
 	charge_max = 100
 	cooldown_min = 10
@@ -32,7 +32,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	charge_max = 50
 	cooldown_min = 10
 	action_icon = 'icons/mob/actions/actions_silicon.dmi'
@@ -51,7 +51,7 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
+	clothes_req = NONE
 	charge_max = 50
 	cooldown_min = 10
 	action_icon = 'icons/mob/actions/actions_spells.dmi'
@@ -73,4 +73,4 @@
 		friendShell = new /obj/effect/mob_spawn/human/demonic_friend(L.loc, L.mind, src)
 
 /obj/effect/proc_holder/spell/targeted/conjure_item/spellpacket/robeless
-	clothes_req = FALSE
+	clothes_req = NONE

code/modules/spells/spell_types/ethereal_jaunt.dm

@@ -4,13 +4,12 @@
 
 	school = "transmutation"
 	charge_max = 300
-	clothes_req = 1
 	invocation = "none"
 	invocation_type = "none"
 	range = -1
 	cooldown_min = 100 //50 deciseconds reduction per rank
 	include_user = 1
-	nonabstract_req = 1
+	mobs_blacklist = list(/mob/living/brain, /mob/living/silicon/pai)
 	var/jaunt_duration = 50 //in deciseconds
 	var/jaunt_in_time = 5
 	var/jaunt_in_type = /obj/effect/temp_visual/wizard

code/modules/spells/spell_types/forcewall.dm

@@ -3,7 +3,7 @@
 	desc = "Create a magical barrier that only you can pass through. Does not require wizard garb."
 	school = "transmutation"
 	charge_max = 80
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "TARCOL MINTI ZHERI"
 	invocation_type = "shout"
 	sound = 'sound/magic/forcewall.ogg'

code/modules/spells/spell_types/infinite_guns.dm

@@ -7,7 +7,6 @@
 
 	school = "conjuration"
 	charge_max = 750
-	clothes_req = 1
 	cooldown_min = 10 //Gun wizard
 	action_icon_state = "bolt_action"
 	var/summon_path = /obj/item/gun/ballistic/shotgun/boltaction/enchanted

code/modules/spells/spell_types/knock.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "AULIE OXIN FIERA"
 	invocation_type = "whisper"
 	range = 3

code/modules/spells/spell_types/lichdom.dm

@@ -8,7 +8,7 @@
 	becoming a lich destroys all internal organs except the brain."
 	school = "necromancy"
 	charge_max = 10
-	clothes_req = 0
+	clothes_req = NONE
 	centcom_cancast = 0
 	invocation = "NECREM IMORTIUM!"
 	invocation_type = "shout"

code/modules/spells/spell_types/lightning.dm

@@ -3,7 +3,6 @@
 	desc = "Blast lightning at your foes!"
 	charge_type = "recharge"
 	charge_max	= 270
-	clothes_req = 1
 	invocation = "UN'LTD P'WAH!"
 	invocation_type = "shout"
 	range = 7

code/modules/spells/spell_types/mime.dm

@@ -8,10 +8,10 @@
 	invocation_emote_self = "<span class='notice'>You form a wall in front of yourself.</span>"
 	summon_lifespan = 300
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	range = 0
 	cast_sound = null
-	human_req = 1
+	mobs_whitelist = list(/mob/living/carbon/human)
 
 	action_icon_state = "mime"
 	action_background_icon_state = "bg_mime"
@@ -32,8 +32,8 @@
 	desc = "Make or break a vow of silence."
 	school = "mime"
 	panel = "Mime"
-	clothes_req = 0
-	human_req = 1
+	clothes_req = NONE
+	mobs_whitelist = list(/mob/living/carbon/human)
 	charge_max = 3000
 	range = -1
 	include_user = 1
@@ -75,7 +75,7 @@
 	invocation_emote_self = "<span class='notice'>You form a blockade in front of yourself.</span>"
 	charge_max = 600
 	sound =  null
-	clothes_req = 0
+	clothes_req = NONE
 	range = -1
 	include_user = 1
 
@@ -98,7 +98,7 @@
 	school = "mime"
 	panel = "Mime"
 	charge_max = 300
-	clothes_req = 0
+	clothes_req = NONE
 	invocation_type = "emote"
 	invocation_emote_self = "<span class='dangers'>You fire your finger gun!</span>"
 	range = 20

code/modules/spells/spell_types/mind_transfer.dm

@@ -4,7 +4,7 @@
 
 	school = "transmutation"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "GIN'YU CAPAN"
 	invocation_type = "whisper"
 	range = 1

code/modules/spells/spell_types/rod_form.dm

@@ -1,8 +1,6 @@
 /obj/effect/proc_holder/spell/targeted/rod_form
 	name = "Rod Form"
 	desc = "Take on the form of an immovable rod, destroying all in your path."
-	clothes_req = 1
-	human_req = 0
 	charge_max = 250
 	cooldown_min = 100
 	range = -1

code/modules/spells/spell_types/santa.dm

@@ -4,7 +4,7 @@
 	desc = "This spell lets you reach into S-space and retrieve presents! Yay!"
 	school = "santa"
 	charge_max = 600
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "HO HO HO"
 	invocation_type = "shout"
 	range = 3

code/modules/spells/spell_types/shadow_walk.dm

@@ -2,7 +2,7 @@
 	name = "Shadow Walk"
 	desc = "Grants unlimited movement in darkness."
 	charge_max = 0
-	clothes_req = 0
+	clothes_req = NONE
 	phase_allowed = 1
 	selection_type = "range"
 	range = -1

code/modules/spells/spell_types/shapeshift.dm

@@ -1,8 +1,7 @@
 /obj/effect/proc_holder/spell/targeted/shapeshift
 	name = "Shapechange"
 	desc = "Take on the shape of another for a time to use their natural abilities. Once you've made your choice it cannot be changed."
-	clothes_req = 0
-	human_req = 0
+	clothes_req = NONE
 	charge_max = 200
 	cooldown_min = 50
 	range = -1
@@ -59,8 +58,9 @@
 	var/mob/living/shape = new shapeshift_type(caster.loc)
 	H = new(shape,src,caster)
 
-	clothes_req = 0
-	human_req = 0
+	clothes_req = NONE
+	mobs_whitelist = null
+	mobs_blacklist = null
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/proc/Restore(mob/living/shape)
 	var/obj/shapeshift_holder/H = locate() in shape
@@ -70,7 +70,8 @@
 	H.restore()
 
 	clothes_req = initial(clothes_req)
-	human_req = initial(human_req)
+	mobs_whitelist = typecacheof(initial(mobs_whitelist))
+	mobs_blacklist = typecacheof(initial(mobs_blacklist))
 
 /obj/effect/proc_holder/spell/targeted/shapeshift/dragon
 	name = "Dragon Form"

code/modules/spells/spell_types/spacetime_distortion.dm

@@ -11,7 +11,7 @@
 	cooldown_min = 300
 	level_max = 0
 
-/obj/effect/proc_holder/spell/spacetime_dist/can_cast(mob/user = usr)
+/obj/effect/proc_holder/spell/spacetime_dist/can_cast(mob/user = usr, skipcharge = FALSE, silent = FALSE)
 	if(ready)
 		return ..()
 	return FALSE

code/modules/spells/spell_types/summonitem.dm

@@ -3,7 +3,7 @@
 	desc = "This spell can be used to recall a previously marked item to your hand from anywhere in the universe."
 	school = "transmutation"
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation = "GAR YOK"
 	invocation_type = "whisper"
 	range = -1
@@ -105,7 +105,7 @@
 
 			if(item_to_retrieve.loc)
 				item_to_retrieve.loc.visible_message("<span class='warning'>The [item_to_retrieve.name] suddenly disappears!</span>")
-			if(!L.put_in_hands(item_to_retrieve))
+			if(!isitem(item_to_retrieve) || !L.put_in_hands(item_to_retrieve))
 				item_to_retrieve.forceMove(L.drop_location())
 				item_to_retrieve.loc.visible_message("<span class='caution'>The [item_to_retrieve.name] suddenly appears!</span>")
 				playsound(get_turf(L), 'sound/magic/summonitems_generic.ogg', 50, 1)

code/modules/spells/spell_types/taeclowndo.dm

@@ -4,7 +4,6 @@
 	invocation_type = "none"
 	include_user = 1
 	range = -1
-	clothes_req = 0
 	item_type = /obj/item/reagent_containers/food/snacks/pie/cream
 
 	charge_max = 30
@@ -20,7 +19,7 @@
 	charge_type = "recharge"
 	charge_max	= 100
 	cooldown_min = 100
-	clothes_req = 0
+	clothes_req = NONE
 	invocation_type = "none"
 	range = 7
 	selection_type = "view"
@@ -61,7 +60,7 @@
 	hand_path = /obj/item/melee/touch_attack/megahonk
 
 	charge_max = 100
-	clothes_req = 0
+	clothes_req = NONE
 	cooldown_min = 100
 
 	action_icon = 'icons/mecha/mecha_equipment.dmi'
@@ -75,7 +74,7 @@
 	hand_path = /obj/item/melee/touch_attack/bspie
 
 	charge_max = 450
-	clothes_req = 0
+	clothes_req = NONE
 	cooldown_min = 450
 
 	action_icon = 'icons/obj/food/piecake.dmi'