Skip to content

Updating from Neb dev. #110

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
Merged
MistakeNot4892 merged 109 commits into from
Jan 4, 2025
Merged

Updating from Neb dev. #110

MistakeNot4892 merged 109 commits into from
Jan 4, 2025

Conversation

@MistakeNot4892
Copy link

@MistakeNot4892 MistakeNot4892 commented Jan 4, 2025

No description provided.

noelle-lavenza and others added 30 commits December 17, 2024 16:17
@noelle-lavenza
Add new rough-hewn wood plank turfs
4fb5067
@noelle-lavenza
Add rough-hewn wood floors to Shaded Hills maps
21854d5
@noelle-lavenza
Add new mud turf sprite and dirt color
44b370d
@noelle-lavenza
Adjust wood floor color ramp
debc2e8
@noelle-lavenza
Add temperature requirements to cooking recipes
d4020b9
@noelle-lavenza
Add doc comments to lighting_turf.dm
2ac7a44
@noelle-lavenza
Add Doe's new chest sprites
cc76d55
@noelle-lavenza
Add recipes for rough wooden tiles
9c958bf
@out-of-phaze
Add heights to mob inventory slots
ce03e41
@out-of-phaze
Add more slot helpers to items
14ba304
@out-of-phaze
Make fluids check tables, floating/throwing, and turf height
dfa2dcb
@MistakeNot4892
Bowls cannot be lidded.
fb4f7ac
@MistakeNot4892
Basic hammers can also be used as crowbars.
fa74516
@MistakeNot4892
Hammers now function as wrenches/crowbars for unanchoring/dismantling…
9cac761 
… structures.
@MistakeNot4892
Structure parts_type does not get applied to non-main materials.
de42c73
@MistakeNot4892
Garlic oil can be used as a weaker antibiotic.
2f86284
@MistakeNot4892
Ethanol is now an abstract type.
34eda11
@MistakeNot4892
Dirt/clay/sand items cannot hold reagents.
7051ae2
@MistakeNot4892
Disables ethanol boiling.
32e096a
@MistakeNot4892
Moved spoon handling code to /glass.
19f193b
@MistakeNot4892
Should prevent 'You can taste .'
794afeb
@MistakeNot4892
Cherrypicking reagent holder interactions from dev for quick-fixing b…
01e1be6 
…arrel/well interactions.
@MistakeNot4892
Repathing waterskins to /glass.
3e4d4c1
@MistakeNot4892
Fixes slings requiring a sling that they cannot take.
8cb6b6d
@out-of-phaze
Fix items being affected by fluids when they shouldn't be
3efa978
@out-of-phaze
Fix ticks2readable giving a blank output
234373b
@out-of-phaze
Fix flame sources not updating held icon when extinguished
5d16462
@out-of-phaze
Fix torch color breaking in water/tall grass
5036372
@out-of-phaze
Fix filter removal using the wrong return value
c229bb5
@out-of-phaze
Fix standing in fluid causing layer flickering
b45e854
out-of-phaze and others added 29 commits December 29, 2024 18:21
@out-of-phaze
Merge pull request NebulaSS13#4681 from MistakeNot4892/wip/codex_dump
fb11510 
Compiled tweaks from old codex dump branch.
@MistakeNot4892
Cleaning up attack_hand interactions.
8ef8f68
@MistakeNot4892
Buffs hook hand dexterity.
b88309e
@MistakeNot4892
Attempts to fix cleanbots becoming fixated on 1 bit of dirt they can'…
d8924ed 
…t reach.
@MistakeNot4892
Enables melting of items inside stomachs.
bda2770
@MistakeNot4892
Cleaning up floorbot logic.
e6bc444
@MistakeNot4892
Ported chicken nuggets from Polaris.
07fabaa
@MistakeNot4892
Reworking oil subtypes and lantern fuel.
5d7c35f
@out-of-phaze
Rename code files with spaces in their name
37dcd2c
@out-of-phaze
Rename asset files with spaces in their path
7594500
@out-of-phaze
Move security levels into security levels module folder
5709089
@out-of-phaze
Disable security state on Shaded Hills
62365c5
@out-of-phaze
Move inertial dampener into a modpack
8be56cc
@out-of-phaze
Allow modpacks to include NanoUI template folders
20f95d6
@out-of-phaze
Fix runtime from security states with fewer than two levels
ae35726
@out-of-phaze
Merge pull request NebulaSS13#4677 from MistakeNot4892/feature/lanter…
1880e40 
…nfish

Adding fish oil.
@NebulaSS13Bot
Automatic changelog generation for PR NebulaSS13#4677 [ci skip]
1523969
@MistakeNot4892
Merge pull request NebulaSS13#4689 from out-of-phaze/codequality/spac…
105aee6 
…e-files

Fix files with spaces in their paths, reorganise some modules
@MistakeNot4892
Merge pull request NebulaSS13#4682 from out-of-phaze/codequality/mind…
34a0976 
…-unoriginal

Remove mind.original
@out-of-phaze
Add a hack for interior ambience and multiz daycycle
8dec28a
@out-of-phaze
Merge pull request NebulaSS13#4686 from MistakeNot4892/fixes/staging
48d91e1 
Misc staging fixes.
@NebulaSS13Bot
Automatic changelog generation [ci skip]
7e1d545
@out-of-phaze
Merge pull request NebulaSS13#4661 from MistakeNot4892/port/nuggets
a670b1e 
Ported chicken nuggets from Polaris.
@out-of-phaze
Merge pull request NebulaSS13#4675 from MistakeNot4892/feature/cream
6d3a929 
Adds cream to goats/cows, adds cream skimming.
@MistakeNot4892
Merge pull request NebulaSS13#4680 from out-of-phaze/fix/daycycle-ver…
bf7524d 
…tical

Implement a workaround for interior ambience not using above levels' daycycle ambience
@MistakeNot4892
Merge branch 'staging' of github.com:NebulaSS13/Nebula into devupdate
5bea942
@MistakeNot4892
Merge pull request NebulaSS13#4694 from MistakeNot4892/devupdate
2493db2 
Updating dev from staging
@MistakeNot4892
Merge branch 'dev' of github.com:NebulaSS13/Nebula into fork/pyrelight
eb401a1
@MistakeNot4892
Updating karzerfeste oil type.
832bb32
@MistakeNot4892 MistakeNot4892 merged commit 8c8891f into PyrelightSS13:dev Jan 4, 2025
14 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

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@MistakeNot4892 @noelle-lavenza @out-of-phaze @NebulaSS13Bot