From b8dc623ebc2a8d741042f2c8305ebd6de0f33b77 Mon Sep 17 00:00:00 2001
From: deathride58 <deathride58@users.noreply.github.com>
Date: Wed, 27 Dec 2017 21:57:51 -0500
Subject: [PATCH] Update poddoor.dm

---
 code/game/machinery/doors/poddoor.dm | 91 ++++++++--------------------
 1 file changed, 24 insertions(+), 67 deletions(-)

diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm
index 34564032e3..67280cc762 100644
--- a/code/game/machinery/doors/poddoor.dm
+++ b/code/game/machinery/doors/poddoor.dm
@@ -1,22 +1,13 @@
-/obj/machinery/door/poddoor
-	name = "blast door"
-	desc = "A heavy duty blast door that opens mechanically."
-	icon = 'icons/obj/doors/blastdoor.dmi'
-	icon_state = "closed"
-	var/id = 1
+/obj/machinery/door/poddoor
+	name = "blast door"
+	desc = "A heavy duty blast door that opens mechanically."
+	icon = 'icons/obj/doors/blastdoor.dmi'
+	icon_state = "closed"
+	var/id = 1
 	sub_door = TRUE
-	explosion_block = 3
+	explosion_block = 3
 	heat_proof = TRUE
 	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
 	armor = list(melee = 50, bullet = 100, laser = 100, energy = 100, bomb = 50, bio = 100, rad = 100, fire = 100, acid = 70)
 	resistance_flags = FIRE_PROOF
@@ -24,58 +15,25 @@
 	
 /obj/machinery/door/poddoor/preopen
 	icon_state = "open"
->>>>>>> 97881b6... Merge pull request #33858 from nero1024/blastdoor-sound
 	density = FALSE
-	opacity = 0
-
-/obj/machinery/door/poddoor/ert
-	desc = "A heavy duty blast door that only opens for dire emergencies."
-
-//special poddoors that open when emergency shuttle docks at centcom
-/obj/machinery/door/poddoor/shuttledock
-	var/checkdir = 4	//door won't open if turf in this dir is `turftype`
-	var/turftype = /turf/open/space
-
-/obj/machinery/door/poddoor/shuttledock/proc/check()
-	var/turf/T = get_step(src, checkdir)
-	if(!istype(T, turftype))
-		INVOKE_ASYNC(src, .proc/open)
-	else
-		INVOKE_ASYNC(src, .proc/close)
-
+	opacity = 0
+
+/obj/machinery/door/poddoor/ert
+	desc = "A heavy duty blast door that only opens for dire emergencies."
+
+//special poddoors that open when emergency shuttle docks at centcom
+/obj/machinery/door/poddoor/shuttledock
+	var/checkdir = 4	//door won't open if turf in this dir is `turftype`
+	var/turftype = /turf/open/space
+
+/obj/machinery/door/poddoor/shuttledock/proc/check()
+	var/turf/T = get_step(src, checkdir)
+	if(!istype(T, turftype))
+		INVOKE_ASYNC(src, .proc/open)
+	else
+		INVOKE_ASYNC(src, .proc/close)
+
 /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)
 		return 0
 	else
@@ -108,4 +66,3 @@
 /obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
 	if(stat & NOPOWER)
 		open(1)
->>>>>>> 97881b6... Merge pull request #33858 from nero1024/blastdoor-sound