Merge Upstream [09.07.2024]#1365

Merged

AyIong merged 37 commits intoss220club:masterfrom dj-34:merge_upstream

Jul 9, 2024

+2,385-1,516

Commits on Jul 7, 2024

Fixes a very small oversight with blood DNA. (ParadiseSS13#26172 )
Spaghetti-bit
authored
Update medical_designs.dm (ParadiseSS13#26159 )
FaronCD
authored
Strange objects resprite (ParadiseSS13#26131 )
Us3rn4me228
authored
Fixing fulton pack not working (ParadiseSS13#26153 )

HMBGERDO
and
1080pCat
authored
Emotes now vary in frequency when they are not age based. (ParadiseSS13#26171 )
Spaghetti-bit
authored
Dredd armor resprite - finally deconflicted (i hope) (ParadiseSS13#26167 )
McRamon
authored
Begone, sinner (ParadiseSS13#26116 )
Onyxarias
authored
Destroy the child (ParadiseSS13#26114 )
Onyxarias
authored
Removes the 1s option from flashbangs (ParadiseSS13#26079 )

1080pCat
and
Contrabang
authored
Update bio_chip_supercharge.dm (ParadiseSS13#26173 )
Fordoxia
authored
Fix: Active mousetrap inhand sprite (ParadiseSS13#26176 )
AyIong
authored
Checks for emagged on firealarms to properly disable them from activating unless pulled manually. (ParadiseSS13#26170 )
Spaghetti-bit
authored
Changes even more uses of stat comparisons to use the defines (ParadiseSS13#26154 )

DGamerL
and
hal9000PR
authored

Commits on Jul 8, 2024

Commits on Jul 9, 2024