Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-adds back CQC to the traitor uplink #14474

Merged
merged 3 commits into from
Oct 17, 2020
Merged

Re-adds back CQC to the traitor uplink #14474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
797d940
the good ole switcheroo
Cocacolagua Sep 27, 2020
b2626ab
yeah kinda forgot about the point of this
Cocacolagua Sep 27, 2020
b30417a
and now i do it properly
Cocacolagua Sep 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 0 additions & 10 deletions code/datums/uplink_item.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,14 +238,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
Expand Down Expand Up @@ -871,9 +863,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

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend adding a cant_discount = TRUE and refundable = TRUE here, since martial arts are !!STRONK!! and accidental purchasing it would be a bit of a pain.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fair enough

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd argue against that.... since we allow MUCH stronger things on discount than cqc.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not about strength, but it's the same reason as carp, if you get it, you can't unget it, sniper rifle can oneshot a guy, but you can still disarm em and pick it up. Sure, chainsaw is nodrop, but you can just kill them and clone them.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does CQC persist through being killed and cloned?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does persist through cloning now. As does any martial art

/datum/uplink_item/stealthy_weapons/cameraflash
name = "Camera Flash"
Expand Down
3 changes: 0 additions & 3 deletions code/modules/martial_arts/martial.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,9 +274,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
Expand Down