From 51e4e35760dd3526ffaf7119c52336a2ed836b96 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Sun, 26 Apr 2020 22:31:03 -0300
Subject: [PATCH] Removes hulk green overlay and makes them properly immune to
 pain (#8742)

---
 code/game/dna/genes/powers.dm            | 7 -------
 code/modules/mob/living/carbon/carbon.dm | 4 +++-
 html/changelogs/alberyk-hulkstuff.yml    | 7 +++++++
 3 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 html/changelogs/alberyk-hulkstuff.yml

diff --git a/code/game/dna/genes/powers.dm b/code/game/dna/genes/powers.dm
index 44f10cb9c3d..aa503db2bc4 100644
--- a/code/game/dna/genes/powers.dm
+++ b/code/game/dna/genes/powers.dm
@@ -159,13 +159,6 @@
 			return 0
 		return ..(M,flags)
 
-	OnDrawUnderlays(var/mob/M,var/g,var/fat)
-		if(fat)
-			return "hulk_[fat]_s"
-		else
-			return "hulk_[g]_s"
-		return 0
-
 	OnMobLife(var/mob/living/carbon/human/M)
 		if(!istype(M)) return
 		if(M.health <= 25)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 46da51e86f5..c8940312c88 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -195,7 +195,7 @@
 				span("notice", "[src] examines [src.gender==MALE?"himself":"herself"]."), \
 				span("notice", "You check yourself for injuries.") \
 				)
-				
+
 			for(var/obj/item/organ/external/org in H.organs)
 				var/list/status = list()
 				var/brutedamage = org.brute_dam
@@ -438,6 +438,8 @@
 		return FALSE
 	if (is_berserk())
 		return FALSE
+	if (HULK in mutations)
+		return FALSE
 	if (analgesic > 100)
 		return FALSE
 
diff --git a/html/changelogs/alberyk-hulkstuff.yml b/html/changelogs/alberyk-hulkstuff.yml
new file mode 100644
index 00000000000..1659276fdde
--- /dev/null
+++ b/html/changelogs/alberyk-hulkstuff.yml
@@ -0,0 +1,7 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscadd: "Hulks should be immune to pain now."
+  - rscdel: "Removed the hulk green overlay."