From fad919c0399dbac773a33a2c9f01a246c62c180a Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 23 Jul 2016 00:27:17 +0100 Subject: [PATCH 1/3] Adds telecrystal teleporting --- code/game/objects/items/stacks/telecrystal.dm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index 2682361d2c8..b088e95a7fb 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -7,19 +7,16 @@ icon_state = "telecrystal" w_class = 1 max_amount = 240 - flags = NOBLUDGEON origin_tech = list(TECH_MATERIAL = 6, TECH_BLUESPACE = 4) + force = 1 //Needs a token force to ensure you can attack because for some reason you can't attack with 0 force things -/obj/item/stack/telecrystal/afterattack(var/obj/item/I as obj, mob/user as mob, proximity) - if(!proximity) - return - if(istype(I, /obj/item)) - if(I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up. - I.hidden_uplink.uses += amount - I.hidden_uplink.update_nano_data() - nanomanager.update_uis(I.hidden_uplink) - use(amount) - user << "You slot \the [src] into \the [I] and charge its internal uplink." +/obj/item/stack/telecrystal/apply_hit_effect(mob/living/target, mob/living/user, var/hit_zone) + if(amount >= 5) + target.visible_message("\The [target] has been transported with \the [src] by \the [user].") + safe_blink(target, 14) + use(5) + else + user << "There is not enough telecrystal's to do that." /obj/item/stack/telecrystal/attack_self(mob/user as mob) if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals From 0c7fdd715e8154c4942518c43bec915013ad5b07 Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sat, 23 Jul 2016 00:27:35 +0100 Subject: [PATCH 2/3] Adds changelog --- html/changelogs/Yoshax - Telecrystals.yml | 39 +++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 html/changelogs/Yoshax - Telecrystals.yml diff --git a/html/changelogs/Yoshax - Telecrystals.yml b/html/changelogs/Yoshax - Telecrystals.yml new file mode 100644 index 00000000000..25e6a390864 --- /dev/null +++ b/html/changelogs/Yoshax - Telecrystals.yml @@ -0,0 +1,39 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Yoshax + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Attacking yourself, or anyone else with a stack of five or more telecrystals will teleport the attacked person to a random, safe (not in space) location within 14 metres." + - tweak: "All telecrystals ammounts have been multiplied by 10. This means the base amount is now 120, and an emag for example costs 30, vs the previous 12 and 3, respectively." + - tweak: "You can once again use telecrystals on an emag to add more uses to it. You get 1 use per every 2 telecrystals." + - tweak: "Instead of only being able to remove 1 telecrystal from your uplink, you can now remove 1, 5, 10, 25, 50." From 623cb52e848794bd2293e3ab7c7ff3c5eb2ffefd Mon Sep 17 00:00:00 2001 From: Yoshax Date: Sun, 7 Aug 2016 00:51:33 +0100 Subject: [PATCH 3/3] Grammar typo fix --- code/game/objects/items/stacks/telecrystal.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm index b088e95a7fb..f56b9580fc0 100644 --- a/code/game/objects/items/stacks/telecrystal.dm +++ b/code/game/objects/items/stacks/telecrystal.dm @@ -16,7 +16,7 @@ safe_blink(target, 14) use(5) else - user << "There is not enough telecrystal's to do that." + user << "There are not enough telecrystals to do that." /obj/item/stack/telecrystal/attack_self(mob/user as mob) if(user.mind.accept_tcrystals) //Checks to see if antag type allows for tcrystals