cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-30 08:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt.

Browse Source
This commit is contained in:
bgobandit
2016-04-04 02:13:33 -04:00
parent 135ceb2b64
commit dc9c725e41
6 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/say.dm
+1 -1
View File
@@ -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
code/game/objects/items/devices/megaphone.dm
+9 -2
View File
@@ -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("<B>[user.GetVoice()]</B> broadcasts, <FONT size=3>\"[pick(insultmsg)]\"</FONT>")
user.audible_message("<B>[user.GetVoice()]</B> broadcasts, <span class='[voicespan]'>\"[pick(insultmsg)]\"</span>")
insults--
else
user << "<span class='warning'>*BZZZZzzzzzt*</span>"
else
user.audible_message("<B>[user.GetVoice()]</B> broadcasts, <FONT size=3>\"[message]\"</FONT>")
user.audible_message("<B>[user.GetVoice()]</B> broadcasts, <span class='[voicespan]'>\"[message]\"</span>")
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"
code/modules/jobs/job_types/civilian.dm
+1 -1
View File
@@ -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
config/admins.txt
+2 -1
View File
@@ -108,4 +108,5 @@ Ressler = Game Master
Folix = Game Master
Bawhoppennn = Game Master
Anturke = Host
Lumipharon = Game Master
Lumipharon = Game Master
bgobandit = Game Master
icons/obj/device.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 34 KiB

interface/stylesheet.dm
+2 -1
View File
@@ -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;}