aaaaaaaaaa
This commit is contained in:
@@ -102,6 +102,12 @@ GLOBAL_LIST_EMPTY(uplinks)
|
||||
return //no hitting everyone/everything just to try to slot tcs in!
|
||||
if(istype(I, /obj/item/stack/telecrystal))
|
||||
LoadTC(user, I)
|
||||
if(active)
|
||||
var/datum/component/uplink/hidden_uplink = I.GetComponent(/datum/component/uplink)
|
||||
var/amt = hidden_uplink.telecrystals
|
||||
hidden_uplink.telecrystals -= amt
|
||||
src.telecrystals += amt
|
||||
to_chat(user, "<span class='notice'>You connect the [I] to your uplink, siphoning [amt] telecrystals before quickly undoing the connection.")
|
||||
for(var/category in uplink_items)
|
||||
for(var/item in uplink_items[category])
|
||||
var/datum/uplink_item/UI = uplink_items[category][item]
|
||||
|
||||
@@ -477,6 +477,23 @@
|
||||
name = "empty scroll"
|
||||
icon_state = "blankscroll"
|
||||
|
||||
/obj/item/book/granter/martial/krav_maga
|
||||
martial = /datum/martial_art/krav_maga
|
||||
name = "parchment scroll"
|
||||
martialname = "krav maga"
|
||||
desc = "A worn parchment scrap written in an ancient language. Somehow you can still understand the lessons!"
|
||||
greet = "<span class='sciradio'>You have learned the ancient martial art of Krav Maga. You have special attacks with which to take down your foes.</span>"
|
||||
icon = 'icons/obj/wizard.dmi'
|
||||
icon_state ="scroll2"
|
||||
remarks = list("Sweep the legs...", "Chop the throat...", "Punch the lungs...", "Get the gold...", "Where are my sick gloves..?")
|
||||
|
||||
/obj/item/book/granter/martial/krav_maga/onlearned(mob/living/carbon/user)
|
||||
..()
|
||||
if(oneuse == TRUE)
|
||||
desc = "It's completely blank."
|
||||
name = "empty scroll"
|
||||
icon_state = "blankscroll"
|
||||
|
||||
// I did not include mushpunch's grant, it is not a book and the item does it just fine.
|
||||
|
||||
|
||||
|
||||
@@ -193,7 +193,7 @@
|
||||
if(syndicate)
|
||||
fail_msg += "<span class='userdanger'> You no longer have permission to die. </span>"
|
||||
else
|
||||
fail_msg += "<span class='userdanger'> The truth could still slip out!</font><B><font size=5 color=red> Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated.</span>"
|
||||
fail_msg += "<span class='userdanger'> The truth could still slip out!</font><B><font size=5 color=red> Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to great shame.</span>"
|
||||
reinstate_escape_objective(owner)
|
||||
last_man_standing = FALSE
|
||||
to_chat(owner.current, fail_msg)
|
||||
|
||||
@@ -163,7 +163,7 @@
|
||||
|
||||
/datum/uplink_item/bundles_TC/reroll
|
||||
name = "Renegotiate Contract"
|
||||
desc = "Selecting this will inform the syndicate that you wish to change employers. Can only be done once; no take-backs."
|
||||
desc = "Selecting this will inform your employers that you wish for new objectives. Can only be done once; no take-backs."
|
||||
item = /obj/effect/gibspawner/generic
|
||||
cost = 0
|
||||
cant_discount = TRUE
|
||||
|
||||
@@ -65,6 +65,16 @@
|
||||
surplus = 0
|
||||
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
|
||||
|
||||
/datum/uplink_item/stealthy_weapons/martialartsthree
|
||||
name = "Krav Maga Scroll"
|
||||
desc = "This scroll contains the secrets of an ancient martial arts technique. You will gain special unarmed attacks for \
|
||||
stealthy takedowns."
|
||||
item = /obj/item/book/granter/martial/krav_maga
|
||||
cost = 16
|
||||
player_minimum = 30
|
||||
surplus = 0
|
||||
include_modes = list(/datum/game_mode/traitor/internal_affairs)
|
||||
|
||||
/datum/uplink_item/stealthy_weapons/crossbow
|
||||
name = "Miniature Energy Crossbow"
|
||||
desc = "A short bow mounted across a tiller in miniature. Small enough to \
|
||||
|
||||
Reference in New Issue
Block a user