mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 11:37:40 +01:00
Slowdown on pulling (#21056)
* slowdown on pulling * slowdown only when pulling structure or machinery * moving speed modifier to /mob/living/carbon instead of all atoms * added pull_speed to /atom/movable, moved movement_delay proc to carbon/human * no-slowdown-trash-bin * Update code/game/atoms_movable.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> * removed pull_speed on /obj/item/storage/bag/trash, no need to set this * more 0 pull_speed objects * added gravity check, moved pull_speed to /obj --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
This commit is contained in:
@@ -22,6 +22,7 @@ GLOBAL_VAR(bomb_set)
|
||||
anchored = TRUE
|
||||
power_state = NO_POWER_USE
|
||||
requires_power = FALSE
|
||||
pull_speed = 0
|
||||
|
||||
/// Are our bolts *supposed* to be in the floor, may not actually cause anchoring if the bolts are cut
|
||||
var/extended = TRUE
|
||||
|
||||
@@ -7,6 +7,7 @@
|
||||
layer = BELOW_OBJ_LAYER
|
||||
armor = list(melee = 25, bullet = 10, laser = 10, energy = 0, bomb = 0, rad = 0, fire = 50, acid = 70)
|
||||
atom_say_verb = "beeps"
|
||||
pull_speed = 0.5
|
||||
var/stat = 0
|
||||
|
||||
/// How is this machine currently passively consuming power?
|
||||
|
||||
@@ -32,6 +32,8 @@
|
||||
var/suicidal_hands = FALSE // Does it requires you to hold it to commit suicide with it?
|
||||
/// Is it emagged or not?
|
||||
var/emagged = FALSE
|
||||
/// slowndown on pulling by human. Bigger value = slower pulling
|
||||
var/pull_speed = 0
|
||||
|
||||
/obj/New()
|
||||
..()
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
pressure_resistance = 8
|
||||
max_integrity = 300
|
||||
face_while_pulling = TRUE
|
||||
pull_speed = 0.5
|
||||
var/climbable
|
||||
var/mob/living/climber
|
||||
var/broken = FALSE
|
||||
|
||||
@@ -408,6 +408,7 @@
|
||||
icon_state = "bluespace"
|
||||
open_door_sprite = "bluespace_door"
|
||||
storage_capacity = 60
|
||||
pull_speed = 0
|
||||
var/materials = list(MAT_METAL = 5000, MAT_PLASMA = 2500, MAT_TITANIUM = 500, MAT_BLUESPACE = 500)
|
||||
|
||||
/obj/structure/closet/bluespace/CheckExit(atom/movable/AM)
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
face_while_pulling = FALSE
|
||||
anchored = FALSE
|
||||
density = TRUE
|
||||
pull_speed = 0
|
||||
var/obj/item/stack/sheet/glass/myglass = null
|
||||
var/obj/item/stack/sheet/metal/mymetal = null
|
||||
var/obj/item/stack/sheet/plasteel/myplasteel = null
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
density = TRUE
|
||||
face_while_pulling = FALSE
|
||||
container_type = OPENCONTAINER
|
||||
pull_speed = 0
|
||||
//copypaste sorry
|
||||
var/maximum_volume = 150
|
||||
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
|
||||
|
||||
@@ -136,6 +136,7 @@
|
||||
resistance_flags = NONE
|
||||
anchored = FALSE
|
||||
comfort = 1
|
||||
pull_speed = 0
|
||||
var/icon_up = "up"
|
||||
var/icon_down = "down"
|
||||
var/folded = /obj/item/roller
|
||||
|
||||
@@ -238,6 +238,7 @@
|
||||
movable = TRUE
|
||||
item_chair = null
|
||||
buildstackamount = 5
|
||||
pull_speed = 0
|
||||
|
||||
/obj/structure/chair/comfy/shuttle
|
||||
name = "shuttle seat"
|
||||
|
||||
@@ -763,6 +763,7 @@
|
||||
icon_state = "tray"
|
||||
buildstack = /obj/item/stack/sheet/mineral/titanium
|
||||
buildstackamount = 2
|
||||
pull_speed = 0
|
||||
var/list/typecache_can_hold = list(/mob, /obj/item)
|
||||
var/list/held_items = list()
|
||||
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
. += ..()
|
||||
. += GLOB.configuration.movement.human_delay
|
||||
. += dna.species.movement_delay(src)
|
||||
if(mob_has_gravity() && isobj(pulling))
|
||||
var/obj/pulled = pulling
|
||||
. += pulled.pull_speed
|
||||
|
||||
/mob/living/carbon/human/Process_Spacemove(movement_dir = 0)
|
||||
|
||||
|
||||
@@ -79,6 +79,7 @@
|
||||
name = "water tank"
|
||||
desc = "A water tank."
|
||||
icon_state = "water"
|
||||
pull_speed = 0
|
||||
|
||||
/obj/structure/reagent_dispensers/watertank/high
|
||||
name = "high-capacity water tank"
|
||||
@@ -93,6 +94,7 @@
|
||||
icon_state = "oil"
|
||||
reagent_id = "oil"
|
||||
tank_volume = 3000
|
||||
pull_speed = 0
|
||||
|
||||
/obj/structure/reagent_dispensers/fueltank
|
||||
name = "fuel tank"
|
||||
@@ -101,6 +103,7 @@
|
||||
reagent_id = "fuel"
|
||||
tank_volume = 4000
|
||||
anchored = TRUE
|
||||
pull_speed = 0
|
||||
var/obj/item/assembly_holder/rig = null
|
||||
var/accepts_rig = 1
|
||||
|
||||
@@ -279,6 +282,7 @@
|
||||
icon = 'icons/obj/nuclearbomb.dmi'
|
||||
icon_state = "nuclearbomb0"
|
||||
anchored = TRUE
|
||||
pull_speed = 0
|
||||
|
||||
/obj/structure/reagent_dispensers/beerkeg/nuke/update_overlays()
|
||||
. = ..()
|
||||
|
||||
@@ -109,6 +109,7 @@
|
||||
icon = 'icons/vehicles/CargoTrain.dmi'
|
||||
icon_state = "ambulance"
|
||||
anchored = FALSE
|
||||
pull_speed = 0
|
||||
|
||||
/obj/structure/bed/amb_trolley/examine(mob/user)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user