Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper #26947

Merged
merged 12 commits into from
Jul 21, 2024

Conversation

Blackern5000
Copy link
Contributor

@Blackern5000 Blackern5000 commented Apr 14, 2024

About the PR

Replaces the weapons in the syndicate borg weapon's module with
An energy dagger that is NOT disguised as a pen.
A recharging viper called the "Echis" (A type of viper) that generates one bullet every four seconds and holds up to 10 at a time.

Also adds an undisguised version of the energy dagger which is louder and cannot write, which borgs with the weapons module use.

Why / Balance

Syndies don't get lasers, they use ballistics and energy melees.

Media

2024-07-12.08-32-11.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Changelog

🆑

  • tweak: The syndicate agent's cyborg weapons module now uses syndicate weaponry rather than NT weaponry.

@github-actions github-actions bot added the Changes: No C# Changes: Requires no C# knowledge to review or fix this item. label Apr 14, 2024
@SoulFN
Copy link
Contributor

SoulFN commented Apr 14, 2024

LoL, i wanted to do the same thing

@Dutch-VanDerLinde
Copy link
Contributor

what about a viper instead

@SoulFN
Copy link
Contributor

SoulFN commented Apr 14, 2024

what about a viper instead

Cobra is silent and doesn't leave a bullet casing

@SoulFN
Copy link
Contributor

SoulFN commented Apr 14, 2024

Maybe, you should replace e-sword with e-pen, cobra is 4 TC, e-sword is 8 TC, getting an weapons for a borg that costs 12 TC for 5 TC is not fair.

@Blackern5000
Copy link
Contributor Author

Maybe, you should replace e-sword with e-pen, cobra is 4 TC, e-sword is 8 TC, getting an weapons for a borg that costs 12 TC for 5 TC is not fair.

You still need to spend 8 tc to hijack the borg, so it's actually 13 tc to do this. 18 if you have two borgs though.

@SoulFN
Copy link
Contributor

SoulFN commented Apr 15, 2024

You still need to spend 8 tc to hijack the borg, so it's actually 13 tc to do this. 18 if you have two borgs though.

But you still have emag, not only borgs

@Everturning
Copy link

machetes and advanced lasers are barely used ingame, also poses the question of "how can it make these caseless bullets inside its chassis".
"syndie borgs" you say, but those are specially built for it. this is just a hijacked borg with no space for it. even saying it's the module is iffy.

@SoulFN
Copy link
Contributor

SoulFN commented Apr 18, 2024

machetes and advanced lasers are barely used ingame, also poses the question of "how can it make these caseless bullets inside its chassis". "syndie borgs" you say, but those are specially built for it. this is just a hijacked borg with no space for it. even saying it's the module is iffy.

As i remember, you can put L6-SAW module into regular borg, why he can produce bullets to L6-SAW, but can't produce ammo to cobra?

@SoulFN
Copy link
Contributor

SoulFN commented Apr 18, 2024

Engi borgs can also produce infinite resources (RCD), producing pistol ammo makes sense

@superjj18
Copy link

"how can it make these caseless bullets inside its chassis"

How do we get so many bullets in them? Like this! Plus, we fire the whole bullet. That's 65% more bullet per bullet. This is the same technology we've been using on robots for decades. Scares the hell out of them. :trollface:

@K-Dynamic
Copy link
Contributor

Can we just agree on 'bluespace magic' or something, otherwise we'll be arguing about physical and energy limitations of borgs for a while rather than balancing

@deltanedas
Copy link
Contributor

if you are going to argue that infinite cobra is op see infinite l6 which is broken

@Blackern5000
Copy link
Contributor Author

I'd love for this to be reviewed before the feature freeze

@thebadman4662
Copy link

Yes, death to borg legions with lasers!

@Blackern5000
Copy link
Contributor Author

Blackern5000 commented May 10, 2024

I made it an energy dagger instead of a sword I'd love if someone could merge this in the next 6 hours.
I believe it is important that syndies getting lasers is removed

@Blackern5000 Blackern5000 changed the title Replace the machete and laser in the borg weapons module with an e-sword and recharging cobra Replace the machete and laser in the borg weapons module with an e-dagger and recharging cobra May 10, 2024
@Emisse
Copy link
Contributor

Emisse commented May 10, 2024

Closed due to feature freeze May 10th-June 14th. Comment to have it reopen after this.

@Emisse Emisse closed this May 10, 2024
@Blackern5000
Copy link
Contributor Author

Open please

@Plykiya
Copy link
Contributor

Plykiya commented Jul 4, 2024

Apparently this PR is needed because people are (reportedly) giving their nukie borgs lasers...?

Copy link
Contributor

@metalgearsloth metalgearsloth left a comment

