mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 19:52:40 +00:00
BY CONSENSUS OF THE ADMIN TEAM:
Music buttons and song files removed. Consequently, bananaphone kitchen recipe removed. This saves over 10MB from the resource download, making it go faster for everyone and reducing lag. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1881 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -158,11 +158,11 @@
|
|||||||
verbs += /client/proc/make_sound // -- TLE
|
verbs += /client/proc/make_sound // -- TLE
|
||||||
verbs += /client/proc/object_talk // -- TLE
|
verbs += /client/proc/object_talk // -- TLE
|
||||||
verbs += /client/proc/play_sound
|
verbs += /client/proc/play_sound
|
||||||
verbs += /client/proc/cuban_pete // -- Urist
|
// verbs += /client/proc/cuban_pete // -- Urist
|
||||||
verbs += /client/proc/bananaphone // -- Darem
|
// verbs += /client/proc/bananaphone // -- Darem
|
||||||
verbs += /client/proc/honk_theme // -- Urist the Honky
|
// verbs += /client/proc/honk_theme // -- Urist the Honky
|
||||||
verbs += /client/proc/only_one // muskets
|
verbs += /client/proc/only_one // muskets
|
||||||
verbs += /client/proc/space_asshole // --Agouri :3
|
// verbs += /client/proc/space_asshole // --Agouri :3
|
||||||
verbs += /client/proc/strike_team //N
|
verbs += /client/proc/strike_team //N
|
||||||
verbs += /client/proc/send_space_ninja //N
|
verbs += /client/proc/send_space_ninja //N
|
||||||
verbs += /client/proc/spawn_xeno //N
|
verbs += /client/proc/spawn_xeno //N
|
||||||
@@ -298,11 +298,11 @@
|
|||||||
verbs += /client/proc/make_sound // -- TLE
|
verbs += /client/proc/make_sound // -- TLE
|
||||||
//verbs += /client/proc/object_talk // -- TLE
|
//verbs += /client/proc/object_talk // -- TLE
|
||||||
verbs += /client/proc/play_sound
|
verbs += /client/proc/play_sound
|
||||||
verbs += /client/proc/cuban_pete // -- Urist
|
// verbs += /client/proc/cuban_pete // -- Urist
|
||||||
verbs += /client/proc/honk_theme // -- Urist the Honky
|
// verbs += /client/proc/honk_theme // -- Urist the Honky
|
||||||
verbs += /client/proc/bananaphone
|
// verbs += /client/proc/bananaphone
|
||||||
verbs += /client/proc/only_one // muskets
|
verbs += /client/proc/only_one // muskets
|
||||||
verbs += /client/proc/space_asshole // --Agouri :3
|
// verbs += /client/proc/space_asshole // --Agouri :3
|
||||||
//verbs += /client/proc/strike_team //N
|
//verbs += /client/proc/strike_team //N
|
||||||
verbs += /client/proc/send_space_ninja //N
|
verbs += /client/proc/send_space_ninja //N
|
||||||
verbs += /client/proc/spawn_xeno //N
|
verbs += /client/proc/spawn_xeno //N
|
||||||
@@ -1199,10 +1199,10 @@
|
|||||||
verbs -= /client/proc/make_sound // -- TLE
|
verbs -= /client/proc/make_sound // -- TLE
|
||||||
verbs -= /client/proc/object_talk // -- TLE
|
verbs -= /client/proc/object_talk // -- TLE
|
||||||
verbs -= /client/proc/play_sound
|
verbs -= /client/proc/play_sound
|
||||||
verbs -= /client/proc/cuban_pete // -- Urist
|
// verbs -= /client/proc/cuban_pete // -- Urist
|
||||||
verbs -= /client/proc/honk_theme // -- Urist the Honky
|
// verbs -= /client/proc/honk_theme // -- Urist the Honky
|
||||||
verbs -= /client/proc/bananaphone // -- Darem
|
// verbs -= /client/proc/bananaphone // -- Darem
|
||||||
verbs -= /client/proc/space_asshole // --Agouri :3
|
// verbs -= /client/proc/space_asshole // --Agouri :3
|
||||||
verbs -= /client/proc/strike_team //N
|
verbs -= /client/proc/strike_team //N
|
||||||
verbs -= /client/proc/send_space_ninja //N
|
verbs -= /client/proc/send_space_ninja //N
|
||||||
verbs -= /client/proc/spawn_xeno //N
|
verbs -= /client/proc/spawn_xeno //N
|
||||||
|
|||||||
@@ -38,7 +38,7 @@
|
|||||||
//else
|
//else
|
||||||
// alert("Debugging is disabled")
|
// alert("Debugging is disabled")
|
||||||
// return
|
// return
|
||||||
|
/*
|
||||||
/client/proc/cuban_pete()
|
/client/proc/cuban_pete()
|
||||||
set category = "Fun"
|
set category = "Fun"
|
||||||
set name = "Cuban Pete Time"
|
set name = "Cuban Pete Time"
|
||||||
@@ -92,7 +92,7 @@ client/proc/honk_theme()
|
|||||||
if(M.client)
|
if(M.client)
|
||||||
if(M.client.midis)
|
if(M.client.midis)
|
||||||
M << 'honk_theme.ogg'
|
M << 'honk_theme.ogg'
|
||||||
|
*/
|
||||||
|
|
||||||
/*if(Debug2)
|
/*if(Debug2)
|
||||||
if(!src.authenticated || !src.holder)
|
if(!src.authenticated || !src.holder)
|
||||||
|
|||||||
@@ -909,7 +909,7 @@
|
|||||||
baconbeacon.loc = usr
|
baconbeacon.loc = usr
|
||||||
baconbeacon.digest_delay()
|
baconbeacon.digest_delay()
|
||||||
|
|
||||||
|
/*
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/bananaphone
|
/obj/item/weapon/reagent_containers/food/snacks/bananaphone
|
||||||
name = "Banana Phone"
|
name = "Banana Phone"
|
||||||
desc = "Ring ring ring ring ring..."
|
desc = "Ring ring ring ring ring..."
|
||||||
@@ -929,7 +929,7 @@
|
|||||||
usr << sound('bananaphone.ogg',1)
|
usr << sound('bananaphone.ogg',1)
|
||||||
hear_talk(mob/M as mob, msg)
|
hear_talk(mob/M as mob, msg)
|
||||||
if(bananaphone)
|
if(bananaphone)
|
||||||
bananaphone.hear_talk(M, msg)
|
bananaphone.hear_talk(M, msg)*/
|
||||||
|
|
||||||
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
|
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
|
||||||
name = "monkey cube"
|
name = "monkey cube"
|
||||||
|
|||||||
@@ -15,6 +15,7 @@
|
|||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
|
result = /obj/item/weapon/reagent_containers/food/snacks/telebacon
|
||||||
|
|
||||||
|
/*
|
||||||
/datum/recipe/bananaphone
|
/datum/recipe/bananaphone
|
||||||
reagents = list("psilocybin" = 5) //Trippin' balls, man.
|
reagents = list("psilocybin" = 5) //Trippin' balls, man.
|
||||||
items = list(
|
items = list(
|
||||||
@@ -22,6 +23,7 @@
|
|||||||
/obj/item/device/radio
|
/obj/item/device/radio
|
||||||
)
|
)
|
||||||
result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
|
result = /obj/item/weapon/reagent_containers/food/snacks/bananaphone
|
||||||
|
*/
|
||||||
|
|
||||||
/datum/recipe/jellydonut
|
/datum/recipe/jellydonut
|
||||||
reagents = list("berryjuice" = 5)
|
reagents = list("berryjuice" = 5)
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user