Merge pull request #12007 from Ccomp5950/various_fixes

Various fixes
This commit is contained in:
Chinsky
2016-01-21 07:23:17 +03:00
6 changed files with 13 additions and 22 deletions

View File

@@ -11,7 +11,7 @@
desc = "A one-way air valve that can be used to regulate input or output pressure, and flow rate. Does not require power."
use_power = 0
interact_offline = 1
var/unlocked = 0 //If 0, then the valve is locked closed, otherwise it is open(-able, it's a one-way valve so it closes if gas would flow backwards).
var/target_pressure = ONE_ATMOSPHERE
var/max_pressure_setting = 15000 //kPa

View File

@@ -173,6 +173,7 @@ obj/machinery/door/blast/regular
icon_state_closing = "pdoorc1"
icon_state = "pdoor1"
maxhealth = 600
block_air_zones = 1
obj/machinery/door/blast/regular/open
icon_state = "pdoor0"
@@ -186,4 +187,4 @@ obj/machinery/door/blast/regular/open
icon_state_opening = "shutterc0"
icon_state_closed = "shutter1"
icon_state_closing = "shutterc1"
icon_state = "shutter1"
icon_state = "shutter1"

View File

@@ -680,8 +680,9 @@
..()
for(var/piece in list("helmet","gauntlets","chest","boots"))
toggle_piece(piece, user, ONLY_RETRACT)
wearer.wearing_rig = null
wearer = null
if(wearer)
wearer.wearing_rig = null
wearer = null
//Todo
/obj/item/weapon/rig/proc/malfunction()

View File

@@ -155,22 +155,21 @@
var/target = target_mob
visible_message("\red <b>[src]</b> fires at [target]!", 1)
var/tturf = get_turf(target)
if(rapid)
spawn(1)
Shoot(tturf, src.loc, src)
Shoot(target, src.loc, src)
if(casingtype)
new casingtype(get_turf(src))
spawn(4)
Shoot(tturf, src.loc, src)
Shoot(target, src.loc, src)
if(casingtype)
new casingtype(get_turf(src))
spawn(6)
Shoot(tturf, src.loc, src)
Shoot(target, src.loc, src)
if(casingtype)
new casingtype(get_turf(src))
else
Shoot(tturf, src.loc, src)
Shoot(target, src.loc, src)
if(casingtype)
new casingtype
@@ -187,17 +186,7 @@
playsound(user, projectilesound, 100, 1)
if(!A) return
if (!istype(target, /turf))
qdel(A)
return
A.current = target
A.starting = get_turf(src)
A.original = get_turf(target)
A.yo = target:y - start:y
A.xo = target:x - start:x
spawn( 0 )
A.process()
return
A.launch(target, "chest")
/mob/living/simple_animal/hostile/proc/DestroySurroundings()
if(prob(break_stuff_probability))

View File

@@ -315,7 +315,7 @@
sleep(step_delay) //add delay between movement iterations if it's not a hitscan weapon
/obj/item/projectile/proc/before_move()
return
return 0
/obj/item/projectile/proc/setup_trajectory(turf/startloc, turf/targloc, var/x_offset = 0, var/y_offset = 0)
// setup projectile state

View File

@@ -133,7 +133,7 @@ datum/unit_test/zas_area_test/incinerator
name = "ZAS: Incinerator"
area_path = /area/maintenance/incinerator
disabled = 1
why_disabled = "Incernator blast doors not blocking air flow. See bug #11846"
why_disabled = "Scrubber pulls air, this area cannot be tested."
datum/unit_test/zas_area_test/virology
name = "ZAS: Virology"