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

[MDB IGNORE] [IDB IGNORE] r6 staging #4056

Merged
merged 1,176 commits into from
Jun 27, 2024
Merged

[MDB IGNORE] [IDB IGNORE] r6 staging #4056

merged 1,176 commits into from
Jun 27, 2024

Conversation

MistakeNot4892
Copy link
Contributor

No description provided.

@MistakeNot4892 MistakeNot4892 added the do not merge This PR is on hold, do not merge it. label May 26, 2024
@MistakeNot4892 MistakeNot4892 added this to the r6 milestone May 26, 2024
PsyCommando and others added 28 commits June 5, 2024 15:16
@PsyCommando
Added missing sound effects to lockable safe
70d52b2
@PsyCommando
Tweaked secure storage icons +
f0d4aed 
* Modified and moved a bunch of shared icons related to briefcase icons to use the new icon layout for items. (both on mob states and world states)
* Turned to overlays a bunch of icons for secure containers.
* Added some missing icons for the secure briefcase.
* Added back the hacking icon.
* Added back icon states when storage opened and closed.
* Fixed issue where the container would only look unlocked if the maintenance panel was opened.
@PsyCommando
Added spark effect after hacking complete
8d6963f
@PsyCommando
Fixed lockable briefcase gathering items when locked
ce7888c 
* The locked suitcase could be used on a turf with items when locked and would gather items into itself.
* Also, prevent quick emptying the container when locked.
@PsyCommando
Tweaked keypad button disabled
4d1ec0d 
Tweaked css stylesheet for the lockable keypad buttons so it looks more obviously disabled.
@MistakeNot4892
Removing some unnecessary Destroy() overrides.
93947f1
@MistakeNot4892
Cleaned up bleeding() proc.
a786415
@MistakeNot4892
Trailing commit for ore value changes.
40a0fa1
@MistakeNot4892
Split the overalls up.
bfcdf37
@MistakeNot4892
Converting grim hoodie to a hoodie.
1cc219d
@MistakeNot4892
Converting more under items.
0ddc788
@MistakeNot4892
Converted jumpskirts to jumpsuits.
b104b0c
@MistakeNot4892
Converting several more under items to jumpsuits.
77645cb
@MistakeNot4892
Breaking up more uniforms into pant/shirt combos.
f349036
@MistakeNot4892
Breaking up the under clothing icon folder.
fb052ab
@MistakeNot4892
More uniform breakups...
dcf89b9
@MistakeNot4892
Splitting up security uniform.
44f4bed
@MistakeNot4892
Converting sweaters to shirts.
b56eab4
@MistakeNot4892
Breaking up the chef uniform.
3778b5f
@MistakeNot4892
Converting syndicate uniforms to shirt/pants.
7584c77
@MistakeNot4892
Compile fixes post-rebase.
706c7cc
@MistakeNot4892
Converting orderly and EC uniform.
7d65b31
@MistakeNot4892
Converting waiter uniforms.
9fc6343
@MistakeNot4892
Converting some corp clothes.
f91cabf
@MistakeNot4892
More uniform conversions.
b780271
@MistakeNot4892
Brute force converts remaining uniforms, mostly to /costume.
03bb081
@MistakeNot4892
CI issues for uniform PR.
778df13
@MistakeNot4892
Added map migration.
8b70f68
out-of-phaze and others added 28 commits June 22, 2024 09:56
@out-of-phaze
Fix browsers not rendering in 516
ce898b6
@out-of-phaze
Make sure topic links include BYOND protocol
115e249
@out-of-phaze
Mark deprecated ms-interpolation-mode css property
3804d1f
@out-of-phaze
Fix unicode in 516 browsers
c9ca80f
@NebulaSS13Bot
Automatic changelog generation [ci skip]
dee4002
@MistakeNot4892
Merge pull request #4042 from out-of-phaze/fix/516-compat
eb78b0b 
Fix BYOND 516 alpha compatibility issues
@out-of-phaze @comma
Fix north-facing pew icons being flipped
fdf0274
@out-of-phaze @comma
Fix drakes being unable to eat plants
5828abc
@out-of-phaze @comma
Improve throwing and throw-placement UX
5968f9c
@out-of-phaze @comma
Improve structure-door direction autoset
a44b82a
@out-of-phaze @comma
Fix maptext briefly appearing when stacks are dropped or placed on a …
82cdcf1 
…turf
@out-of-phaze @comma
Make add_to_stacks report number of stacks transferred
b4488a4
@out-of-phaze @comma
Adjust Shaded Hills loadout tool materials
7abe877
@MistakeNot4892 @comma
Adding walls with shutters.
219738e
@MistakeNot4892 @comma
Quick fix for lock ordering runtimes.
a56761c
@out-of-phaze @comma
Improve wall shutter overlay placement and updating
af1831a 
Fix shutters not updating with ambience properly
@out-of-phaze @comma
Replace shrine windows with shutters
6839ab9
@out-of-phaze @comma
Fix stray lanterns on fantasy inn map
56c6984
@MistakeNot4892 @comma
Fixes runtime in simple_animal exoplanet adjustment.
2e52a9c
@out-of-phaze
Improve fake fire effect visuals
05fc33f
@out-of-phaze
Make scorched grass a separate type
11802ba
@out-of-phaze
Generalize fire/burning logic to mob/living
94087e8
@out-of-phaze
Allow projectiles to hit structures
ffe32a7
@out-of-phaze
Improve projectile mimic-turf handling
d394d3b
@out-of-phaze
Improve fireball item effect
0c47317
@MistakeNot4892
Merge pull request #4142 from out-of-phaze/feature/fireball
9425105 
Improve fireball enchantment and fire-related effects/interactions
@MistakeNot4892
Merge branch 'stable' of github.com:NebulaSS13/Nebula into devupdate
050a507
@MistakeNot4892
Merge pull request #4145 from MistakeNot4892/devupdate
bc21f10 
Updating dev from stable.
@MistakeNot4892 MistakeNot4892 removed the do not merge This PR is on hold, do not merge it. label Jun 27, 2024
@MistakeNot4892 MistakeNot4892 merged commit 8d30b06 into staging Jun 27, 2024
26 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
r6
Development

Successfully merging this pull request may close these issues.
5 participants
@MistakeNot4892 @PsyCommando @out-of-phaze @NebulaSS13Bot @NataKilar