cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nanako Dev Fixes 15SEP2016 (#926)

Browse Source 
Fixes #894 
Fixes #896 
Fixes #920 
Fixes #892 
Fixes #922 
Fixes #919
This commit is contained in:
NanakoAC
2016-09-15 12:21:09 +03:00
committed by skull132
parent 11e30e99c4
commit 958d95af06
16 changed files with 100 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets.dm
+9 -13
View File
@@ -170,21 +170,17 @@
/obj/structure/closet/ex_act(severity)
switch(severity)
if(1)
for(var/atom/movable/A as mob|obj in src)//pulls everything out of the locker and hits it with an explosion
A.forceMove(src.loc)
A.ex_act(severity + 1)
qdel(src)
health -= rand(120, 240)
if(2)
if(prob(50))
for (var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
A.ex_act(severity + 1)
qdel(src)
health -= rand(60, 120)
if(3)
if(prob(5))
for(var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
qdel(src)
health -= rand(30, 60)
if (health <= 0)
for (var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
A.ex_act(severity + 1)
qdel(src)
/obj/structure/closet/proc/damage(var/damage)
health -= damage
code/game/objects/structures/crates_lockers/crates.dm
+18 -17
View File
@@ -110,23 +110,21 @@
/obj/structure/closet/crate/ex_act(severity)
switch(severity)
if(1.0)
for(var/obj/O in src.contents)
qdel(O)
qdel(src)
return
if(2.0)
for(var/obj/O in src.contents)
if(prob(50))
qdel(O)
qdel(src)
return
if(3.0)
if (prob(50))
qdel(src)
return
else
return
if(1)
health -= rand(120, 240)
if(2)
health -= rand(60, 120)
if(3)
health -= rand(30, 60)
if (health <= 0)
for (var/atom/movable/A as mob|obj in src)
A.forceMove(src.loc)
if (prob(50) && severity > 1)//Higher chance of breaking contents
A.ex_act(severity-1)
else
A.ex_act(severity)
qdel(src)
/obj/structure/closet/crate/secure
desc = "A secure crate."
@@ -140,6 +138,7 @@
var/emag = "securecrateemag"
var/broken = 0
var/locked = 1
health = 200
/obj/structure/closet/crate/secure/New()
..()
@@ -430,6 +429,7 @@
icon_state = "largemetal"
icon_opened = "largemetalopen"
icon_closed = "largemetal"
health = 200
/obj/structure/closet/crate/large/close()
. = ..()
@@ -458,6 +458,7 @@
icon_closed = "largemetal"
redlight = "largemetalr"
greenlight = "largemetalg"
health = 400
/obj/structure/closet/crate/secure/large/close()
. = ..()