mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-13 08:56:49 +01:00
Revert "Stairs are Dangerous" (#19484)
Unfortunately most of the map is kind of unplayable or not mapped in mind with stairs being untraversable for roller beds or wheelchairs. Remapping every map to work with this mechanic is also not something I am interested in. --------- Co-authored-by: Matt Atlas <liermattia@gmail.com>
This commit is contained in:
@@ -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 \
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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("<b>\The [unbuckled_atom]</b> 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."
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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."
|
||||
Reference in New Issue
Block a user