Skip to content

Commit

Permalink
Obliterates the lasso (goliath riding no longer requires it) (#3417)
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

No longer player accessible as of #3296 which means less yeehaw

## Why It's Good For The Game

~~horse~~ goliathback cowboy combat

## Changelog

:cl:
balance: you no longer need a lasso to ride a goliath
del: no more lasso
/: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. -->

Signed-off-by: Theos <theubernyan@gmail.com>
  • Loading branch information
SomeguyManperson authored Oct 7, 2024
1 parent 7146aa5 commit 672cf03
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 15 deletions.
3 changes: 1 addition & 2 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -383,8 +383,7 @@
/obj/item/storage/bag/plants,
/obj/item/stack/marker_beacon,
/obj/item/restraints/legcuffs/bola/watcher,
/obj/item/melee/sword/bone,
/obj/item/key/lasso
/obj/item/melee/sword/bone
))


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,6 @@
D.set_vehicle_dir_layer(NORTH, OBJ_LAYER)
D.set_vehicle_dir_layer(EAST, OBJ_LAYER)
D.set_vehicle_dir_layer(WEST, OBJ_LAYER)
D.keytype = /obj/item/key/lasso
D.drive_verb = "ride"
else
user.visible_message("<span class='warning'>[src] is rocking around! You can't put the saddle on!</span>")
Expand Down
12 changes: 0 additions & 12 deletions code/modules/vehicles/vehicle_key.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,3 @@
/obj/item/key/janitor
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
icon_state = "keyjanitor"

/obj/item/key/lasso
name = "bone lasso"
desc = "Perfect for taming all kinds of supernatural beasts! (Warning: only perfect for taming one kind of supernatural beast.)"
force = 12
icon_state = "lasso"
item_state = "chain"
lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
attack_verb = list("flogged", "whipped", "lashed", "disciplined")
hitsound = 'sound/weapons/whip.ogg'
slot_flags = ITEM_SLOT_BELT
Binary file modified icons/obj/vehicles.dmi
Binary file not shown.

0 comments on commit 672cf03

Please sign in to comment.