From ba6759d20691892757ead8b23bac1d73b6cd0f2b Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sun, 11 Nov 2018 22:09:29 -0200
Subject: [PATCH] Fixes mechas and vehicle being unable to trigger land mines
 (#5591)

* Adds landmine and mecha interactions.

* Adds changelog.
---
 code/game/objects/items/weapons/landmines.dm | 27 ++++++++++++--------
 html/changelogs/alberyk-landmine.yml         |  6 +++++
 2 files changed, 22 insertions(+), 11 deletions(-)
 create mode 100644 html/changelogs/alberyk-landmine.yml

diff --git a/code/game/objects/items/weapons/landmines.dm b/code/game/objects/items/weapons/landmines.dm
index 27e13c064e8..21ec9493bc4 100644
--- a/code/game/objects/items/weapons/landmines.dm
+++ b/code/game/objects/items/weapons/landmines.dm
@@ -54,15 +54,20 @@
 	qdel(src)
 
 /obj/item/weapon/landmine/Crossed(AM as mob|obj)
-	if(deployed && isliving(AM))
-		var/mob/living/L = AM
-		if(L.mob_size >= 5)
-			L.visible_message(
-				"<span class='danger'>[L] steps on \the [src].</span>",
-				"<span class='danger'>You step on \the [src]!</span>",
-				"<span class='danger'>You hear a mechanical click!</span>"
-				)
-			trigger(L)
+	if(deployed)
+		if(isliving(AM))
+			var/mob/living/L = AM
+			if(L.mob_size >= 5)
+				L.visible_message(
+					"<span class='danger'>[L] steps on \the [src].</span>",
+					"<span class='danger'>You step on \the [src]!</span>",
+					"<span class='danger'>You hear a mechanical click!</span>"
+					)
+				trigger(L)
+
+		if(istype(AM, /obj/mecha) || istype(AM, /obj/vehicle))
+			visible_message("<span class='danger'>\The [AM] triggers \the [src].</span>")
+			trigger()
 	..()
 
 /obj/item/weapon/landmine/attack_hand(mob/user as mob)
@@ -92,7 +97,6 @@
 //landmines that do more than explode
 
 /obj/item/weapon/landmine/frag
-	name = "fragmentation land mine"
 	var/num_fragments = 15
 	var/fragment_damage = 10
 	var/damage_step = 2
@@ -111,7 +115,8 @@
 	spark(src, 3, alldirs)
 	if(L)
 		if(ishuman(L))
-			L.apply_radiation(50)
+			var/mob/living/carbon/human/H = L
+			H.apply_radiation(50)
 	qdel(src)
 
 /obj/item/weapon/landmine/phoron
diff --git a/html/changelogs/alberyk-landmine.yml b/html/changelogs/alberyk-landmine.yml
new file mode 100644
index 00000000000..b269debf800
--- /dev/null
+++ b/html/changelogs/alberyk-landmine.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - tweak: "Mechas and vehicles will now trigger landmines."