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

Allows uplinks to buy more types of Martial Arts. #23329

Closed
wants to merge 3 commits into from
Closed

Allows uplinks to buy more types of Martial Arts. #23329

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
980769d
Gives more martial arts to uplinks.
Firecage Jan 25, 2017
47b39af
Removes the wrestling belt from the uplink for now.
Firecage Jan 25, 2017
67f2f8f
Changes cost of Plasma Fist from 18 to 20,and made it undiscountable.
Firecage Jan 25, 2017
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
36 changes: 29 additions & 7 deletions code/modules/uplink/uplink_item.dm
View file
Open in desktop
Expand Up @@ -564,26 +564,48 @@ var/list/uplink_items = list() // Global list so we only initialize this once.
item = /obj/mecha/combat/marauder/mauler/loaded
cost = 140

// Stealthy Weapons
/datum/uplink_item/stealthy_weapons
category = "Stealthy and Inconspicuous Weapons"
// Martial Arts
/datum/uplink_item/martial_arts
category = "Martial Arts"

/datum/uplink_item/stealthy_weapons/martialarts
name = "Martial Arts Scroll"
/datum/uplink_item/martial_arts/sleeping_carp
name = "Sleeping Carp Scroll"
desc = "This scroll contains the secrets of an ancient martial arts technique. You will master unarmed combat, \
deflecting all ranged weapon fire, but you also refuse to use dishonorable ranged weaponry."
item = /obj/item/weapon/sleeping_carp_scroll
cost = 17
surplus = 0
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)

/datum/uplink_item/stealthy_weapons/cqc
/datum/uplink_item/martial_arts/cqc
name = "CQC Manual"
desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
item = /obj/item/weapon/cqc_manual
include_modes = list(/datum/game_mode/nuclear)
cost = 13
surplus = 0
exclude_modes = list(/datum/game_mode/gang)

/datum/uplink_item/martial_arts/plasma_fist
Copy link
Contributor

Choose a reason for hiding this comment

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

Let's...not. This thing is ridiculously overpowered.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Read above. Already planning to replace it with a new one.

name = "Plasma Fist Scroll"
desc = "An ancient scroll containing the secrets to a highly lethal martial arts simply known as 'Plasma Fist'. \
The punches are rumoured to be highly explosive."
item = /obj/item/weapon/plasma_fist_scroll
cost = 20
surplus = 0
cant_discount = TRUE
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)

/datum/uplink_item/martial_arts/bostaff
name = "Bo Staff"
desc = "This is a long wooden staff which has traditionally been used in old Earth martial arts. It is a highly effective \
and often dangerous weapon."
item = /obj/item/weapon/twohanded/bostaff
cost = 13
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/gang)

// Stealthy Weapons
/datum/uplink_item/stealthy_weapons
category = "Stealthy and Inconspicuous Weapons"

/datum/uplink_item/stealthy_weapons/throwingweapons
name = "Box of Throwing Weapons"
Expand Down