From b39d927ac15eeb391321e2fba8f5c4de542bcc65 Mon Sep 17 00:00:00 2001
From: Alberyk <vitor.e.rubbo@gmail.com>
Date: Thu, 1 Sep 2016 15:41:19 -0300
Subject: [PATCH] Cult construct and firelock improvements (#807)

---
 code/game/machinery/doors/firedoor.dm              | 14 ++++++++++++++
 .../living/simple_animal/constructs/constructs.dm  |  2 +-
 .../living/simple_animal/hostile/moghesfauna.dm    |  6 ++++--
 html/changelogs/alberyk-PR-807.yml                 |  7 +++++++
 4 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 html/changelogs/alberyk-PR-807.yml

diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm
index d93ba6e3bad..6b6aa8a869f 100644
--- a/code/game/machinery/doors/firedoor.dm
+++ b/code/game/machinery/doors/firedoor.dm
@@ -77,6 +77,20 @@
 		A.all_doors.Remove(src)
 	. = ..()
 
+/obj/machinery/door/firedoor/attack_generic(var/mob/user, var/damage)
+	if(stat & (BROKEN|NOPOWER))
+		if(damage >= 10)
+			if(src.density)
+				visible_message("<span class='danger'>\The [user] forces \the [src] open!</span>")
+				open(1)
+			else
+				visible_message("<span class='danger'>\The [user] forces \the [src] closed!</span>")
+				close(1)
+		else
+			visible_message("<span class='notice'>\The [user] strains fruitlessly to force \the [src] [density ? "open" : "closed"].</span>")
+		return
+	..()
+
 /obj/machinery/door/firedoor/get_material()
 	return get_material_by_name(DEFAULT_WALL_MATERIAL)
 
diff --git a/code/modules/mob/living/simple_animal/constructs/constructs.dm b/code/modules/mob/living/simple_animal/constructs/constructs.dm
index 50eea50f0d3..236261c31d2 100644
--- a/code/modules/mob/living/simple_animal/constructs/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs/constructs.dm
@@ -12,7 +12,7 @@
 	a_intent = I_HURT
 	stop_automated_movement = 1
 	status_flags = CANPUSH
-	universal_speak = 0
+	universal_speak = 1
 	universal_understand = 1
 	attack_sound = 'sound/weapons/spiderlunge.ogg'
 	min_oxy = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/moghesfauna.dm b/code/modules/mob/living/simple_animal/hostile/moghesfauna.dm
index 0ca975d3030..65f06326f11 100644
--- a/code/modules/mob/living/simple_animal/hostile/moghesfauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/moghesfauna.dm
@@ -20,6 +20,8 @@
 	harm_intent_damage = 0
 	melee_damage_lower = 30
 	melee_damage_upper = 30
+	mob_size = 30
+	environment_smash = 2
 	attacktext = "chomped"
 	attack_sound = 'sound/misc/monstergrowl.ogg'
 
@@ -29,6 +31,6 @@
 	. =..()
 	var/mob/living/L = .
 	if(istype(L))
-		if(prob(15))
+		if(prob(25))
 			L.Weaken(3)
-			L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
\ No newline at end of file
+			L.visible_message("<span class='danger'>\The [src] knocks down \the [L]!</span>")
diff --git a/html/changelogs/alberyk-PR-807.yml b/html/changelogs/alberyk-PR-807.yml
new file mode 100644
index 00000000000..bc1acc82e59
--- /dev/null
+++ b/html/changelogs/alberyk-PR-807.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - tweak: "Cult constructs can now properly speak basic once more."
+  - rscadd: "Simple animals, and cult constructs, can force unpowered or broken firedoors now."