shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update poddoor.dm

Browse Source
This commit is contained in:
deathride58
2017-12-27 21:57:51 -05:00
committed by GitHub
parent dbab8bbdab
commit b8dc623ebc
1 changed files with 24 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/doors/poddoor.dm
+24 -67
View File
@@ -1,22 +1,13 @@
/obj/machinery/door/poddoor /obj/machinery/door/poddoor
name = "blast door" name = "blast door"
desc = "A heavy duty blast door that opens mechanically." desc = "A heavy duty blast door that opens mechanically."
icon = 'icons/obj/doors/blastdoor.dmi' icon = 'icons/obj/doors/blastdoor.dmi'
icon_state = "closed" icon_state = "closed"
var/id = 1 var/id = 1
sub_door = TRUE sub_door = TRUE
explosion_block = 3 explosion_block = 3
heat_proof = TRUE heat_proof = TRUE
safe = FALSE safe = FALSE
<<<<<<< HEAD
max_integrity = 600
armor = list(melee = 50, bullet = 100, laser = 100, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 100, acid = 70)
resistance_flags = FIRE_PROOF
damage_deflection = 70
/obj/machinery/door/poddoor/preopen
icon_state = "open"
=======
max_integrity = 600 max_integrity = 600
armor = list(melee = 50, bullet = 100, laser = 100, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 100, acid = 70) armor = list(melee = 50, bullet = 100, laser = 100, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 100, acid = 70)
resistance_flags = FIRE_PROOF resistance_flags = FIRE_PROOF
@@ -24,58 +15,25 @@
/obj/machinery/door/poddoor/preopen /obj/machinery/door/poddoor/preopen
icon_state = "open" icon_state = "open"
>>>>>>> 97881b6... Merge pull request #33858 from nero1024/blastdoor-sound
density = FALSE density = FALSE
opacity = 0 opacity = 0
/obj/machinery/door/poddoor/ert /obj/machinery/door/poddoor/ert
desc = "A heavy duty blast door that only opens for dire emergencies." desc = "A heavy duty blast door that only opens for dire emergencies."
//special poddoors that open when emergency shuttle docks at centcom //special poddoors that open when emergency shuttle docks at centcom
/obj/machinery/door/poddoor/shuttledock /obj/machinery/door/poddoor/shuttledock
var/checkdir = 4 //door won't open if turf in this dir is `turftype` var/checkdir = 4 //door won't open if turf in this dir is `turftype`
var/turftype = /turf/open/space var/turftype = /turf/open/space
/obj/machinery/door/poddoor/shuttledock/proc/check() /obj/machinery/door/poddoor/shuttledock/proc/check()
var/turf/T = get_step(src, checkdir) var/turf/T = get_step(src, checkdir)
if(!istype(T, turftype)) if(!istype(T, turftype))
INVOKE_ASYNC(src, .proc/open) INVOKE_ASYNC(src, .proc/open)
else else
INVOKE_ASYNC(src, .proc/close) INVOKE_ASYNC(src, .proc/close)
/obj/machinery/door/poddoor/CollidedWith(atom/movable/AM) /obj/machinery/door/poddoor/CollidedWith(atom/movable/AM)
<<<<<<< HEAD
if(density)
return 0
else
return ..()
//"BLAST" doors are obviously stronger than regular doors when it comes to BLASTS.
/obj/machinery/door/poddoor/ex_act(severity, target)
if(severity == 3)
return
..()
/obj/machinery/door/poddoor/do_animate(animation)
switch(animation)
if("opening")
flick("opening", src)
if("closing")
flick("closing", src)
/obj/machinery/door/poddoor/update_icon()
if(density)
icon_state = "closed"
else
icon_state = "open"
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
return
/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
if(stat & NOPOWER)
open(1)
=======
if(density) if(density)
return 0 return 0
else else
@@ -108,4 +66,3 @@
/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user) /obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
if(stat & NOPOWER) if(stat & NOPOWER)
open(1) open(1)
>>>>>>> 97881b6... Merge pull request #33858 from nero1024/blastdoor-sound