Skip to content

Commit

Permalink
Retypes to the Data Knife and Adjusts Description (#5920)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

1. **Retypes the Data Knife and Adjusts its Description.**

## Why It's Good For The Game

1. _I don't know who made an addition to the description. It might've
been me and I've just forgotten, but I really didn't like the way it was
originally phrased. While I was editing it, I realized the Dataknife
lost its GPS abilities due to the GPS rework. After dabbling with it
some, I've realized that the best way to retain the original features is
to just make the dataknife a GPS subtype, rather than a knife subtype.
I've done this before with the survival knife, so I'm pretty familiar
with the process and efficacy._

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

:cl:
tweak: Retypes the data knife to a gps subtype.
tweak: Tweaks the description of the data knife.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
Captain277 authored Aug 28, 2023
1 parent 7d600bf commit 827db4f
Show file tree
Hide file tree
Showing 7 changed files with 239 additions and 251 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@

/datum/crafting_recipe/dataknife
name = "Data Knife"
result = /obj/item/material/knife/tacknife/dataknife
result = /obj/item/gps/dataknife
tools = list(TOOL_SCREWDRIVER, TOOL_WELDER)
reqs = list(/obj/item/stack/cable_coil = 10,
/obj/item/multitool = 1,
Expand Down
21 changes: 21 additions & 0 deletions code/game/objects/items/devices/gps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -590,3 +590,24 @@
long_range = TRUE
hide_signal = TRUE
can_hide_signal = TRUE

/obj/item/gps/dataknife
name = "data knife"
desc = "This sleek combat knife's blade is inlaid with complex circuitry, capable of hacking electronics. A GPS device built into the pommel ensures the user can always maintain their orientation. Formerly produced under contract by Ward Takahashi in 2512 - allegedly for SysDef counter-piracy units - this deadly blade boasts an electronics warfare package that remains viable to this day."
icon = 'icons/obj/kitchen.dmi'
icon_state = "dataknife"
item_state = "knife"
damage_force = 15
throw_force = 10
sharp = 1
edge = 1
w_class = ITEMSIZE_NORMAL
origin_tech = list(TECH_COMBAT = 4, TECH_ILLEGAL = 4)
attack_verb = list("sliced", "chopped", "stabbed", "pierced")
tool_speed = 2 // Use a real axe if you want to chop logs.
gps_tag = "UNKN"
hide_signal = TRUE
update_name_tag = FALSE

/obj/item/gps/dataknife/is_multitool()
return TRUE
14 changes: 0 additions & 14 deletions code/game/objects/items/weapons/material/knives.dm
Original file line number Diff line number Diff line change
Expand Up @@ -224,20 +224,6 @@
icon_state = "machetedx"
item_state = "machete"

//The Return of the Data Knife
/obj/item/material/knife/tacknife/dataknife
name = "data knife"
desc = "Oddly enough, a Ward-Takahashi product. This sleek combat knife's blade is inlaid with complex circuitry, capable of hacking electronics. It also sports a GPS system in the pommel, ensuring you'll never be lost."
icon = 'icons/obj/kitchen.dmi'
icon_state = "dataknife"
item_state = "knife"
applies_material_colour = FALSE
default_material = "plasteel"
tool_speed = 2 // Use a real axe if you want to chop logs.

/obj/item/material/knife/tacknife/dataknife/is_multitool()
return TRUE

// Knife Material Variants
/obj/item/material/butterfly/plasteel
default_material = "plasteel"
Expand Down
11 changes: 4 additions & 7 deletions maps/rift/levels/rift-04-surface1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,7 @@
/turf/simulated/floor/tiled/steel,
/area/rnd/hallway)
"awp" = (
/obj/machinery/door/window{
dir = 2
},
/obj/machinery/door/window,
/obj/structure/window/reinforced{
dir = 4
},
Expand Down Expand Up @@ -21490,7 +21488,6 @@
/area/rnd/hallway)
"nrZ" = (
/obj/machinery/door/morgue{
dir = 2;
name = "Private Study";
req_access = list(37)
},
Expand Down Expand Up @@ -26412,9 +26409,9 @@
initialize_directions = 1;
internal_pressure_bound = 4000;
internal_pressure_bound_default = 4000;
on = 1;
pressure_checks_default = 2;
pump_direction = 0;
on = 1
pump_direction = 0
},
/obj/machinery/door/window/southleft{
dir = 1;
Expand Down Expand Up @@ -31440,7 +31437,7 @@
"tna" = (
/obj/effect/floor_decal/rust,
/obj/structure/table/woodentable,
/obj/item/material/knife/tacknife/dataknife,
/obj/item/gps/dataknife,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"tnt" = (
Expand Down
Loading

0 comments on commit 827db4f

Please sign in to comment.