diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index fd00e0bc58..294714163f 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -8,6 +8,14 @@ name = "CQC" help_verb = /mob/living/carbon/human/proc/CQC_help block_chance = 75 + var/just_a_cook = FALSE + var/static/list/areas_under_siege = typecacheof(list(/area/crew_quarters/kitchen, + /area/crew_quarters/cafeteria, + /area/crew_quarters/bar)) + +/datum/martial_art/cqc/under_siege + name = "Culinary School Training" + just_a_cook = TRUE /datum/martial_art/cqc/proc/drop_restraining() restraining = 0 @@ -92,6 +100,9 @@ return 1 /datum/martial_art/cqc/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(just_a_cook) + if(!is_type_in_typecache(get_area(A), areas_under_siege)) + return 0 add_to_streak("G",D) if(check_streak(A,D)) return 1 @@ -107,6 +118,9 @@ return 1 /datum/martial_art/cqc/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(just_a_cook) + if(!is_type_in_typecache(get_area(A), areas_under_siege)) + return 0 add_to_streak("H",D) if(check_streak(A,D)) return 1 @@ -135,6 +149,9 @@ return 1 /datum/martial_art/cqc/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + if(just_a_cook) + if(!is_type_in_typecache(get_area(A), areas_under_siege)) + return 0 add_to_streak("D",D) var/obj/item/I = null if(check_streak(A,D)) @@ -170,7 +187,6 @@ set name = "Remember The Basics" set desc = "You try to remember some of the basics of CQC." set category = "CQC" - to_chat(usr, "You try to remember some of the basics of CQC.") to_chat(usr, "Slam: Grab Harm. Slam opponent into the ground, knocking them down.") @@ -178,7 +194,7 @@ to_chat(usr, "Restrain: Grab Grab. Locks opponents into a restraining position, disarm to knock them out with a choke hold.") to_chat(usr, "Pressure: Disarm Grab. Decent stamina damage.") to_chat(usr, "Consecutive CQC: Disarm Disarm Harm. Mainly offensive move, huge damage and decent stamina damage.") - + to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.") /obj/item/cqc_manual diff --git a/code/modules/jobs/job_types/cargo_service.dm b/code/modules/jobs/job_types/cargo_service.dm index a832f62376..c74fbd3b1b 100644 --- a/code/modules/jobs/job_types/cargo_service.dm +++ b/code/modules/jobs/job_types/cargo_service.dm @@ -216,7 +216,7 @@ Cook var/chosen_box = pick(possible_boxes) var/obj/item/storage/box/I = new chosen_box(src) H.equip_to_slot_or_del(I,slot_in_backpack) - var/datum/martial_art/cqc/justacook = new + var/datum/martial_art/cqc/under_siege/justacook = new justacook.teach(H) /*