Half-finished mime job (yes, I like releasing raw things).

Cuban Pete Time button for admins.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@293 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
uporotiy
2010-10-16 20:16:52 +00:00
parent a310b6ddd4
commit d981500978
14 changed files with 5113 additions and 4965 deletions

View File

@@ -104,6 +104,8 @@
var/r_ch_cou = 0 var/r_ch_cou = 0
var/r_Tourette = 0 var/r_Tourette = 0
var/miming = null //checks if the guy is a mime
var/obj/hud/hud_used = null var/obj/hud/hud_used = null
var/list/organs = list( ) var/list/organs = list( )

View File

@@ -200,6 +200,12 @@
icon_state = "plaguedoctor" icon_state = "plaguedoctor"
flags = FPRINT | TABLEPASS | HEADSPACE flags = FPRINT | TABLEPASS | HEADSPACE
/obj/item/clothing/head/beret
name = "beret"
desc = "A mime's beret"
icon_state = "beret"
flags = FPRINT | TABLEPASS | HEADSPACE
// CHUMP HELMETS: COOKING THEM DESTROYS THE CHUMP HELMET SPAWN. // CHUMP HELMETS: COOKING THEM DESTROYS THE CHUMP HELMET SPAWN.
@@ -366,6 +372,15 @@
var/smoketime = 300 var/smoketime = 300
w_class = 1 w_class = 1
/obj/item/clothing/mask/mime
name = "mime mask"
desc = "It looks a little creepy"
icon_state = "mime"
throw_speed = 0.5
var/lastHolder = null
var/smoketime = 300
w_class = 1
// OMG SHOES // OMG SHOES
/obj/item/clothing/shoes /obj/item/clothing/shoes
@@ -881,6 +896,13 @@
item_state = "red_suit" item_state = "red_suit"
color = "red_suit" color = "red_suit"
/obj/item/clothing/under/mime
name = "Mime Outfit"
desc = "It's not very colourful."
icon_state = "mime"
item_state = "mime"
color = "mime"
// Athletic shorts.. heh // Athletic shorts.. heh
/obj/item/clothing/under/shorts /obj/item/clothing/under/shorts

View File

@@ -135,6 +135,8 @@
return list(access_janitor, access_maint_tunnels) return list(access_janitor, access_maint_tunnels)
if("Clown") if("Clown")
return list(access_maint_tunnels) return list(access_maint_tunnels)
if("Mime")
return list(access_maint_tunnels)
if("Chef") if("Chef")
return list(access_kitchen) return list(access_kitchen)
if("Roboticist") if("Roboticist")
@@ -241,6 +243,6 @@
/proc/get_all_jobs() /proc/get_all_jobs()
return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer", return list("Assistant", "Station Engineer", "Detective", "Medical Doctor", "Captain", "Security Officer",
"Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician", "Geneticist", "Scientist", "Head of Security", "Head of Personnel", "Atmospheric Technician",
"Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Chef", "Roboticist", "Quartermaster", "Chaplain", "Barman", "Chemist", "Janitor", "Clown", "Mime", "Chef", "Roboticist", "Quartermaster",
"Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer") "Chief Engineer", "Research Director", "Botanist", "Librarian", "Lawyer")

View File

