diff --git a/code/__DEFINES/say.dm b/code/__DEFINES/say.dm
index 825e88f3402..2e35365b3b6 100644
--- a/code/__DEFINES/say.dm
+++ b/code/__DEFINES/say.dm
@@ -23,7 +23,7 @@
#define SPAN_SANS "sans"
#define SPAN_PAPYRUS "papyrus"
#define SPAN_REALLYBIG "reallybig"
-#define SPAN_COMMAND "commmand_headset"
+#define SPAN_COMMAND "command_headset"
//bitflag #defines for return value of the radio() proc.
#define ITALICS 1
diff --git a/code/game/objects/items/devices/megaphone.dm b/code/game/objects/items/devices/megaphone.dm
index 86b9ecd2368..617f4022985 100644
--- a/code/game/objects/items/devices/megaphone.dm
+++ b/code/game/objects/items/devices/megaphone.dm
@@ -10,6 +10,7 @@
var/spamcheck = 0
var/emagged = 0
var/insults = 0
+ var/voicespan = "command_headset" // sic
var/list/insultmsg = list("FUCK EVERYONE!", "DEATH TO LIZARDS!", "ALL SECURITY TO SHOOT ME ON SIGHT!", "I HAVE A BOMB!", "CAPTAIN IS A COMDOM!", "FOR THE SYNDICATE!", "VIVA!", "HONK!")
/obj/item/device/megaphone/attack_self(mob/living/carbon/human/user)
@@ -38,12 +39,12 @@
if ((src.loc == user && user.stat == 0))
if(emagged)
if(insults)
- user.audible_message("[user.GetVoice()] broadcasts, \"[pick(insultmsg)]\"")
+ user.audible_message("[user.GetVoice()] broadcasts, \"[pick(insultmsg)]\"")
insults--
else
user << "*BZZZZzzzzzt*"
else
- user.audible_message("[user.GetVoice()] broadcasts, \"[message]\"")
+ user.audible_message("[user.GetVoice()] broadcasts, \"[message]\"")
playsound(loc, 'sound/items/megaphone.ogg', 100, 0, 1)
spamcheck = world.time + 50
@@ -65,3 +66,9 @@
/obj/item/device/megaphone/cargo
name = "supply megaphone"
icon_state = "megaphone-cargo"
+
+/obj/item/device/megaphone/clown
+ name = "clown's megaphone"
+ desc = "Something that should not exist."
+ icon_state = "megaphone-clown"
+ voicespan = "clown"
\ No newline at end of file
diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm
index bd8ff6119cf..33d0b81700d 100644
--- a/code/modules/jobs/job_types/civilian.dm
+++ b/code/modules/jobs/job_types/civilian.dm
@@ -30,7 +30,7 @@ Clown
/obj/item/weapon/stamp/clown = 1,
/obj/item/weapon/reagent_containers/spray/waterflower = 1,
/obj/item/weapon/reagent_containers/food/snacks/grown/banana = 1,
- /obj/item/weapon/skub = 1
+ /obj/item/device/megaphone/clown = 1
)
backpack = /obj/item/weapon/storage/backpack/clown
diff --git a/config/admins.txt b/config/admins.txt
index 7157f881b5b..c55dc0e1476 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -108,4 +108,5 @@ Ressler = Game Master
Folix = Game Master
Bawhoppennn = Game Master
Anturke = Host
-Lumipharon = Game Master
\ No newline at end of file
+Lumipharon = Game Master
+bgobandit = Game Master
\ No newline at end of file
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index fe476927704..68c02481cfb 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm
index 6b110599e07..ddb480fddcf 100644
--- a/interface/stylesheet.dm
+++ b/interface/stylesheet.dm
@@ -93,11 +93,12 @@ h1.alert, h2.alert {color: #000000;}
.papyrus {font-family: "Papyrus", cursive, sans-serif;}
.robot {font-family: "Courier New", cursive, sans-serif;}
-.commmand_headset {font-weight: bold; font-size: 3;}
+.command_headset {font-weight: bold; font-size: 3; }
.big {font-size: 3;}
.reallybig {font-size: 4;}
.greentext {color: #00FF00; font-size: 3;}
.redtext {color: #FF0000; font-size: 3;}
+.clown {color: #FF69Bf; font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;}
BIG IMG.icon {width: 32px; height: 32px;}