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

Jump to bottom

Upstream #326

Merged
merged 398 commits into from
Jan 14, 2024
Merged

Upstream #326

merged 398 commits into from
Jan 14, 2024

Conversation

maksxpl
Copy link
Collaborator

@maksxpl maksxpl commented Jan 13, 2024

🆑
/:cl:

deathride58 and others added 30 commits October 2, 2023 13:11
@deathride58
Merge pull request #16002 from SandPoot/more-restraints-issues
ade0c3c 
Someone told me you can't resist handcuffs part 2
@SandPoot
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
5945726 
…l-Station-13
@SandPoot
cube update (real)
a809362
@SmiLeYre
Plushies.
e8c0eaa
@SandPoot
updates, modularizing and generally making the code better
cd12c20
@SandPoot
not needed
db926e7
@SandPoot
ACTUALLY BAD, IT'S INHERITING FROM THE OTHER LIZARD!
62c6b68
@SandPoot
the commit
af33de2
@SandPoot
why did i check for empty hand again?
8c0a413
@SandPoot
fix
962c3e7
@Linzolle
Merge pull request #16005 from SandPoot/why-though
c11c1fe 
Makes age_verification config work properly
@Linzolle
Merge pull request #16004 from SandPoot/reskin-tip
6dc628e 
Makes the hints for reskinning things not require empty hand
@Linzolle
Merge pull request #16003 from SandPoot/held-plushies
bae4216 
Adds held sprites to plushes
@SandPoot
Merge commit 'af33de25b4732bf6234304bb3cee88c81e65538a' of https://gi…
da9d3f1 
…thub.com/Citadel-Station-13/Citadel-Station-13 into pr/SmiLeYre/346
@SandPoot
sprites corrected manually
4e01ec0
@SandPoot
actually not needed now
e153f78
@SandPoot
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
bb1886d 
…l-Station-13
@SandPoot
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandsto…
3b24488 
…rm-Station-13 into pr/SmiLeYre/346
@SandPoot
avoid overriding the upstream code
90677d7
@SandPoot
no renaming
e46983c
@SandPoot
Merge pull request #346 from SmiLeYre/New-plush-toys-and-plushies-in-…
bb53628 
…hand

Plushies.
@Sandstorm-Bot
Automatic changelog generation for PR #346 [ci skip]
d58c776
@Sandstorm-Bot
Automatic changelog compile [ci skip]
5ae8d07
@SandPoot
stuff
5a90dab
@SandPoot
fix lack of message for special cases
b7af940
@SandPoot
Merge branch 'master' into throwing-updat
c3735c0
@SandPoot
fix air going stupid, going crazy
fb42d62
@SandPoot @SmiLeYre
the stuff
a105852 
Co-authored-by: Марк <SmiLeYre@users.noreply.github.com>
@SandPoot
lowercasing possible
ddf9827
@SandPoot
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
6cd2cfc 
…l-Station-13 into update-config
SandPoot and others added 19 commits January 3, 2024 18:51
@SandPoot
Update code/game/objects/items/stacks/stack.dm
e514606
@deathride58
Merge pull request #16050 from SandPoot/split-radial
70b1a77 
Puts Radials on splitting stacks for quick splits
@SandPoot
huds!
51c1c2a
@SandPoot
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
e30f79b 
…l-Station-13
@SandPoot
push
76e7ffc
@SandPoot
delete if not in borg
f497c4d
@SandPoot
fix stacks leaving stuff in unexpected ways
8eab55a
@SandPoot
push
387b4b2
@deathride58
Merge pull request #16054 from SandPoot/solves-borg-mat-storage-issues
6c601f1 
Solves borg material storage issues
@deathride58
Merge pull request #16053 from SandPoot/extra-huds
e7fd497 
Changes operative hud and adds three more
@deathride58
Merge pull request #16055 from SandPoot/point-bubbles
ae557a1 
Pointing at something on yourself now shows the item
@SandPoot
Merge branch 'master' of https://github.com/Citadel-Station-13/Citade…
46384d2 
…l-Station-13
@SandPoot
extra stuff
0919b13
@SandPoot
extra slots trasenknox + liteweb tooltip text color
2505598
@SandPoot
fix synd combat defib
3cac7d6
@SandPoot
forgot it was overwritten i fucking hate skyrat
53c3850
@SandPoot
fix camera circuit
6183d05
@maksxpl
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandsto…
1712d4c 
…rm-Station-13
@maksxpl
Merge branch 'master' of https://github.com/nuke-ops/Nostra-13
19c9afc
@maksxpl maksxpl added the Upstream What's yours is mine, and what's mine is also mine. label Jan 13, 2024
maksxpl and others added 5 commits January 14, 2024 00:49
@maksxpl
tools+tgui hard sync
4069594
@maksxpl
maps hard reset plus megafauna fix
f38c887 
god help me this code is such a mess
@maksxpl
code hard sync
26faa95
@AnonChangechong
map fixes
0245b16 
default smol fucked up, diy - timeless clasic not requiring any fixes
@AnonChangechong
one more map fix
14e41df
nuke-ops pushed a commit that referenced this pull request Jan 14, 2024
@tgstation-server
TGS Test Merge (#326)
df3a54e
@nuke-ops
Copy link
Collaborator

Test Merge Deployed

Details
Server Instance

Nostra-13

Revision

Origin: 09b6cce
Pull Request: 14e41df
Server: df3a54e
GitHub Deployments

@maksxpl maksxpl merged commit cc4607d into master Jan 14, 2024
4 checks passed
@nuke-ops
Copy link
Collaborator

Test Merge Removed

@maksxpl maksxpl deleted the upstream branch January 14, 2024 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Upstream What's yours is mine, and what's mine is also mine.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.