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

r4 staging [IDB IGNORE] [MDB IGNORE] [DNM] #3422

Merged
merged 513 commits into from
Nov 4, 2023
Merged

r4 staging [IDB IGNORE] [MDB IGNORE] [DNM] #3422

merged 513 commits into from
Nov 4, 2023

Conversation

MistakeNot4892
Copy link
Contributor

Setting up for r4 staging. Feature freeze after this point.

NataKilar and others added 30 commits September 10, 2023 13:27
@NataKilar
Fix dispenser refilling (#3306)
bff530e 
* Fixes dispenser refilling

* Chuck missing parens on an if check
@NebulaSS13Bot
Automatic changelog generation for PR #3306 [ci skip]
ec75b6a
@NebulaSS13Bot
Automatic changelog generation [ci skip]
5b0df46
@NebulaSS13Bot
Automatic changelog generation [ci skip]
53ce4e5
@out-of-phaze
Port floor lamps from Polaris
bd8d20d
@out-of-phaze @comma
Update dmm.py and update_paths.py
30d1d78
@out-of-phaze @comma
Fix right sofa preview icon
ee5db05
@out-of-phaze @comma
Move door test exceptions to leveldata
09f788d
@out-of-phaze @comma
Move wire connection test exceptions to map
3d6cc30 
Fix Tradeship disconnected wires test
@out-of-phaze @comma
Add ailment getter/predicate helpers
42aee63
@out-of-phaze @comma
Allow ailments to be hidden from the Codex
ba542b7
@MistakeNot4892 @comma
Added a bunch of plushies from Polaris.
dc7ab5b
@out-of-phaze @comma
Port benches from Polaris
f7e49c5 
Fix table stepping check

Fix placing items on tables
@out-of-phaze
Implement replacement icons by LFP
3a4d725
@out-of-phaze
Replace flamp IS_SCREWDRIVER with tool interaction
affe672
@NataKilar
Adds atmos connection extension
b5682f8
@out-of-phaze @comma
Make map_data use INITIALIZE_IMMEDIATE
ff73f97
@out-of-phaze @comma
Fix compile-time map loading landmarks
f0f67f8 
Fix engine template spawning

Fix map load mark runtiming in CI

Fix mapload markers (again)

Revert mapload landmarks to previous version

Fix map load marks
@MistakeNot4892
Merge branch 'staging' of https://github.com/NebulaSS13/Nebula into d…
3c1d7b6 
…evfixes
@out-of-phaze
Merge pull request #3349 from NataKilar/atmos-connection-extension
2f41b91 
Adds atmos connection extension
@MistakeNot4892
Merge pull request #3352 from MistakeNot4892/devfixes
3be578b 
Dev update from staging/stable
@MistakeNot4892
Merge pull request #3346 from out-of-phaze/feature/polaris-flamps
f14f9c6 
Port floor lamps from Polaris
@MistakeNot4892
Tidying some vox references.
c475ec8
@MistakeNot4892
Adding alchemist icons for vox.
8568211
@MistakeNot4892
Properly implementing the servitor voxtype icons.
b5a6547
@MistakeNot4892
Adding the alchemist voxform icon.
471439a
@MistakeNot4892
Adding a Set Bodytype VV helper.
cd7639e
@MistakeNot4892
Adding basic validation to sprite accessories.
5044d8b
@MistakeNot4892
Adding back in the humanoid icons for vox kit.
348228a
@MistakeNot4892
Invalid hair icons will be updated on bodytype/species change.
8335bf7
MistakeNot4892 and others added 29 commits October 27, 2023 23:15
@MistakeNot4892
Minor poster refactor.
da5996b
@out-of-phaze
Merge pull request #3316 from MistakeNot4892/inhands
e54f278 
Breaking up some of lefthand.dmi and righthand.dmi.
@out-of-phaze
Merge pull request #3473 from MistakeNot4892/posters
cf1c573 
Minor poster refactor.
@out-of-phaze
Merge pull request #3429 from MistakeNot4892/spawning
41b4f62 
Spawning tweaks.
@out-of-phaze
Merge pull request #3471 from MistakeNot4892/twerk
f0198fa 
Adds KEEP_APART and RESET_ALPHA to status markers.
@MistakeNot4892
Allows spawn_atom to spawn invisible atoms.
3781487
@MistakeNot4892
Excluding unsimulated and space turfs from vessel mass calc.
990d502
@out-of-phaze
Merge pull request #3476 from MistakeNot4892/massfix
bf161a1 
Excluding unsimulated and space turfs from vessel mass calc.
@MistakeNot4892
Greyscaled or removed remaining material icons.
4160de0
@out-of-phaze
Merge pull request #3475 from MistakeNot4892/invis
fea31f0 
Allows spawn_atom to spawn invisible atoms.
@MistakeNot4892
Tweaking fuel_value for mats.
f5e387d
@MistakeNot4892
Making ignition point/accelerant value more rigorous.
05d34cc
@MistakeNot4892
Repathing a bunch of material paths to /organic.
5965817
@MistakeNot4892
Removing some extraneous path/nullchecking before GET_DECL().
a3c79c9
@MistakeNot4892
Merge pull request #3480 from NebulaSS13/stable
528f0c5 
Updating dev from stable.
@MistakeNot4892
Fixes Taj considering eyes to be a limb.
e2fb8a2
@out-of-phaze
Merge pull request #3434 from MistakeNot4892/firefirefire
0af8d11 
Tweaking fuel_value on materials.
@out-of-phaze
Merge pull request #3302 from MistakeNot4892/hattable
b85f827 
Removing the hattable extension, replacing with inv slot.
@out-of-phaze
Merge pull request #3468 from MistakeNot4892/fbp
3cf7707 
Readding FBP.
@out-of-phaze
Merge pull request #3477 from MistakeNot4892/phoron
759ff7f 
Greyscaled or removed remaining material icons.
@out-of-phaze
Fix exterior mimic edges parity
cee6cbf
@out-of-phaze
Fix noisemaps only smoothing on one axis
9859c80
@out-of-phaze
Move world resizing to fix map edges
1fe1dae
@out-of-phaze
Fix lazy level data init
00ac93e
@out-of-phaze
Stop exterior turfs from forming edgeless corners
de992d5
@out-of-phaze
Add newlines to missing icon states tests
e04eca3
@NebulaSS13Bot
Automatic changelog generation [ci skip]
f4b07fd
@MistakeNot4892
Merge pull request #3489 from out-of-phaze/fix/lighthouse-dev-sync
79d0ce6 
Upstreaming dev branch fixes from Lighthouse
@MistakeNot4892
Merge pull request #3483 from MistakeNot4892/cats2
421efcc 
Fixes Taj considering eyes to be a limb.
@MistakeNot4892 MistakeNot4892 merged commit 906647d into staging Nov 4, 2023
21 checks passed
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
do not merge This PR is on hold, do not merge it. work in progress This PR is under development and shouldn't be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
10 participants
@MistakeNot4892 @NataKilar @NebulaSS13Bot @out-of-phaze @PsyCommando @Sparrowbird611 @Andrew-Fall @comma @afterthought2 @cyberillithid