Merge pull request #1496 from Fox-McCloud/LINDA-Pressure

LINDA Pressure Changes
This commit is contained in:
ZomgPonies
2015-07-12 22:35:21 -04:00
10 changed files with 8 additions and 6 deletions
+1
View File
@@ -96,6 +96,7 @@ Class Procs:
/obj/machinery
name = "machinery"
icon = 'icons/obj/stationobjs.dmi'
pressure_resistance = 10
var/stat = 0
var/emagged = 0
var/use_power = 1
+1 -1
View File
@@ -12,7 +12,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
// causeerrorheresoifixthis
var/obj/item/master = null
+1
View File
@@ -1,5 +1,6 @@
/obj/structure
icon = 'icons/obj/structures.dmi'
pressure_resistance = 8
var/climbable
var/mob/climber
+1 -2
View File
@@ -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
@@ -12,7 +11,7 @@
var/datum/reagents/R = new/datum/reagents(100)
reagents = R
R.my_atom = src
/obj/structure/mopbucket/full/New()
..()
reagents.add_reagent("water", 100)
@@ -4,7 +4,6 @@
icon = 'icons/obj/objects.dmi'
icon_state = "stool"
anchored = 1.0
pressure_resistance = 15
/obj/structure/stool/ex_act(severity)
switch(severity)
@@ -505,6 +505,7 @@ emp_act
return
/mob/living/carbon/human/experience_pressure_difference(pressure_difference, direction)
playsound(src, 'sound/effects/space_wind.ogg', 50, 1)
if(shoes)
if(istype(shoes,/obj/item/clothing/shoes/magboots) && (shoes.flags & NOSLIP)) //TODO: Make a not-shit shoe var system to negate airflow.
return 0
+1
View File
@@ -3,6 +3,7 @@
layer = 4.0
animate_movement = 2
// flags = NOREACT
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
@@ -13,7 +13,7 @@
throw_range = 1
throw_speed = 1
layer = 4
pressure_resistance = 1
pressure_resistance = 0
slot_flags = SLOT_HEAD
body_parts_covered = HEAD
attack_verb = list("bapped")
+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.
/*