Commit Graph
23 Commits
Author SHA1 Message Date
+37 21b4095dfd [MDB IGNORE] [IDB IGNORE] Upstream Sync - 04/17/2026 (#5453)
Upstream 04/17/2026

fixes https://github.com/Bubberstation/Bubberstation/issues/5549

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: tgstation-ci[bot] <179393467+tgstation-ci[bot]@users.noreply.github.com>
Co-authored-by: ArcaneMusic <41715314+ArcaneMusic@users.noreply.github.com>
Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
Co-authored-by: Rhials <28870487+Rhials@users.noreply.github.com>
Co-authored-by: rageguy505 <54517726+rageguy505@users.noreply.github.com>
Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com>
Co-authored-by: Time-Green <7501474+Time-Green@users.noreply.github.com>
Co-authored-by: Tsar-Salat <62388554+Tsar-Salat@users.noreply.github.com>
Co-authored-by: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Co-authored-by: Maxipat <108554989+Maxipat112@users.noreply.github.com>
Co-authored-by: SyncIt21 <110812394+SyncIt21@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: SimplyLogan <47579821+loganuk@users.noreply.github.com>
Co-authored-by: loganuk <fakeemail123@aol.com>
Co-authored-by: Leland Kemble <70413276+lelandkemble@users.noreply.github.com>
Co-authored-by: FalloutFalcon <86381784+FalloutFalcon@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: Lucy <lucy@absolucy.moe>
Co-authored-by: siliconOpossum <138069572+siliconOpossum@users.noreply.github.com>
Co-authored-by: Isratosh <Isratosh@hotmail.com>
Co-authored-by: TheRyeGuyWhoWillNowDie <70169560+TheRyeGuyWhoWillNowDie@users.noreply.github.com>
Co-authored-by: Neocloudy <88008002+Neocloudy@users.noreply.github.com>
Co-authored-by: Alexander V. <volas@ya.ru>
Co-authored-by: ElGitificador <168473461+ElGitificador@users.noreply.github.com>
Co-authored-by: Twaticus <46540570+Twaticus@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Tim <timothymtorres@gmail.com>
Co-authored-by: Iamgoofball <iamgoofball@gmail.com>
Co-authored-by: Layzu666 <121319428+Layzu666@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
Co-authored-by: _0Steven <42909981+00-Steven@users.noreply.github.com>
Co-authored-by: mrmanlikesbt <99309552+mrmanlikesbt@users.noreply.github.com>
Co-authored-by: Ben10Omintrix <138636438+Ben10Omintrix@users.noreply.github.com>
Co-authored-by: John F. Kennedy <54908920+MacaroniCritter@users.noreply.github.com>
Co-authored-by: Cursor <102828457+theselfish@users.noreply.github.com>
Co-authored-by: Josh <josh.adam.powell@gmail.com>
Co-authored-by: Josh Powell <josh.powell@softwire.com>
Co-authored-by: Yobrocharlie <Charliemiller5617@gmail.com>
Co-authored-by: Hardly3D <66234359+Hardly3D@users.noreply.github.com>
Co-authored-by: shayoki <96078776+shayoki@users.noreply.github.com>
Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2026-05-16 00:56:00 +02:00
Alexis f4ad694e68 67... 2026-03-07 06:51:39 -05:00
nevimer 7109107b52 more fixes for the upstream, mostly effects 2026-03-06 04:25:27 -05:00
xPokee 4662f6d892 More As Anythings 2025-09-24 13:49:38 -04:00
Roxy 3824aa13d0 update signal params 2025-05-05 16:12:50 -04:00
Shadow-Quill 99f0b4c950 Fixes Part Dos 2025-04-29 21:06:24 -06:00
StrangeWeirdKitten 25289b8bc6 fixes a fuck load of sounds 2024-10-24 07:52:55 -06:00
39bdedc029 [MIRROR] Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs [MDB IGNORE] (#22680)
* Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs (#76973)

## About The Pull Request

As the title says, mag type has been split into two variable that do
different things:

Accepted magazine type handles what magazines that gun will accept, type
and any subtypes. If spawn magazine type isnt defined, then it will be
made equal to accepted magazine type to prevent having to double define
magazines on every gun ever.

Spawn magazine type is separate from accepted magazine type, spawn
magazine type is what magazine the gun will actually spawn with. This
exists because there are a few weapons which are made to spawn with
special magazines, that can't use normal magazines anymore. For example,
the riot dart pre-loaded donk soft pistol can only ever be reloaded with
the riot subtype of donk soft magazines at the moment. This isn't
typically something people notice because new magazines are usually not
a thing people come by with these specific weapons, but its a problem I
noticed while coding some weapons.
## Why It's Good For The Game

In short, certain weapons (mostly donksoft weapons, but there's a single
traitor pistol subtype that spawns with fire ammo) will no longer be
limited to the exact subtype of magazine they spawned with, allowing
them to use the normal versions of those magazines as well.
## Changelog
🆑
refactor: The mag_type variable on guns has been split between
accepted_magazine_type and spawn_magazine_type, allowing weapons to
safely spawn with subtypes of their normal magazines without breaking
the weapon
fix: Several weapons that spawned with special magazines, the riot dart
pre-loaded donk pistol for example, will now be able to accept normal
donksoft magazines that don't spawn loaded with riot darts.
/🆑

* Splits ballistic firearms "mag_type" into "accepted_magazine_type" and "spawn_magazine_type", fixing a few funny magazine bugs

* merge conflict

* merge conflict continued

---------

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Giz <13398309+vinylspiders@users.noreply.github.com>
2023-07-25 20:24:07 -04:00
2f552919c1 [MIRROR] Icons folder cleaning wave two [MDB IGNORE] (#22454)
* Icons folder cleaning wave two

* Merge conflict resolution

* Modular path hell

* hmm

* Update 2022-10.yml

* Another modular thing

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
2023-07-16 00:41:18 -04:00
6dfe17306c [MIRROR] Pulls apart the vestiges of components still hanging onto signals [MDB IGNORE] (#21738)
* Pulls apart the vestiges of components still hanging onto signals

* update modular

---------

Co-authored-by: LemonInTheDark <58055496+LemonInTheDark@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
2023-06-18 13:18:23 +00:00
Penelope HazeandGitHub 731e6b081c [MODULAR] Fix armament station access check (#21643)
Fix armament station access check
2023-06-05 14:08:14 -07:00
PaxilmaniacandGitHub 9467edd6a7 Fairly large assault operatives changes (#17455)
* i didnt want to add to the gun collection but here we are

* equipment time

* i crashed my pc :(

* suppressor sprites, rubba

* all the guns done

* makes the sniper magazines actually work

* i knew i missed something with that

* oopsies teehee

* maybe not 60

* s

* mod resprite real

* also the digis

* slight tweaks

* some shotgun and sniper variety

* primary weapons

* should finish off the primaries tab

* goofy ahh armament system

* oops

* secondaries

* bobm

* armaments

* fuk u black mesa

* that actually worked pretty well

* suit storage

* map changes

* lowers the number by 2

* final stuff before pr

* i lied that wasnt the last commit before pr

* just to be safe

* its 5.6x40

* apparently bioterror isnt that worth it

* sealed away forever

* changes what announcements are given

* requests

* mop bucket

* stuff we found in testing

* fixes the smg

* fix those icons soldier

* cry about it linters

* increases operative count to 5
2022-12-29 23:40:44 -08:00
f7c26bbf25 515 Compat (#17465)
* ONLY SKYRAT CHANGES

* ACTUALLY SKYRAT CHANGES

* yolo, revert later

* Update alternate_byond_versions.txt

Co-authored-by: AnturK <AnturK@users.noreply.github.com>
2022-11-15 06:59:06 +00:00
TastyfishandGitHub 30d856c592 [MODULAR] Makes the armament list load the preview items correctly (#16824)
Makes the armament list load AFTER SSatoms but before guncargo
2022-10-14 15:44:19 -04:00
ae708cd7b5 [MIRROR] Removes ComponentInitialize() [MDB IGNORE] (#15552)
* Removes ComponentInitialize()

* Fixes a leftover merge conflict marker

* Fixes the oversight that came from the upstream merge skew

* Fixes all of the instances where we used ComponentInitialize() when we shouldn't've been

* Fixes CI being broken because of the HEV suits

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2022-08-12 19:05:09 -04:00
TomandGitHub 6d3a8fbec7 goodbye box comments (#13826) 2022-05-23 17:00:34 +01:00
ZonespaceandGitHub 51368bb405 Yet another pass of guncargo's balance (#13301)
* cope.

* this too
2022-05-04 12:57:36 +01:00
349a3325ec Adds Gun Cargo (#12632)
* mega-commit

* js fix 1

* js fix 2

* documentation1

* balance?

* balance pass

* 2 -> 20 mins

* m90 increase

* thanks prophet (balance and stuff)

* more touchups

* mini correction

* cmg update

* tgui fix

* this took me too long

* permit pin removal (testing)

* price bump

* accidental commit

* ammo cheapening

* weh

* this is incredibly embarassing

* woo

* woo

* pepperballs

* permit-pins are lame anyway

* dep guards get permits

* CI fix

* model75 increase

* fix lint

* model75 removal

* Update cargo_stuff.dm

* ZONESPACE REEEEE

* not the bluie's anymore

* interdyne company fixes and stuff

* fix

* fix2

* nagant revolver removal

* threshold changes

* undo

* techshell to dynamics

* mag cost 3.5 -> 3

* dynamics 10mm auto

* ammo gens manifest

* ladon/osprey price changes

* if ixed it for you sir

* assault rifle rebalancing

* review

* Update modular_skyrat/modules/gun_cargo/code/datums/cargo_pack.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* Update modular_skyrat/modules/sec_haul/code/guns/guns.dm

Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>

* weh

* add disabler crates back

Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Dragonfruits <51841793+Spc-Dragonfruits@users.noreply.github.com>
2022-04-23 17:34:08 +01:00
ZonespaceandGitHub 7826d80314 Armament Fixes (#12677)
* fuck

* fix

* weh
2022-04-12 01:05:23 +01:00
ZonespaceandGitHub 2f9eb95935 aaaa (#12530) 2022-04-05 07:32:42 +01:00
ZonespaceandGitHub 194176c2a2 Componentizes armaments (#12515)
* aaaa

* fix
2022-04-03 15:30:07 +01:00
GandalfandGitHub d1cf2c19a1 e (#12368) 2022-03-30 16:35:20 +01:00
e2a68d3b15 Assault Operatives (#12126)
* Initial commit

* 0

* shuttle and maps

* Equipping

* Minor fixes, gyrojet removed, elite suits removed

* E

* reviews

* Update base_alarm.dm

* nnfghghg

* more fix

* Update dynamic_rulsesets_roundstart.dm

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* fyux

* Update assault_operatives_outfits.dm

* E

* Update modular_skyrat/modules/assault_operatives/code/goldeneye.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/interrogator.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* more review

* E

* uber update

* Update AntagInfoAssaultops.tsx

* Update AntagInfoAssaultops.tsx

* nyooom

* E

* ICARUS SUNBEAM

* fioxes

* Update sunbeam.dm

* Update goldeneye.dm

* Update vending_machine.dm

* Update assault_operatives_outfits.dm

* Update goldeneye.dm

* e

* eee

* Update assault_operatives_outfits.dm

* Update assault_operatives.dm

* Update assault_operatives.dm

* Update goldeneye_cruiser.dmm

* fix

* 0

* haha funneee

* armament system

* more updates

* f

* e

* 0

* e

* more based

* 0

* e

* CQC PLUS CAN SUCK MY COCK

* Update __armament_bodyarmor.dm

* Update assault_operatives.dm

* e

* MG9 balance

* Update armament_utility.dm

* Update sunbeam.dm

* fixes

* Update CentCom_skyrat_z2.dmm

* Update armament_station.dm

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/armaments/code/armament_entries.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* e

* Update modular_skyrat/modules/assault_operatives/code/assault_operatives.dm

Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>

* Update assaultops_armament_station.dm

* reviuew

* Update misc_items.dm

* Update vending_machine.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
2022-03-28 02:27:25 +00:00