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.

Sign up for GitHub

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

Merge upstream 18.04.2024 #1186

Merged
merged 43 commits into from
Apr 18, 2024
Merged

Merge upstream 18.04.2024 #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e36f09d
ci: pull tg maplint identical atom support, add and fix matching cabl…
warriorstar-orion Apr 13, 2024
1c86f0a
severely reduces lag on some uis (#25116)
GDNgit Apr 13, 2024
0e93014
Mhelp/ahelp fixes. (#25122)
FunnyMan3595 Apr 13, 2024
c73443b
Badass people can now execute again (#25109)
DGamerL Apr 14, 2024
cb03f17
Add unit-tests for card decks (#24791)
VetleNeumann Apr 14, 2024
95efc8f
fix for the worlds shittiest exploit (#25130)
GDNgit Apr 14, 2024
0b838dc
[READY] BYOND 516 compatability (#25105)
S34NW Apr 15, 2024
a881e11
Many botany QoL changes. (#25031)
FunnyMan3595 Apr 15, 2024
3c04337
Botany rework V2 (#24342)
FunnyMan3595 Apr 15, 2024
da755f5
Fix brainless Cyborg (#25100)
AyIong Apr 16, 2024
d77c311
ais are no longer null on destroy (#25147)
GDNgit Apr 16, 2024
4833d64
Removes an attempted <span> from a medbot line. (#25134)
FunnyMan3595 Apr 16, 2024
6914665
fixes cloning sporadically not working (#25127)
GDNgit Apr 16, 2024
dc1e6e1
Fix processing tint button. (#25128)
FunnyMan3595 Apr 16, 2024
e6f3977
Lavaland Tumor Grammar Fixes (#25148)
Arthri Apr 17, 2024
7c624a7
Attacking a tendril rallies its mobs against you. (#25093)
warriorstar-orion Apr 17, 2024
98261b0
Update items stored on cryo storage (#25096)
PIerreLouisH Apr 17, 2024
a5251cb
reverts keybind change (#25080)
Coolrune206 Apr 17, 2024
cc85b2f
Removes toxin and carpotoxin when you make recipes with spider meat/e…
DGamerL Apr 17, 2024
802dc2a
Added voice annocument for requesting nuke codes (#25058)
Code-Lyoko0 Apr 17, 2024
956b989
Fixes voice changer voice selection (#25145)
Adrer Apr 17, 2024
d010156
Update react doc link to new one (#25099)
Oyu07 Apr 17, 2024
a735849
Gyrojet pistol no longer able to be suppressed (#25143)
Social-Moth Apr 17, 2024
87646e8
Makes the blowgun an excellent suicide method (#25065)
FunnyMan3595 Apr 17, 2024
57606c0
Docs, small grammar fix (#25165)
Oyu07 Apr 17, 2024
53d895e
Merge remote-tracking branch 'official/master' into merge-upstream
m-dzianishchyts Apr 17, 2024
45b75f1
Come here little switch
m-dzianishchyts Apr 17, 2024
8310e26
:GUN: byond://
m-dzianishchyts Apr 17, 2024
12fe851
Remove duplicate cables
m-dzianishchyts Apr 18, 2024
30edcf5
oops (#25181)
FunnyMan3595 Apr 18, 2024
34eca73
Layering change - belts and suits (#24667)
McRamon Apr 18, 2024
1b96572
Require stamping manifests. (#24973)
FunnyMan3595 Apr 18, 2024
66b5acc
Add a cmag interaction to the honkbot (#24979)
FunnyMan3595 Apr 18, 2024
74d522f
Add [s] to pencode. (#25001)
FunnyMan3595 Apr 18, 2024
35f63af
Updates the spraycan (#25024)
Fordoxia Apr 18, 2024
d6be6cf
soften borders of althland excavation ruin (#25025)
warriorstar-orion Apr 18, 2024
fc86494
meta: sci lobby add scidrobe, fix wallbumps (#25033)
warriorstar-orion Apr 18, 2024
70796ca
Update hierophant_loot.dm (#25042)
Stoniest Apr 18, 2024
950ce9f
ORM points are now claimed by swiping IDs rather than inserting it (#…
Arthri Apr 18, 2024
f4e0d3d
Merge remote-tracking branch 'official/master' into merge-upstream
m-dzianishchyts Apr 18, 2024
c8e5970
OOC Emoji 2.0 - TG Edition (#25012)
AyIong Apr 18, 2024
0688e9d
Remove Botanical Dispenser and add items on maps
AyIong Apr 18, 2024
4720bef
Merge remote-tracking branch 'official/master' into merge-upstream
m-dzianishchyts Apr 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,10 @@ Usage of this system is mandatory for any `Topic()` calls, and will produce erro

```dm
//Bad
"<a href='?src=\ref[src];'>Link!</a>"
"<a href='byond://?src=\ref[src];'>Link!</a>"

//Good
"<a href='?src=[UID()];'>Link!</a>"
"<a href='byond://?src=[UID()];'>Link!</a>"
```

### Use `var/name` format when declaring variables
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,8 @@ $RECYCLE.BIN
# Linux libs
/*.so

# VIM swap files.
*.swp

# SS220 EDIT
sound/tts_cache/*
Loading
Loading