Merge pull request #9779 from Cheridan/touching_linda

Pressure_resistance Tweaks
This commit is contained in:
Razharas
2015-06-07 04:57:52 +03:00
12 changed files with 15 additions and 13 deletions
+1 -7
View File
@@ -269,22 +269,16 @@
/atom/movable/var/pressure_resistance = 5
/atom/movable/var/last_forced_movement = 0
/atom/movable/proc/experience_pressure_difference(pressure_difference, direction)
if(last_forced_movement >= world.time-10)
return 0
else if(!anchored)
if(!anchored)
if(pressure_difference > pressure_resistance)
last_forced_movement = world.time
spawn step(src, direction)
return 1
/datum/excited_group
var/list/turf_list = list()
var/breakdown_cooldown = 0
+1
View File
@@ -97,6 +97,7 @@ Class Procs:
name = "machinery"
icon = 'icons/obj/stationobjs.dmi'
verb_yell = "blares"
pressure_resistance = 10
var/stat = 0
var/emagged = 0
var/use_power = 1
+1 -1
View File
@@ -13,7 +13,7 @@
var/w_class = 3.0
var/slot_flags = 0 //This is used to determine on which slots an item can fit.
pass_flags = PASSTABLE
pressure_resistance = 5
pressure_resistance = 3
var/obj/item/master = null
var/heat_protection = 0 //flags which determine which body parts are protected from heat. Use the HEAD, CHEST, GROIN, etc. flags. See setup.dm
+1
View File
@@ -1,5 +1,6 @@
/obj/structure
icon = 'icons/obj/structures.dmi'
pressure_resistance = 8
/obj/structure/blob_act()
if(prob(50))
@@ -4,7 +4,6 @@
icon = 'icons/obj/janitor.dmi'
icon_state = "mopbucket"
density = 1
pressure_resistance = 5
flags = OPENCONTAINER
var/amount_per_transfer_from_this = 5 //shit I dunno, adding this so syringes stop runtime erroring. --NeoFite
@@ -4,7 +4,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "stool"
anchored = 1.0
pressure_resistance = 5
/obj/structure/stool/ex_act(severity, target)
switch(severity)
+2 -1
View File
@@ -5,8 +5,9 @@
icon = 'icons/obj/mining.dmi'
icon_state = "orebox"
name = "ore box"
desc = "It's heavy"
desc = "A heavy wooden box, which can be filled with a lot of ores."
density = 1
pressure_resistance = 5*ONE_ATMOSPHERE
/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
if (istype(W, /obj/item/weapon/ore))
@@ -29,6 +29,12 @@
return 0
.=..()
/mob/living/carbon/human/experience_pressure_difference()
playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
if(shoes.flags&NOSLIP)
return 0
. = ..()
/mob/living/carbon/human/mob_has_gravity()
. = ..()
if(!.)
+1
View File
@@ -4,6 +4,7 @@
animate_movement = 2
flags = HEAR
hud_possible = list(ANTAG_HUD)
pressure_resistance = 8
var/datum/mind/mind
var/stat = 0 //Whether a mob is alive or dead. TODO: Move this to living - Nodrak
+1 -1
View File
@@ -15,7 +15,7 @@
throw_range = 1
throw_speed = 1
layer = 3
pressure_resistance = 1
pressure_resistance = 0
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
+1 -1
View File
@@ -7,7 +7,7 @@
w_class = 3
throw_speed = 3
throw_range = 7
pressure_resistance = 10
pressure_resistance = 8
var/amount = 30 //How much paper is in the bin.
var/list/papers = new/list() //List of papers put in the bin for reference.
Binary file not shown.