Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix

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(..())