@@ -174,6 +174,13 @@
return 1 return 1
/mob/living/carbon/human/proc/Equip_Rank(rank, joined_late) /mob/living/carbon/human/proc/Equip_Rank(rank, joined_late)
/*
if(rank=="Clown")
if(alert("Do you want to be a clown or a mime?",,"Clown","Mime")=="Mime")
rank="Mime" //Why no work -- Urist
*/
/*if(joined_late && ticker.mode.name == "ctf") /*if(joined_late && ticker.mode.name == "ctf")
var/red_team var/red_team
var/green_team var/green_team
@@ -301,6 +308,18 @@
src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack) src.equip_if_possible(new /obj/item/weapon/bikehorn(src), slot_in_backpack)
src.mutations |= 16 src.mutations |= 16
if ("Mime")
src.equip_if_possible(new /obj/item/weapon/storage/backpack(src), slot_back)
src.equip_if_possible(new /obj/item/device/pda/mime(src), slot_belt)
src.equip_if_possible(new /obj/item/clothing/under/mime(src), slot_w_uniform)
src.equip_if_possible(new /obj/item/clothing/shoes/black(src), slot_shoes)
src.equip_if_possible(new /obj/item/clothing/gloves/latex(src), slot_gloves)
src.equip_if_possible(new /obj/item/clothing/mask/mime(src), slot_wear_mask)
src.equip_if_possible(new /obj/item/clothing/head/beret(src), slot_head)
src.verbs += /client/proc/mimespeak
src.verbs += /client/proc/mimewall
src.miming = 1
if ("Station Engineer") if ("Station Engineer")
src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE src.equip_if_possible(new /obj/item/device/radio/headset/headset_eng (src), slot_ears) // -- TLE
src.equip_if_possible(new /obj/item/device/pda/engineering(src), slot_belt) src.equip_if_possible(new /obj/item/device/pda/engineering(src), slot_belt)
@@ -550,4 +569,39 @@
src.equip_if_possible(new /obj/item/device/pda(src), slot_belt) src.equip_if_possible(new /obj/item/device/pda(src), slot_belt)
if (istype(src.belt, /obj/item/device/pda)) if (istype(src.belt, /obj/item/device/pda))
src.belt:owner = src.real_name src.belt:owner = src.real_name
src.belt.name = "PDA-[src.real_name]" src.belt.name = "PDA-[src.real_name]"
/client/proc/mimewall()
set category = "Mime"
set name = "Invisible wall"
set desc = "Create an invisible wall on your location."
if(usr.stat)
usr << "Not when you're incapicated."
return
if(!usr.miming)
usr << "You still haven't atoned for your speaking transgression. Wait."
return
usr.verbs -= /client/proc/mimewall
spawn(100)
usr.verbs += /client/proc/mimewall
for (var/mob/V in viewers(usr))
if(V!=usr)
V.show_message("[usr] looks as if a wall is in front of him.", 3, "", 2)
usr << "You form a wall in front of yourself."
var/obj/forcefield/F = new /obj/forcefield(locate(usr.x,usr.y,usr.z))
F.icon_state = "empty"
spawn (300)
del (F)
return
/client/proc/mimespeak()
set category = "Mime"
set name = "Speech"
set desc = "Toggle your speech."
if(usr.miming)
usr.miming = 0
else
usr << "You'll have to wait if you want to atone for your sins."
spawn(3000)
usr.miming = 1
return

View File

@@ -16,7 +16,7 @@ var/list/occupations = list(
"Barman", "Barman",
"Chef", "Chef",
"Janitor", "Janitor",
"Clown", "Clown", "Mime",
"Chemist", "Chemist",
"Quartermaster","Quartermaster","Quartermaster", "Quartermaster","Quartermaster","Quartermaster",
"Botanist", "Botanist", "Botanist", "Botanist",

View File

@@ -26,6 +26,7 @@
var/last_honk //Also no honk spamming that's bad too var/last_honk //Also no honk spamming that's bad too
var/ttone = "beep" //The ringtone! var/ttone = "beep" //The ringtone!
var/honkamt = 0 //How many honks left when infected with honk.exe var/honkamt = 0 //How many honks left when infected with honk.exe
var/mimeamt = 0 //How many silence left when infected with mime.exe
var/note = "Congratulations, your station has chosen the Thinktronic 5100 Personal Data Assistant!" //Current note in the notepad function. var/note = "Congratulations, your station has chosen the Thinktronic 5100 Personal Data Assistant!" //Current note in the notepad function.
var/datum/data/record/active1 = null //General var/datum/data/record/active1 = null //General
var/datum/data/record/active2 = null //Medical var/datum/data/record/active2 = null //Medical
@@ -61,6 +62,12 @@
desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings." desc = "A portable microcomputer by Thinktronic Systems, LTD. The surface is coated with polytetrafluoroethylene and banana drippings."
ttone = "honk" ttone = "honk"
/obj/item/device/pda/mime
default_cartridge = /obj/item/weapon/cartridge/mime
icon_state = "pda-mime"
silent = 1
ttone = "silence"
/obj/item/device/pda/heads /obj/item/device/pda/heads
default_cartridge = /obj/item/weapon/cartridge/head default_cartridge = /obj/item/weapon/cartridge/head
icon_state = "pda-h" icon_state = "pda-h"
@@ -97,6 +104,7 @@
var/access_medical = 0 var/access_medical = 0
var/access_manifest = 0 var/access_manifest = 0
var/access_clown = 0 var/access_clown = 0
var/access_mime = 0
var/access_janitor = 0 var/access_janitor = 0
var/access_reagent_scanner = 0 var/access_reagent_scanner = 0
var/access_remote_door = 0 //Control some blast doors remotely!! var/access_remote_door = 0 //Control some blast doors remotely!!
@@ -222,6 +230,12 @@
access_clown = 1 access_clown = 1
var/honk_charges = 5 var/honk_charges = 5
/obj/item/weapon/cartridge/mime
name = "Gestur-O 1000"
icon_state = "cart-mi"
access_mime = 1
var/mime_charges = 5
//Radio cart - Essentially a "one-way" signaler, does nothing with received signals. //Radio cart - Essentially a "one-way" signaler, does nothing with received signals.
/obj/item/weapon/cartridge/signal /obj/item/weapon/cartridge/signal
name = "generic signaler cartridge" name = "generic signaler cartridge"
@@ -748,6 +762,9 @@
if (istype(src.cartridge, /obj/item/weapon/cartridge/clown)) if (istype(src.cartridge, /obj/item/weapon/cartridge/clown))
dat+= "<b>[src.cartridge:honk_charges] viral files left.</b><HR>" dat+= "<b>[src.cartridge:honk_charges] viral files left.</b><HR>"
if (istype(src.cartridge, /obj/item/weapon/cartridge/mime))
dat+= "<b>[src.cartridge:mime_charges] viral files left.</b><HR>"
dat += "<h4><img src=pda_menu.png> Detected PDAs</h4>" dat += "<h4><img src=pda_menu.png> Detected PDAs</h4>"
dat += "<ul>" dat += "<ul>"
@@ -770,6 +787,8 @@
//Honk.exe is the poor man's detomatix //Honk.exe is the poor man's detomatix
if (istype(src.cartridge, /obj/item/weapon/cartridge/clown) && (src.cartridge:honk_charges > 0) && P.honkamt < 5) if (istype(src.cartridge, /obj/item/weapon/cartridge/clown) && (src.cartridge:honk_charges > 0) && P.honkamt < 5)
dat += " (<a href='byond://?src=\ref[src];sendhonk=\ref[P]'><img src=pda_honk.png> *Send Virus*</a>)" dat += " (<a href='byond://?src=\ref[src];sendhonk=\ref[P]'><img src=pda_honk.png> *Send Virus*</a>)"
if (istype(src.cartridge, /obj/item/weapon/cartridge/mime) && (src.cartridge:mime_charges > 0) && P.mimeamt < 5)
dat += " (<a href='byond://?src=\ref[src];sendmime=\ref[P]'> *Send Virus*</a>)"
dat += "</li>" dat += "</li>"
@@ -1241,6 +1260,16 @@ Code:
P.honkamt = (rand(15,20)) P.honkamt = (rand(15,20))
src.updateUsrDialog() src.updateUsrDialog()
else if (href_list["sendmime"] && istype(src.cartridge, /obj/item/weapon/cartridge/mime))
var/obj/item/device/pda/P = locate(href_list["sendmime"])
if (!P.toff && src.cartridge:mime_charges > 0)
src.cartridge:mime_charges--
usr.show_message("\blue Virus sent!", 1)
P.silent = 1
P.ttone = "silence"
src.updateUsrDialog()
else if (href_list["remotedoor"] && !isnull(src.cartridge) && src.cartridge.access_remote_door) else if (href_list["remotedoor"] && !isnull(src.cartridge) && src.cartridge.access_remote_door)
for (var/obj/machinery/door/poddoor/M in machines) for (var/obj/machinery/door/poddoor/M in machines)
if (M.id != src.cartridge.remote_door_id) if (M.id != src.cartridge.remote_door_id)

View File

@@ -81,6 +81,7 @@
src.verbs += /client/proc/modifytemperature src.verbs += /client/proc/modifytemperature
src.verbs += /client/proc/object_talk // -- TLE src.verbs += /client/proc/object_talk // -- TLE
src.verbs += /client/proc/play_sound src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/sendmob src.verbs += /client/proc/sendmob
src.verbs += /client/proc/stealthadmin src.verbs += /client/proc/stealthadmin
src.verbs += /client/proc/ticklag src.verbs += /client/proc/ticklag
@@ -173,6 +174,7 @@
src.verbs += /client/proc/make_sound // -- Skie src.verbs += /client/proc/make_sound // -- Skie
src.verbs += /client/proc/modifytemperature src.verbs += /client/proc/modifytemperature
src.verbs += /client/proc/play_sound src.verbs += /client/proc/play_sound
src.verbs += /client/proc/cuban_pete // -- Urist
src.verbs += /client/proc/sendmob src.verbs += /client/proc/sendmob
src.verbs += /client/proc/stealthadmin src.verbs += /client/proc/stealthadmin
src.verbs += /client/proc/ticklag src.verbs += /client/proc/ticklag
@@ -687,7 +689,7 @@
src.holder.Voting() src.holder.Voting()
/client/proc/funbutton() /client/proc/funbutton()
set category = "Boom Boom" set category = "Fun"
set name = "Boom Boom Boom Shake The Room" set name = "Boom Boom Boom Shake The Room"
if(!src.authenticated || !src.holder) if(!src.authenticated || !src.holder)
src << "Only administrators may use this command." src << "Only administrators may use this command."

View File

@@ -30,4 +30,38 @@
//else //else
// alert("Debugging is disabled") // alert("Debugging is disabled")
// return // return
/client/proc/cuban_pete()
set category = "Fun"
set name = "Cuban Pete Time"
world << 'cubanpetetime.ogg'
for(var/mob/living/carbon/human/CP in world)
if(CP.real_name=="Cuban Pete" && CP.key!="Rosham")
CP << "Your body can't contain the rhumba beat"
CP.gib(1)
/*if(Debug2)
if(!src.authenticated || !src.holder)
src << "Only administrators may use this command."
return
var/sound/uploaded_sound = sound(S,0,1,0)
uploaded_sound.priority = 255
uploaded_sound.wait = 1
if(src.holder.rank == "Host" || src.holder.rank == "Coder" || src.holder.rank == "Shit Guy")
log_admin("[key_name(src)] played sound [S]")
message_admins("[key_name_admin(src)] played sound [S]", 1)
world << uploaded_sound
else
if(usr.client.canplaysound)
usr.client.canplaysound = 0
log_admin("[key_name(src)] played sound [S]")
message_admins("[key_name_admin(src)] played sound [S]", 1)
world << uploaded_sound
else
usr << "You already used up your jukebox monies this round!"
del(uploaded_sound)*/

View File

@@ -5,6 +5,8 @@
return return
log_say("[src.name]/[src.key] : [message]") log_say("[src.name]/[src.key] : [message]")
if (src.miming)
return
if (src.muted) if (src.muted)
return return

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.2 KiB

After

Width:  |  Height:  |  Size: 9.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 59 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

File diff suppressed because it is too large Load Diff