Skip to content

(Experimental) Knockdown no longer guarantees dropping items #884

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

Open
MrMelbert wants to merge 3 commits into
base: master
Choose a base branch
from
+18 −6
Open

(Experimental) Knockdown no longer guarantees dropping items #884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b09a7b0
Dropping items on fall is no longer guaranteed
MrMelbert Feb 20, 2026
0a1f328
Tweak
MrMelbert Feb 20, 2026
2b854d4
Redundant
MrMelbert Feb 20, 2026
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
19 changes: 16 additions & 3 deletions code/game/turfs/turf.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -622,9 +622,22 @@ GLOBAL_LIST_EMPTY(station_turfs)
AddElement(/datum/element/rust)

/turf/handle_fall(mob/faller)
if(has_gravity(src))
playsound(src, SFX_BODYFALL, 50, TRUE)
faller.drop_all_held_items()
if(!has_gravity(src))
return
playsound(src, SFX_BODYFALL, 50, TRUE)
if(!iscarbon(faller))
faller.drop_all_held_items()
return

var/mob/living/carbon/carbon_faller = faller
var/is_staggered = carbon_faller.has_status_effect(/datum/status_effect/staggered)
for(var/obj/item/bodypart/arm/arm in carbon_faller.bodyparts)
var/obj/item/held = faller.get_item_for_held_index(arm.held_index)
if(isnull(held))
continue
if(!prob((0.3 * ((is_staggered ? 10 : 0) + (5 * held.w_class) + arm.get_modified_pain())) ** 1.5))
continue
faller.dropItemToGround(held)

/turf/proc/photograph(limit=20)
var/image/I = new()
Expand Down
5 changes: 2 additions & 3 deletions code/modules/mob/living/living_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -724,10 +724,9 @@
//Take their lunch money
var/target_held_item = target.get_active_held_item()
var/append_message = weapon ? " with [weapon]" : ""
if(!is_type_in_typecache(target_held_item, GLOB.shove_disarming_types)) //It's too expensive we'll get caught
target_held_item = null
var/disarmable = is_type_in_typecache(target_held_item, GLOB.shove_disarming_types) || target.body_position == LYING_DOWN

if(target_held_item && target.get_timed_status_effect_duration(/datum/status_effect/staggered))
if(target_held_item && disarmable && target.has_status_effect(/datum/status_effect/staggered))
target.dropItemToGround(target_held_item)
append_message = "causing [target.p_them()] to drop [target_held_item]"
target.visible_message(span_danger("[target.name] drops \the [target_held_item]!"),
Expand Down
Loading