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.

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

Updating from Neb dev #116

Merged
merged 55 commits into from
Jan 8, 2025
Merged
Changes from 1 commit
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
dec798e
Disambiguating some language in human examine code.
MistakeNot4892 Jan 4, 2025
bd4ba52
Adjusting fluid dripping and turf slipperiness from fluid_act().
MistakeNot4892 Jan 4, 2025
fc04081
Dirt will no longer fall through open space.
MistakeNot4892 Jan 4, 2025
b4d2fcd
Further tweaks to dripping logic.
MistakeNot4892 Jan 4, 2025
87d44df
Corrects paper solvent check.
MistakeNot4892 Jan 4, 2025
3ead82c
Fixing tiny amounts of paint colouring turfs.
MistakeNot4892 Jan 4, 2025
4926f3d
Fix inability to use mortars.
MistakeNot4892 Jan 4, 2025
cb77672
Reboot will only be announced once.
MistakeNot4892 Jan 4, 2025
d29df4d
Fixing several runtimes from Pyrelight testing.
MistakeNot4892 Jan 4, 2025
4a4fa06
Fixes issues with pry_door() parameters.
MistakeNot4892 Jan 4, 2025
07faf75
Fixes some null holder issues with rig modules.
MistakeNot4892 Jan 4, 2025
bc91fcc
Fixing runtime in slapcrafting with stacks.
MistakeNot4892 Jan 4, 2025
4564342
Fixing missing lazylist macro in overlay add.
MistakeNot4892 Jan 4, 2025
45d3eba
Correcting typing on glass alt interaction override.
MistakeNot4892 Jan 4, 2025
c6e84ff
Put a cap on the amount of damage you can take from hail.
MistakeNot4892 Jan 5, 2025
40b4aaa
Notes towards ambient light fixes.
MistakeNot4892 Jan 5, 2025
b125df2
Fixes return value of trans_to_turf().
MistakeNot4892 Jan 5, 2025
9db7211
Fixing glass containrs like bottles being drunk from instead of toggl…
MistakeNot4892 Jan 5, 2025
4fbeb0f
Maps will now validate their level lists during unit testing.
MistakeNot4892 Jan 5, 2025
e55d256
Removes testing maps from votable maps.
MistakeNot4892 Jan 5, 2025
0e8b2bf
Commenting out admin levels check.
MistakeNot4892 Jan 5, 2025
780a30e
Fixing AI verb proc references.
MistakeNot4892 Jan 5, 2025
7474702
Shaded Hills level data changed to main_level instead of player_level.
MistakeNot4892 Jan 5, 2025
a753ab6
Adding map previews for Shaded Hills.
MistakeNot4892 Jan 5, 2025
bdfd416
Fixed holsters considering their holstered weapon as also in storage.
MistakeNot4892 Jan 5, 2025
b98168e
Optimize ship mass calculation
out-of-phaze Jan 5, 2025
5deaa89
Port TG's ref()less garbage collector
out-of-phaze Jan 5, 2025
0c15e2d
Remove ID var from seed piles
out-of-phaze Jan 5, 2025
6e2e8d7
Fix unnecessary UI updates on storage object destroy
out-of-phaze Jan 5, 2025
2dbbf4d
Optimize icon state checks via more caching
out-of-phaze Jan 5, 2025
07cf2d1
Fix bookcase icon state check
out-of-phaze Jan 5, 2025
a05b48b
Make state machine list use hardrefs
out-of-phaze Jan 5, 2025
7b614a7
Fix unnecessary .name usage in text strings
out-of-phaze Jan 5, 2025
2d3c37f
Make NanoUI use hardrefs for src_object
out-of-phaze Jan 5, 2025
3cbff13
Fix del the world with new SSgarbage queues
out-of-phaze Jan 5, 2025
0fa9e1f
Fix harddel issues found by improved GC
out-of-phaze Jan 5, 2025
e1c1aa0
Enable reftracking in CI
out-of-phaze Jan 5, 2025
46e7deb
Fix terminal GC fail from geothermal generator
out-of-phaze Jan 6, 2025
e509f48
Add additional safeguards to graphs
out-of-phaze Jan 6, 2025
cf96eca
Fix GC fails from ballistic weapons
out-of-phaze Jan 6, 2025
b79e751
Remove GC exceptions list
out-of-phaze Jan 6, 2025
e8c033f
Fix miscellaneous GC issues
out-of-phaze Jan 6, 2025
75eac09
Fix graph GC
out-of-phaze Jan 6, 2025
6ef7d87
Fix hard-queued objects causing runtimes
out-of-phaze Jan 6, 2025
937681b
Corrects trench color.
MistakeNot4892 Jan 7, 2025
da0c626
Fixes backfilling.
MistakeNot4892 Jan 7, 2025
123f861
Resets pixel_z on turfs when height is 0.
MistakeNot4892 Jan 7, 2025
b2f6d4d
Prevents /mob/living/brain from deleting its turf on gib().
MistakeNot4892 Jan 7, 2025
efe0c55
Automatic changelog generation [ci skip]
NebulaSS13Bot Jan 8, 2025
c2daacc
Merge pull request #4698 from out-of-phaze/optimize/ship-mass
MistakeNot4892 Jan 8, 2025
051354e
Merge pull request #4693 from MistakeNot4892/fixes/staging
out-of-phaze Jan 8, 2025
e2a948b
Merge branch 'staging' of github.com:NebulaSS13/Nebula into devupdate
MistakeNot4892 Jan 8, 2025
5485975
filter_queue -> check_queue in del_the_world
MistakeNot4892 Jan 8, 2025
e3e4908
Merge pull request #4706 from MistakeNot4892/devupdate
MistakeNot4892 Jan 8, 2025
1bee759
Merge branch 'dev' of github.com:NebulaSS13/Nebula into fork/pyrelight
MistakeNot4892 Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixing runtime in slapcrafting with stacks.
  • Loading branch information
MistakeNot4892 committed Jan 4, 2025
commit bc91fcc8e5f616ca79d87c62b6321fa1efba4d42
11 changes: 6 additions & 5 deletions code/modules/crafting/slapcrafting/_crafting_stage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,17 +76,18 @@
. = !consume_completion_trigger || user.try_unequip(thing, target)
if(. && stack_consume_amount > 0)
var/obj/item/stack/stack = thing
if(!istype(stack) || stack.amount < stack_consume_amount)
if(!istype(stack) || stack.get_amount() < stack_consume_amount)
on_insufficient_material(user, stack)
return FALSE
var/obj/item/stack/used_stack
if(stack.amount == stack_consume_amount)
if(stack.amount > stack_consume_amount)
used_stack = stack.split(stack_consume_amount)
else
if(!user.try_unequip(thing, target))
return FALSE
used_stack = stack
else
used_stack = stack.split(stack_consume_amount)
used_stack.forceMove(target)
if(used_stack)
used_stack.forceMove(target)
target?.update_icon()

/decl/crafting_stage/proc/on_insufficient_material(var/mob/user, var/obj/item/stack/thing)
Expand Down