diff --git a/code/__DEFINES/tools.dm b/code/__DEFINES/tools.dm
index e75a1b38a..e631271d7 100644
--- a/code/__DEFINES/tools.dm
+++ b/code/__DEFINES/tools.dm
@@ -1,6 +1,6 @@
// Tool types
#define TOOL_CROWBAR "Crowbar"
-#define TOOL_MULTITOOL "Multitool"
+#define TOOL_MULTITOOL "Voltage Scanner"
#define TOOL_SCREWDRIVER "Screwdriver"
#define TOOL_WIRECUTTER "Wirecutter"
#define TOOL_WRENCH "Wrench"
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 9b6376ee7..0dfa601d0 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -20,7 +20,6 @@
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
force = 5
w_class = WEIGHT_CLASS_SMALL
- tool_behaviour = TOOL_MULTITOOL
throwforce = 0
throw_range = 7
throw_speed = 3
diff --git a/code/modules/mob/living/simple_animal/hostile/dungeonmobs.dm b/code/modules/mob/living/simple_animal/hostile/dungeonmobs.dm
index d149f803e..ec9b2da36 100644
--- a/code/modules/mob/living/simple_animal/hostile/dungeonmobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/dungeonmobs.dm
@@ -43,16 +43,16 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/Initialize()
. = ..()
- icon_state = "retro_ghoul-[rand(1,10)]"
- icon_living = "retro_ghoul-[rand(1,10)]"
+ icon_state += "-[rand(1,10)]"
+ icon_living = icon_state
+ icon_dead = icon_living + "_d"
+
+
/mob/living/simple_animal/hostile/dungemobs/ghoul/reaver
name = "feral ghoul reaver"
desc = "A ghoul that has lost it's mind and become aggressive. This one is strapped with metal armor, and appears far stronger."
icon = 'icons/mob/wastemobs.dmi'
- icon_state = "ghoulreaver"
- icon_living = "ghoulreaver"
- icon_dead = "ghoulreaver_dead"
speed = 2
maxHealth = 100
health = 100
@@ -62,6 +62,9 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/reaver/Initialize()
. = ..()
+ icon_state = "ghoulreaver"
+ icon_living = "ghoulreaver"
+ icon_dead = "ghoulreaver_d"
/mob/living/simple_animal/hostile/dungemobs/ghoul/reaver/Aggro()
..()
@@ -70,7 +73,7 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/coldferal
name = "cold ghoul feral"
desc = "A ghoul that has lost it's mind and become aggressive. This one is strapped with metal armor, and appears far stronger."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "cold_feral"
icon_living = "cold_feral"
icon_dead = "cold_feral_dead"
@@ -84,7 +87,7 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/frozenreaver
name = "frozen ghoul reaver"
desc = "A ghoul that has lost it's mind and become aggressive. This one is strapped with metal armor, and appears far stronger."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "frozen_reaver"
icon_living = "frozen_reaver"
icon_dead = "frozen_reaver_dead"
@@ -98,8 +101,8 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/glowing
name = "glowing feral ghoul"
desc = "A feral ghoul that has absorbed massive amounts of radiation, causing them to glow in the dark and radiate constantly."
- icon_state = "retro_glowghoul-6"
- icon_living = "retro_glowghoul-6"
+ icon_state = "retro_glowghoul"
+ icon_living = "retro_glowghoul"
icon_dead = "retro_glowghoul_d"
maxHealth = 80
health = 80
@@ -127,8 +130,6 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/glowing/Initialize()
. = ..()
set_light(2)
- icon_state = "retro_glowghoul-[rand(1,10)]"
- icon_living = "retro_glowghoul-[rand(1,10)]"
/mob/living/simple_animal/hostile/dungemobs/ghoul/glowing/Aggro()
..()
@@ -196,7 +197,7 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/soldier
name = "Ghoul Soldier"
desc = "Have you ever seen a living ghoul before?
Ghouls are necrotic post-humans - decrepit, rotting, zombie-like mutants."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "soldier_ghoul"
icon_living = "soldier_ghoul"
icon_dead = "soldier_ghoul_d"
@@ -207,7 +208,7 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/soldier/armored
name = "Armored Ghoul Soldier"
desc = "Have you ever seen a living ghoul before?
Ghouls are necrotic post-humans - decrepit, rotting, zombie-like mutants."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "soldier_ghoul_a"
icon_living = "soldier_ghoul_a"
icon_dead = "soldier_ghoul_a_d"
@@ -218,7 +219,7 @@
/mob/living/simple_animal/hostile/dungemobs/ghoul/scorched
name = "Scorched Ghoul Soldier"
desc = "Have you ever seen a living ghoul before?
Ghouls are necrotic post-humans - decrepit, rotting, zombie-like mutants."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "scorched_m"
icon_living = "scorched_m"
icon_dead = "scorched_m_d"
@@ -240,11 +241,16 @@
attacktext = "punches"
attack_sound = "punch"
+/mob/living/simple_animal/hostile/dungemobs/ghoul/scorched/Initialize()
+ . = ..()
+ icon_state = "scorched_m-[rand(1,5)]"
+ icon_living = icon_state
+ icon_dead = icon_state + "_d"
/mob/living/simple_animal/hostile/dungemobs/ghoul/scorched/ranged
name = "Ranged Ghoul Solder"
desc = "Have you ever seen a living ghoul before?
Ghouls are necrotic post-humans - decrepit, rotting, zombie-like mutants."
- icon = 'icons/mob/wastemobs.dmi'
+ icon = 'icons/mob/ghouls.dmi'
icon_state = "scorched_r"
icon_living = "scorched_r"
icon_dead = "scorched_r_d"
@@ -269,6 +275,11 @@
attacktext = "shoots"
attack_sound = "punch"
+/mob/living/simple_animal/hostile/dungemobs/ghoul/scorched/ranged/Initialize()
+ . = ..()
+ icon_state = "scorched_r-[rand(1,5)]"
+ icon_living = "scorched_r-[rand(1,5)]"
+ icon_dead = icon_state + "_d"
//////////////////////////Super Mutants////////////////////////
diff --git a/code/modules/mob/living/simple_animal/hostile/ghoul.dm b/code/modules/mob/living/simple_animal/hostile/ghoul.dm
index 19355af2c..c49038ebb 100644
--- a/code/modules/mob/living/simple_animal/hostile/ghoul.dm
+++ b/code/modules/mob/living/simple_animal/hostile/ghoul.dm
@@ -42,7 +42,7 @@
var/multiple_sprites = TRUE
-/mob/living/simple_animal/hostile/ghoul/New()
+/mob/living/simple_animal/hostile/ghoul/Initialize()
. = ..()
if(multiple_sprites)
icon_state = initial(icon_state) + "-[rand(1,10)]"
@@ -195,7 +195,7 @@
maxHealth = 90
health = 90
-/mob/living/simple_animal/hostile/ghoul/soldier/New()
+/mob/living/simple_animal/hostile/ghoul/soldier/Initialize()
. = ..()
if(multiple_sprites)
icon_state = initial(icon_state) + "-[rand(1,10)]"
@@ -238,7 +238,7 @@
attacktext = "punches"
attack_sound = "punch"
-/mob/living/simple_animal/hostile/ghoul/scorched/New()
+/mob/living/simple_animal/hostile/ghoul/scorched/Initialize()
. = ..()
if(multiple_sprites)
icon_state = initial(icon_state) + "-[rand(1,5)]"
@@ -271,4 +271,4 @@
melee_damage_upper = 20
aggro_vision_range = 10
attacktext = "shoots"
- attack_sound = "punch"
+ attack_sound = "punch"
\ No newline at end of file
diff --git a/icons/mob/ghouls.dmi b/icons/mob/ghouls.dmi
index ad496102d..d8ac9729a 100644
Binary files a/icons/mob/ghouls.dmi and b/icons/mob/ghouls.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi
index 48b03e6f1..0973db688 100644
Binary files a/icons/mob/inhands/weapons/melee_righthand.dmi and b/icons/mob/inhands/weapons/melee_righthand.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index ecc590cbf..d11adde7d 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/wastemobs.dmi b/icons/mob/wastemobs.dmi
index c4b1bb0fe..18b987ce1 100644
Binary files a/icons/mob/wastemobs.dmi and b/icons/mob/wastemobs.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 7d8b125c2..45406e7ad 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