Choose a reason for hiding this comment

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

Make it not silenced as it sounds too goofy.

@metalgearsloth metalgearsloth added the S: Awaiting Changes Status: Changes are required before another review can happen label Jul 4, 2024
Copy link
Contributor

github-actions bot commented Jul 12, 2024

RSI Diff Bot; head commit f5a06c6 merging into c94c727
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Objects/Weapons/Melee/e_dagger_loud.rsi

State Old New Status
e_sword Added
e_sword_blade Added
icon Added
inhand-left-blade Added
inhand-left Added
inhand-right-blade Added
inhand-right Added

Edit: diff updated after f5a06c6

@Blackern5000
Copy link
Contributor Author

Make it not silenced as it sounds too goofy.

Done, I made it a viper instead of a cobra.

@Tayrtahn
Copy link
Member

Tayrtahn commented Jul 12, 2024

This will need to be updated to work with the changes to item toggling introduced by #28039

@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Jul 12, 2024
@IProduceWidgets
Copy link
Contributor

Do held items still drop when borgs are gibbed? If so this will run into the problem the l6 module has where it drops for crew to use.

@Plykiya
Copy link
Contributor

Plykiya commented Jul 17, 2024

Do held items still drop when borgs are gibbed? If so this will run into the problem the l6 module has where it drops for crew to use.

the L6 "spawns" but attempting to interact with it does nothing, it's like a weird cursed item parented to the module is how that worked last time I saw it being weird

think that got fixed at some point and nothing but the module itself probably drops now

@Golinth
Copy link
Contributor

Golinth commented Jul 18, 2024

Can you still cryo Borgs to access their held item? Same issue as above, if the crew gets their hands on this it could be pretty wild

@Blackern5000
Copy link
Contributor Author

Can you still cryo Borgs to access their held item? Same issue as above, if the crew gets their hands on this it could be pretty wild

That sounds more like an exploit that needs to be fixed with borgs rather than something that needs to be fixed with my pr.

@deltanedas
Copy link
Contributor

cryoing borgs just deletes items you take out, no exploit here

also borgs just shouldnt be allowed in cryo

@metalgearsloth metalgearsloth added S: Awaiting Changes Status: Changes are required before another review can happen and removed S: Needs Review Status: Requires additional reviews before being fully accepted labels Jul 20, 2024
@github-actions github-actions bot added S: Needs Review Status: Requires additional reviews before being fully accepted and removed S: Awaiting Changes Status: Changes are required before another review can happen labels Jul 21, 2024
@metalgearsloth metalgearsloth enabled auto-merge (squash) July 21, 2024 07:04
@metalgearsloth metalgearsloth merged commit c872582 into space-wizards:master Jul 21, 2024
14 checks passed
Schrodinger71 added a commit to AdventureTimeSS14/space_station_ADT that referenced this pull request Jul 27, 2024
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->

## Changelog.yml
<details><summary>Лист чейнжлогов, смотреть подробнее..</summary>

