From 0867cce0ecdccd092eab7305b64316f92161d656 Mon Sep 17 00:00:00 2001 From: Cocacolagua <48032385+Cocacolagua@users.noreply.github.com> Date: Sat, 17 Oct 2020 14:55:21 -0300 Subject: [PATCH] Re-adds back CQC to the traitor uplink (#14474) * the good ole switcheroo * yeah kinda forgot about the point of this * and now i do it properly --- code/datums/uplink_item.dm | 10 ---------- code/modules/martial_arts/martial.dm | 3 --- 2 files changed, 13 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 0e96ba8c346..9b90e06acce 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -234,14 +234,6 @@ 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 @@ -867,9 +859,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing. Does not restrict weapon usage, but cannot be used alongside Gloves of the North Star." reference = "CQC" item = /obj/item/CQC_manual - gamemodes = list(/datum/game_mode/nuclear) cost = 13 - surplus = 0 /datum/uplink_item/stealthy_weapons/cameraflash name = "Camera Flash" diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm index cc8c1e9933b..7c2648b987e 100644 --- a/code/modules/martial_arts/martial.dm +++ b/code/modules/martial_arts/martial.dm @@ -275,9 +275,6 @@ 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