diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 186aae2a72c..7acdf66cbf2 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -142,9 +142,6 @@ /obj/structure/closet/body_bag/animate_door() flick("[initial(icon_state)]_anim_[opened ? "open" : "close"]", src) -/obj/structure/closet/body_bag/stair_act() //Stops body bags flying open when pulled down stairs - return - /obj/item/bodybag/cryobag name = "stasis bag" desc = "A folded, reusable bag designed to prevent additional damage to an occupant, especially useful if short on time or in \ diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1706f44a9a7..5ffd74be80b 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -301,7 +301,3 @@ /obj/proc/clean() clean_blood() color = initial(color) - -/// This fires when the object /crosses() a stair object -/obj/proc/stair_act() - return diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index ae1c889254b..4e9d4c36946 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -802,19 +802,6 @@ new /obj/item/stack/material/steel(get_turf(src)) qdel(src) -/obj/structure/closet/stair_act() - if(opened || !can_open()) - return - - visible_message(SPAN_WARNING("\The [src] flies open as it bounces on the stairs!")) - for(var/thing in src) - var/atom/movable/AM = thing - AM.forceMove(get_turf(src)) - AM.throw_at_random(TRUE, 1, 2) - open() - - return ..() - /* ========================== Contents Scanner diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index 5db46197f0a..d8ad77e4742 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -306,21 +306,6 @@ else occupant.visible_message(SPAN_DANGER("[occupant] crashed into \the [A]!")) -/obj/structure/bed/stair_act() - if(!buckled) - return - - var/atom/movable/unbuckled_atom = unbuckle() - if(!unbuckled_atom) - return - - unbuckled_atom.visible_message("\The [unbuckled_atom] goes flying out of \the [src] as it bounces on the stairs!", SPAN_WARNING("You go flying out of \the [src] as it bounces on the stairs!")) - unbuckled_atom.throw_at_random(FALSE, 1, 2) - - if(ismob(unbuckled_atom)) - var/mob/unbuckled_mob = unbuckled_atom - unbuckled_mob.Paralyse(5) - /obj/structure/bed/psych name = "psychiatrist's couch" desc = "For prime comfort during psychiatric evaluations." @@ -578,9 +563,6 @@ .=..() set_light(2,1,LIGHT_COLOR_CYAN) -/obj/structure/bed/roller/hover/stair_act() - return - /obj/item/roller name = "roller bed" desc = "A collapsed roller bed that can be carried around." diff --git a/code/modules/multiz/structures.dm b/code/modules/multiz/structures.dm index 79bf0a7497a..5f22f55077f 100644 --- a/code/modules/multiz/structures.dm +++ b/code/modules/multiz/structures.dm @@ -284,11 +284,6 @@ playsound(src, 'sound/effects/stairs_step.ogg', 50) playsound(target, 'sound/effects/stairs_step.ogg', 50) -/obj/structure/stairs/Crossed(obj/O) - if(istype(O)) - O.stair_act() - return ..() - /obj/structure/stairs/proc/upperStep(var/turf/T) return (T == loc) @@ -386,11 +381,6 @@ icon = 'icons/obj/structure/stairs.dmi' icon_state = "np_stair" -/obj/structure/platform_stairs/Crossed(obj/O) - if(istype(O)) - O.stair_act() - return ..() - /obj/structure/platform_stairs/south_north_solo icon_state = "p_stair_sn_solo_cap" diff --git a/html/changelogs/mattatlas-stairrevert.yml b/html/changelogs/mattatlas-stairrevert.yml new file mode 100644 index 00000000000..5cd982fd8d5 --- /dev/null +++ b/html/changelogs/mattatlas-stairrevert.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: MattAtlas + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscdel: "Reverted the stair mobility changes."