```yml
- author: SlamBamActionman
  changes:
  - message: RGBee and Rainbow Carp plushies now cycle color when held/worn.
    type: Fix
  id: 6917
  time: '2024-07-14T10:26:34.0000000+00:00'
  url: space-wizards/space-station-14#30023
- author: Winkarst-cpu
  changes:
  - message: Now grappling gun is clumsy proof.
    type: Tweak
  id: 6918
  time: '2024-07-14T10:26:56.0000000+00:00'
  url: space-wizards/space-station-14#29904
- author: HahayesSiH
  changes:
  - message: It is now possible to pet cyborgs.
    type: Add
  - message: Clicking on cyborgs and opening the strip menu no longer unlocks them.
    type: Tweak
  id: 6919
  time: '2024-07-14T14:09:41.0000000+00:00'
  url: space-wizards/space-station-14#30037
- author: deltanedas
  changes:
  - message: Fixed ninja shoes not working as magboots.
    type: Fix
  id: 6920
  time: '2024-07-14T15:11:40.0000000+00:00'
  url: space-wizards/space-station-14#28586
- author: lzk228
  changes:
  - message: Scarves are eatable again.
    type: Fix
  id: 6921
  time: '2024-07-14T15:12:25.0000000+00:00'
  url: space-wizards/space-station-14#29959
- author: Winkarst-cpu
  changes:
  - message: Now addgamerule command processes only valid game rules.
    type: Fix
  id: 6922
  time: '2024-07-15T19:18:33.0000000+00:00'
  url: space-wizards/space-station-14#29912
- author: Jezithyr
  changes:
  - message: Removed the Geras ability from Slimes
    type: Remove
  id: 6923
  time: '2024-07-16T22:50:17.0000000+00:00'
  url: space-wizards/space-station-14#29731
- author: K-Dynamic
  changes:
  - message: nerfed paraylze timer of all slippable objects (including soaps, water
      puddles, and clown-related items)
    type: Tweak
  id: 6924
  time: '2024-07-16T23:26:02.0000000+00:00'
  url: space-wizards/space-station-14#27879
- author: EmoGarbage404
  changes:
  - message: Resprited wall signs.
    type: Tweak
  id: 6925
  time: '2024-07-17T04:35:19.0000000+00:00'
  url: space-wizards/space-station-14#29806
- author: lzk228
  changes:
  - message: Added health examine for caustic and cold damage.
    type: Add
  id: 6926
  time: '2024-07-17T06:19:13.0000000+00:00'
  url: space-wizards/space-station-14#29989
- author: lzk228
  changes:
  - message: Surgery saws now are normal-sized (no more pocket circular saw).
    type: Tweak
  id: 6927
  time: '2024-07-17T06:26:10.0000000+00:00'
  url: space-wizards/space-station-14#29995
- author: Winkarst-cpu
  changes:
  - message: The super door remote is now able to control Syndicate doors.
    type: Fix
  id: 6928
  time: '2024-07-17T13:50:25.0000000+00:00'
  url: space-wizards/space-station-14#30033
- author: Errant
  changes:
  - message: Vox are temporarily removed from Space Ninjas and all Unknown Shuttle
      ghostroles, until code supports giving them species-specific gear.
    type: Tweak
  id: 6929
  time: '2024-07-17T22:04:51.0000000+00:00'
  url: space-wizards/space-station-14#30099
- author: Cojoke-dot
  changes:
  - message: You can no longer teleport objects that should not be in other objects
      into other objects with the Quantum Spin Inverter
    type: Fix
  id: 6930
  time: '2024-07-18T00:40:54.0000000+00:00'
  url: space-wizards/space-station-14#29200
- author: Plykiya
  changes:
  - message: Stun batons no longer use up charges when hitting objects without stamina.
    type: Fix
  id: 6931
  time: '2024-07-18T00:48:09.0000000+00:00'
  url: space-wizards/space-station-14#30136
- author: Sh18RW
  changes:
  - message: Moth can't eat boots with an item more
    type: Fix
  id: 6932
  time: '2024-07-18T22:34:18.0000000+00:00'
  url: space-wizards/space-station-14#30019
- author: portfiend
  changes:
  - message: Reptilians display correct mask sprites in character customization screen.
    type: Fix
  id: 6933
  time: '2024-07-18T22:36:53.0000000+00:00'
  url: space-wizards/space-station-14#30095
- author: Plykiya
  changes:
  - message: You no longer deal double damage to your first target when throwing an
      item.
    type: Fix
  id: 6934
  time: '2024-07-19T01:08:52.0000000+00:00'
  url: space-wizards/space-station-14#30115
- author: deepdarkdepths
  changes:
  - message: Removed the description about geras in the Slime guidebook section.
    type: Remove
  id: 6935
  time: '2024-07-19T09:04:43.0000000+00:00'
  url: space-wizards/space-station-14#30140
- author: Blackern5000
  changes:
  - message: Nuclear operatives are now able to purchase durable armor which is NOT
      space-proof.
    type: Add
  id: 6936
  time: '2024-07-19T09:38:26.0000000+00:00'
  url: space-wizards/space-station-14#29845
- author: Plykiya, slarticodefast
  changes:
  - message: Explosive pens now correctly embed into their target.
    type: Fix
  id: 6937
  time: '2024-07-19T09:42:58.0000000+00:00'
  url: space-wizards/space-station-14#30112
- author: ThatOneEnby1337
  changes:
  - message: News Reporters are now able to use markup tags in their reports without
      bricking the PDAs of readers
    type: Fix
  id: 6938
  time: '2024-07-19T14:18:39.0000000+00:00'
  url: space-wizards/space-station-14#30169
- author: themias
  changes:
  - message: Mailing units are functional again
    type: Fix
  id: 6939
  time: '2024-07-20T02:31:26.0000000+00:00'
  url: space-wizards/space-station-14#30174
- author: Ghagliiarghii
  changes:
  - message: Nuclear Operatives' Reinforcements now have a PDA!
    type: Tweak
  id: 6940
  time: '2024-07-20T02:59:31.0000000+00:00'
  url: space-wizards/space-station-14#28088
- author: Plykiya
  changes:
  - message: Chameleon scarves now work again.
    type: Fix
  id: 6941
  time: '2024-07-20T03:00:28.0000000+00:00'
  url: space-wizards/space-station-14#30156
- author: Aidenkrz
  changes:
  - message: The mass hallucinations event no longer affects non-humanoids.
    type: Fix
  id: 6942
  time: '2024-07-20T05:53:58.0000000+00:00'
  url: space-wizards/space-station-14#28748
- author: buntobaggins
  changes:
  - message: Increased light radius on the Spationaut Hardsuit
    type: Tweak
  id: 6943
  time: '2024-07-21T03:29:21.0000000+00:00'
  url: space-wizards/space-station-14#30049
- author: EmoGarbage404
  changes:
  - message: Fixed wires not updating UI on the Particle Accelerator.
    type: Fix
  id: 6944
  time: '2024-07-21T05:27:18.0000000+00:00'
  url: space-wizards/space-station-14#28750
- author: CroilBird
  changes:
  - message: 6-pack of cola displays correctly when not being handled
    type: Fix
  id: 6945
  time: '2024-07-21T05:49:48.0000000+00:00'
  url: space-wizards/space-station-14#29309
- author: metalgearsloth
  changes:
  - message: Fix muzzle flashes not tracking properly.
    type: Fix
  id: 6946
  time: '2024-07-21T06:09:17.0000000+00:00'
  url: space-wizards/space-station-14#30163
- author: metalgearsloth
  changes:
  - message: Fix being able to throw items while your cursor is off-screen.
    type: Fix
  id: 6947
  time: '2024-07-21T06:13:28.0000000+00:00'
  url: space-wizards/space-station-14#30164
- author: metalgearsloth
  changes:
  - message: Reset the scroll bar in the ghost warp menu whenever you search for a
      role. Previously it remained at your previous position and you would have to
      scroll up to see the first entry.
    type: Tweak
  id: 6948
  time: '2024-07-21T06:38:45.0000000+00:00'
  url: space-wizards/space-station-14#30159
- author: Blackern5000
  changes:
  - message: The syndicate agent's cyborg weapons module now uses syndicate weaponry
      rather than NT weaponry.
    type: Tweak
  id: 6949
  time: '2024-07-21T07:04:33.0000000+00:00'
  url: space-wizards/space-station-14#26947
- author: Winkarst-cpu
  changes:
  - message: Added ambience to the camera routers and telecommunication servers.
    type: Add
  - message: Now server's and router's ambience stops once they are unpowered.
    type: Fix
  id: 6950
  time: '2024-07-21T07:22:02.0000000+00:00'
  url: space-wizards/space-station-14#30091
- author: Scott Dimeling
  changes:
  - message: Reduced the number of botanists in some stations, for optimal _workflow_
    type: Tweak
  id: 6951
  time: '2024-07-21T07:23:28.0000000+00:00'
  url: space-wizards/space-station-14#29581
- author: metalgearsloth
  changes:
  - message: Escape pods won't show up on shuttle map anymore.
    type: Tweak
  id: 6952
  time: '2024-07-21T07:23:44.0000000+00:00'
  url: space-wizards/space-station-14#29758
- author: IProduceWidgets
  changes:
  - message: an arabian lamp!
    type: Add
  id: 6953
  time: '2024-07-21T07:24:28.0000000+00:00'
  url: space-wizards/space-station-14#27270
- author: osjarw
  changes:
  - message: NPCs no longer get stuck trying to pick up anchored pipes.
    type: Fix
  id: 6954
  time: '2024-07-21T07:28:37.0000000+00:00'
  url: space-wizards/space-station-14#30061
- author: The Hands Leader - JoJo cat
  changes:
  - message: Train map is back into rotation
    type: Tweak
  id: 6955
  time: '2024-07-21T07:44:18.0000000+00:00'
  url: space-wizards/space-station-14#30145
```

</details>


**Медиа**
<!-- Если приемлемо, добавьте скриншоты для демонстрации вашего PR. Если
ваш PR представляет собой визуальное изменение, добавьте
скриншоты, иначе он может быть закрыт. -->

**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [ ] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [ ] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**

:cl: Шрёдька
- tweak: Подтянуты коммиты с корвакса, 27.07.24
themias pushed a commit to themias/space-station-14 that referenced this pull request Aug 9, 2024
…gger and recharging viper (space-wizards#26947)

* no more lasers for you, borg.

* downgrade

* echis

* echis

* itemtoggleupdate

* daggerparenting

* fixtypo

* more bullet per bullet
@Blackern5000 Blackern5000 deleted the whylasers branch August 25, 2024 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: No C# Changes: Requires no C# knowledge to review or fix this item. Changes: Sprites Changes: Might require knowledge of spriting or visual design. S: Needs Review Status: Requires additional reviews before being fully accepted
Projects
None yet
Development

Successfully merging this pull request may close these issues.