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

Fork Update #1

Open
wants to merge 10,000 commits into
base: dev
Choose a base branch
from
Open

Fork Update #1

wants to merge 10,000 commits into from
+1,230,841 −363,067

Conversation

Laus4Deus
Copy link

It had over 50 commits behind

out-of-phaze and others added 30 commits November 11, 2024 21:14
@out-of-phaze
Fix climbing onto multitile objects
75c3c58
@out-of-phaze
Add click_params argument to storage.can_be_inserted()
8f2ca4e
@out-of-phaze
Add rustic chairs
5a8954c
@out-of-phaze
Add end tables
9d9608f
@out-of-phaze
Make wall sconces anchored
9d6cba2
@out-of-phaze
Add a multitile writing desk
9dc444e
@out-of-phaze
Add inkwells and new quill mechanics
061dbcc
@out-of-phaze
Add new props to Shaded Hills inn
921845a
@out-of-phaze
Make stools use the single-icon system
991c348
@out-of-phaze
Add rustic stools by Doe
5335bd1
@out-of-phaze
Make foam toys made of foam
9b26748 
Add foam UID
@out-of-phaze
Add new wood floor sprites
58aa754
@out-of-phaze
Add rustic carpet flooring
e8ccc0c
@out-of-phaze
Add a dresser (desk variant)
470cd76
@out-of-phaze
Add smaller world sprite for scrolls
c115f8f
@out-of-phaze
Add smaller world sprite for lanterns
10572ab
@out-of-phaze
Readd edges to stone walls
700b6f3
@out-of-phaze
Add dressers and carpets to Shaded Hills inn
4a124ca
@out-of-phaze
Fix opening crates not interrupting climbing
2cbe465
@out-of-phaze
Fix Cross for multitile objects
da1ab4f
@out-of-phaze
Tweak interiors on Shaded Hills maps
9e303e8
@out-of-phaze
Fix multitile objects in maploading
43db5cc
@out-of-phaze
Replace indoor rain sound
0dd6a7b
@out-of-phaze
Fix crafting matter unit test
8cacb6c
@MistakeNot4892
Merge pull request #4554 from out-of-phaze/tweak/pyrelight-11-08-24
5c5aec2 
Shaded Hills additions and tweaks, 11/09/2024
@NebulaSS13Bot
Automatic changelog generation for PR #4554 [ci skip]
6e6794b
@MistakeNot4892
Moving broken/burned icons onto the flooring decl.
f5acc8c
@MistakeNot4892
Replacing all map instances of unsim floors with precompiled types.
d2f7b8e
@MistakeNot4892
Removed unused beach unsim type.
1bc75f7
@MistakeNot4892
Removing as many turf instances as possible from the maps.
ccc4bf9
out-of-phaze and others added 30 commits December 11, 2024 01:53
@out-of-phaze
Merge pull request #4630 from MistakeNot4892/removal/abolitionists
a48c4b9 
Removed slavers' den.
@MistakeNot4892
Reworking necklaces and rings to use Doe's new icons.
02495f8
@MistakeNot4892
Merge pull request #4609 from out-of-phaze/fix/all-the-colors
2454c77 
Replace direct color sets with set_color, various color tweaks
@MistakeNot4892
Augments now keep their intended material costs and don't end up full…
30f1ff9 
… of meat.
@out-of-phaze
Merge pull request #4629 from MistakeNot4892/fix/meat
8860265 
Augments now keep their intended material costs and don't end up full of meat.
@out-of-phaze
Merge pull request #4592 from MistakeNot4892/feature/jewellery
e2f91e9 
Updating necklaces and rings to use new icons.
@out-of-phaze
Merge pull request #4628 from MistakeNot4892/fix/synthfood
5291d29 
Synthetics do not get hungry or thirsty.
@out-of-phaze
Merge pull request #4606 from MistakeNot4892/removal/wizard
cd115a0 
Removes wizard.
@MistakeNot4892
Merge branch 'staging' of github.com:NebulaSS13/Nebula into devupdate
06f584a
@MistakeNot4892
Merge pull request #4640 from MistakeNot4892/devupdate
6d605ea 
Dev update from staging
@out-of-phaze
Merge pull request #4302 from MistakeNot4892/feature/astarautomove
7c188b4 
Adding SSpathfinding.
@out-of-phaze
Merge pull request #4615 from MistakeNot4892/feature/dummy
cd7da77 
Adds armor stands and rewrites target dummies.
@out-of-phaze
Remove unnecessary uses of usr in onclick code
f7f02b8
@out-of-phaze
Remove unnecessary uses of usr in screenobj code
b7b6dab
@out-of-phaze
Remove unnecessary uses of usr in machinery folder
985f0c1
@out-of-phaze
Remove unnecessary uses of usr in objects folder
d93303d
@out-of-phaze
Remove unnecessary uses of usr in datums folder
68a223d
@out-of-phaze
Remove unnecessary uses of usr in preferences
c122b4e
@out-of-phaze
Remove unnecessary uses of usr in modpacks
775e345
@out-of-phaze
Remove unnecessary uses of usr in mob code
ac7009d
@out-of-phaze
Remove unnecessary uses of usr in projectile code
c750c27
@out-of-phaze
Remove unnecessary uses of usr in reagent code
525eddf
@out-of-phaze
Remove unnecessary uses of usr in modular computers
0f78949
@out-of-phaze
Remove unnecessary uses of usr in paperwork code
23aa0f2
@out-of-phaze
Remove unnecessary uses of usr in power/machinery code
a5b3bb4
@out-of-phaze
Remove unnecessary uses of usr in vehicle code
92832d0
@out-of-phaze
Remove unnecessary uses of usr in shuttle code
12e20b7
@out-of-phaze
Remove unnecessary uses of usr in miscellaneous code
6362ba6
@out-of-phaze
Remove unnecessary uses of usr in OnTopic overrides
6189684
@MistakeNot4892
Merge pull request #4636 from out-of-phaze/codequality/no-usr
7948dbc 
Remove unnecessary uses of usr
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Laus4Deus @out-of-phaze @MistakeNot4892 @NebulaSS13Bot @noelle-lavenza @Greenjoe12345