Skip to content

Comments

addz tajaran bladez#891

Open
kittysmooch wants to merge 7 commits intoDopplerShift13:masterfrom
kittysmooch:tajaran-bladez
Open

addz tajaran bladez#891
kittysmooch wants to merge 7 commits intoDopplerShift13:masterfrom
kittysmooch:tajaran-bladez

Conversation

@kittysmooch
Copy link
Collaborator

@kittysmooch kittysmooch commented Feb 23, 2026

About The Pull Request

image

adds a pair of tajaran dueling blades. one is a basic rapier that's like a sidegrade of the tiziran choppa or downgrade of the captain's sabre, and the other is a viboblade antag only weapon that's like the captain's sabre on crack. it hums when you turn it on.

the civilian sword is available in the loadout or a contraband crate. i dunno if it actually needs to be a contraband crate but it felt like a wise plan at the time. the antag one is available in the uplink for the same price as the energy sword, which it's roughly a sidegrade of. bigger, eats your belt slot, better armor pen, worse block chance, etc etc

Why It's Good For The Game

this pr builds on the existing tajaran gear and puts some more doppler specific lore up front. it's also a secret psyop to get more people to make anthro catboys and to get juni to write more tajaran lore, so it's a good idea to merge it i think

Testing Evidence

spawn da swords, checked icon states, checked pre- and post-transform numbers, checked a ton of other stuff 👍 i made like three typos in the body of the pr tho so maybe i fucked something up here

Changelog

🆑
add: Added the Tajaran duelist's blade, which is available in the loadout or in a contraband crate.
add: Added the Tajaran vibroblade, which is available in antagonist uplinks.
🆑

@github-actions github-actions bot added Sprites Funny little pixels on our screen Sound Soundwaves that hit the player at roughly 342 m/s Feature Something new, something fresh. labels Feb 23, 2026
@kittysmooch
Copy link
Collaborator Author

on GOD ill go finish the nevada pr now

Copy link
Collaborator

@00-Steven 00-Steven left a comment

Choose a reason for hiding this comment

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

no comments yet otherwise but uhhh you use multiple different typepaths for storage for what I assume should be the same one
using the more readable one in the suggestion

Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Signed-off-by: kittysmooch <105110468+kittysmooch@users.noreply.github.com>
@github-actions github-actions bot requested a review from 00-Steven February 23, 2026 16:14
w_class = WEIGHT_CLASS_BULKY
obj_flags = UNIQUE_RENAME
interaction_flags_click = parent_type::interaction_flags_click | NEED_DEXTERITY | NEED_HANDS
storage_type = /datum/storage/kitten_belt
Copy link
Collaborator

Choose a reason for hiding this comment

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

and remember to actually update this

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yeah I'll handle it when I'm home rather than trying to web edit on a phone lol

@github-actions github-actions bot requested a review from 00-Steven February 24, 2026 03:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Feature Something new, something fresh. Sound Soundwaves that hit the player at roughly 342 m/s Sprites Funny little pixels on our screen

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants