Commit Graph

13 Commits

Author SHA1 Message Date
SkyratBot
1ccef595b3 [MIRROR] Frontier Militia ERT Fix [NO GBP] [MDB IGNORE] (#22203)
Frontier Militia ERT Fix [NO GBP]

Co-authored-by: Cheshify <73589390+Cheshify@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-14 23:36:50 -04:00
SkyratBot
e3cd27ab6d [MIRROR] The Laser Musket (2023) (Settlement Helper Edition) [MDB IGNORE] (#22156)
* The Laser Musket (2023) (Settlement Helper Edition) (#76231)

## About The Pull Request
This adds a craftable laser musket to the game. It's slow and unwieldy,
but consistent! I'd be happy to tweak the numbers if it's too good/bad.

This PR also adds an independent militia ERT, who travels the spinward
sector to help defend stations!

TO DO LIST:

- [x] Finish worn sprites
- [x] Add a crafting recipe on par with the pipegun
- [x] Add bayonets
- [x] Separate charging into two stages and REDO THE AUDIO AAAA
- [x] Clean up code (Needs review, totally)

Scrapped:

- Possibly add overcharge mechanic (This is just beyond my skill level
for now)
- Find a unique sound for the weapon firing (We have a unique
projectile, and I can't a sound that fits more than the laser gun one)

![image](https://github.com/tgstation/tgstation/assets/73589390/40ee8f1d-5c1f-4638-af70-ff1215b85c9e)

![1211
(1)](https://github.com/tgstation/tgstation/assets/73589390/1a4b9856-a878-4500-96ce-4fd83587fa81)

![musket (2) (2)
(2)](https://github.com/tgstation/tgstation/assets/73589390/2ebdc2ed-6f78-4761-9deb-a1b2d337a02d)

![aaaa1
(1)](https://github.com/tgstation/tgstation/assets/73589390/6076edd3-97c9-41ec-a67a-90717f97eab0)

![image](https://github.com/tgstation/tgstation/assets/73589390/c47e44bd-3f4b-44b3-aaa5-9b1c25a72cad)

Inhands by RedSentry27
Suit sprite by Kinnebian
Prime Laser Musket sprites by RedSentry27

Balance Considerations (ew):
25 damage (30 on prime)
Normal wound
40 Stamina damage (45 on prime)
Weak to armour (prime not weak to armor)
2 second charge time, needs to be charged twice
No overcharge
Requires two hands to hold (like a chainsaw)

Crafting Recipe:
One rifle stock
Fifteen Cable Coils
Four Iron Rods
One micro laser
One capacitor
One pair of prescription glasses
One drinking glass
Craft for 10 seconds with a wirecutter and screwdriver

Prime crafting recipe: (REQUIRES READING MAINTENANCE LOOT: "journal of a
space ranger")
One laser musket
Fifteen cable coils
Five silver
One water recycler
Fifteen units of nuka cola
Craft for 30 seconds with a screwdriver while wearing cowboy boots and a
cowboy hat
## Why It's Good For The Game
The idea of assistants and revs forming firing lines in the halls to
shoot eachother sounds hilarious. Besides, we need a parallel to the
pipegun, and this is the funniest way to do so.
## Changelog
🆑 Cheshify, Kinnebian, and RedSentry27
add: Maintenance engineers have sent out blueprints across the sector
for a new laser musket.
admin: A new energy-gun toting ERT is available to send to the crew.

---------

Co-authored-by: carlarctg <53100513+carlarctg@ users.noreply.github.com>

* The Laser Musket (2023) (Settlement Helper Edition)

* Update guns.dm

* Update guns.dm

* Fixes vox/teshari greyscale config paths

---------

Co-authored-by: Cheshify <73589390+Cheshify@users.noreply.github.com>
Co-authored-by: carlarctg <53100513+carlarctg@ users.noreply.github.com>
Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
2023-07-14 15:21:42 -04:00
SkyratBot
c092a8e070 [MIRROR] Adds the ability for ERTs to use a custom shuttle [MDB IGNORE] (#17663)
* Adds the ability for ERTs to use a custom shuttle

* Update ert.dm

* Update ert.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-11-22 08:19:39 -08:00
SkyratBot
3cbd0a9a38 [MIRROR] Bounty Hunters as ERTs + Flame Id [MDB IGNORE] (#11123)
* Bounty Hunters as ERTs + Flame Id (#64083)

About The Pull Request

Bounty Hunters can now be called as ERTs, to which they will spawn at centcom with proper access. Also, the bounty hunters now get flame ids, because they think they're that cool.
Why It's Good For The Game

Bounty Hunters are really fitting for admin erts, but I never bothered to throw them in until now. Also, it was a good opportunity to fuck off with all that id label BS
Changelog

cl
admin: Bounty Hunters can now be called via admin ert
expansion: Oh, and they have cool flame ids as well!
/cl

* Bounty Hunters as ERTs + Flame Id

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
2022-01-29 23:05:23 -05:00
SkyratBot
2962992e71 [MIRROR] CARP Team Six: Nanotrasen's Finest* (#6769)
* CARP Team Six: Nanotrasen's Finest* (#60012)

* CARP Team Six: Nanotrasen's Finest*

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
2021-07-07 23:52:09 +02:00
Gandalf
e1456b0cf6 Massive announcer/BSA overhaul (#4254)
* oh yeehaw

* Update default_announcer.dm

* a

* Update sound.dm

* Delete poweroff.ogg

* pref+newshit!

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* a

* Update set_security_level.dm

* a

* a

* a

* Update default_announcer.dm

* a

* a

* Update priority_announce.dm

* a

* Update priority_announce.dm

* ERT NOW HAS AN ALERT OPTION

* more changes to sounds! ALERTS

* Update set_security_level.dm

* THSI IS THE WAYSDFSASA

* you think you've seen shitcode? just you wait cowboy.

* a

* Update set_security_level.dm

* Update default_announcer.dm

* Update set_security_level.dm

* Update set_security_level.dm

* Update gravitygenerator.dm

* BSA AND FIXES!

* a

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* aaaaaaaaaaaaaa

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* Update bsa_cannon.dm

* a

* autodocker

* Update modular_skyrat/modules/bsa_overhaul/code/bsa_cannon.dm

Co-authored-by: Azarak <azarak10@gmail.com>
2021-03-23 00:16:26 +00:00
SkyratBot
39121c53ce [MIRROR] Minor ERT refactor, introduces a few ERT admin options (#3339)
* Minor ERT refactor, introduces a few ERT admin options (#56345)

* Minor ERT refactor, introduces a few ERT admin options

* Proper Modularisation Protocol

* Update preferences.dm

Co-authored-by: Ryll Ryll <3589655+Ryll-Ryll@users.noreply.github.com>
Co-authored-by: Gandalf2k15 <jzo123@hotmail.com>
2021-02-13 11:12:01 +00:00
Fikou
8eee742734 [Ready] Adds ERP (#48699)
Adds a new emergency response team, the ERP! It stands for Emergency Response Party

the ERP includes:
-the coordinator: basically the captain of the operation, armed with a birthday cake, balloon and lots of fireworks to start the celebration
-the bouncer: the big boy, has a telebaton and an armor vest (if youre a loser you get a police hat too)
-the constructor: has tools, materials to build the party, disco tiles and an ethereal disco ball planter
-the cleaning service: your normal jannie, with his trusty mop, trash bag and cleaning grenades
-the comedian: a clown, armed with instruments, a bananium shield and chameleon suit/hat, for some comedy at the party
2020-01-12 13:31:13 +13:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
Shaps
708c7df7ab Intern Horde take 2 (#47263)
Intern Horde take 2
2019-10-25 11:18:25 -07:00
Menshin
84a930d52b Fix Janitor ERT preview and leader role spawning (#43320)
Fixes Janitor ERT runtime on Create Antag preview and ERT leader (heavy)
spawning nude.
2019-03-25 23:39:39 -07:00
Vile Beggar
d13420801b Properly adds a Janitor ERT (#42659)
* does the thing

* adds the regen thing to the sprayer

* adds a quite important addition to a comment

* capitalizes janitorial response

Co-Authored-By: VileBeggar <edmir995@gmail.com>

* adds cobby's process suggestion
2019-02-06 15:56:31 -05:00
vuonojenmustaturska
6aabcac079 Create ERT refactor (#36321)
cl Naksu
admin: ERT creation has been refactored to allow for easier customization and deployment via templates and settings
/cl
2018-03-12 23:48:09 +13:00