From 344226b2b4490d1bf8e1c925625570b1c4c9fe0f Mon Sep 17 00:00:00 2001 From: trololiver112 <59520813+trololiver112@users.noreply.github.com> Date: Mon, 8 Jun 2020 20:51:43 +0200 Subject: [PATCH 1/2] Gives the Chef the CQC manual as a traitor item --- code/datums/uplink_item.dm | 8 ++++++++ code/modules/martial_arts/martial.dm | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index a0c9a19e4b0..bd5950c0469 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -247,6 +247,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) cost = 2 job = list("Chef") +/datum/uplink_item/jobspecific/Chef_CQC + name = " A chefs manual to CQC" + desc = "An old manual teaching you how to bring your home advantage outside the kitchen." + reference = "CCQC" + item = /obj/item/CQC_manual/chef + cost = 12 + job = list("Chef") + //Chaplain /datum/uplink_item/jobspecific/voodoo diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 478438c47cb..3bdc63a670f 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -195,12 +195,17 @@ icon = 'icons/obj/library.dmi' icon_state = "cqcmanual" +/obj/item/CQC_manual/chef + desc = "A small, black manual. Written on the back it says: Bringing the home advantage with you." + /obj/item/CQC_manual/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return to_chat(user, "You remember the basics of CQC.") var/datum/martial_art/cqc/CQC = new(null) + var/datum/martial_art/cqc/under_siege/CCQC = new(null) + CCQC.remove(user) CQC.teach(user) user.drop_item() visible_message("[src] beeps ominously, and a moment later it bursts up in flames.") From 34bfd891e7d2f412bfd47d5f227e0acf3d66860c Mon Sep 17 00:00:00 2001 From: trololiver112 <59520813+trololiver112@users.noreply.github.com> Date: Mon, 8 Jun 2020 22:03:15 +0200 Subject: [PATCH 2/2] Removes CCQC.remove --- code/modules/martial_arts/martial.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index 3bdc63a670f..924cc7b7d69 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -204,8 +204,6 @@ to_chat(user, "You remember the basics of CQC.") var/datum/martial_art/cqc/CQC = new(null) - var/datum/martial_art/cqc/under_siege/CCQC = new(null) - CCQC.remove(user) CQC.teach(user) user.drop_item() visible_message("[src] beeps ominously, and a moment later it bursts up in flames.")