TG update: Small changes and bugfixes:

◦ Metroids can now be observed by ghosts.
   ◦ Saved User Interface preferences ("Old UI" & "New UI") now correctly get transferred to clones.
   ◦ Captain announcements now require the player to be next to the console. (Issue 220)
   ◦ Radio headsets no longer sometimes fail to deliver the messages (Issue 221)
   ◦ Some other insignificant back-end shenanigans.
   ◦ The pregame lobby now has title music. The gameticker chooses between two .ogg files on game start and plays that for everyone who joins. The music stops when create_character() gets called though.
   ◦ Gave some critters, namely "creature" and "blob" some attack sounds.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2655 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
vageyenaman@gmail.com
2011-12-10 19:34:49 +00:00
committed by Albert Iordache
parent fac10fb031
commit 75c7670e75
10 changed files with 96 additions and 12 deletions

View File

@@ -526,9 +526,33 @@ datum
/////////////////////////////////////METROID CORE REACTIONS ///////////////////////////////
metroidpepper
name = "Metroid Condensedcapaicin"
id = "m_condensedcapaicin"
result = "condensedcapsaicin"
required_reagents = list("sugar" = 1)
result_amount = 1
required_container = /obj/item/metroid_core
required_other = 1
metroidfrost
name = "Metroid Frost Oil"
id = "m_frostoil"
result = "frostoil"
required_reagents = list("water" = 1)
result_amount = 1
required_container = /obj/item/metroid_core
required_other = 1
metroidglycerol
name = "Metroid Glycerol"
id = "m_glycerol"
result = "glycerol"
required_reagents = list("blood" = 1)
result_amount = 1
required_container = /obj/item/metroid_core
required_other = 1
metroid_explosion
name = "Explosion"
name = "Metroid Explosion"
id = "m_explosion"
result = null
required_reagents = list("blood" = 1)
@@ -633,9 +657,10 @@ datum
playsound(TO, 'phasein.ogg', 100, 1)
var/list/flashers = list()
for(var/mob/living/carbon/M in viewers(TO, null))
flick("e_flash", M.flash) // flash dose faggots
flashers += M
for(var/mob/living/carbon/human/M in viewers(TO, null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash) // flash dose faggots
flashers += M
var/y_distance = TO.y - FROM.y
var/x_distance = TO.x - FROM.x
@@ -677,8 +702,9 @@ datum
playsound(get_turf_loc(holder.my_atom), 'phasein.ogg', 100, 1)
for(var/mob/living/carbon/M in viewers(get_turf_loc(holder.my_atom), null))
flick("e_flash", M.flash)
for(var/mob/living/carbon/human/M in viewers(get_turf_loc(holder.my_atom), null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash)
for(var/i = 1, i <= created_volume, i++)
var/chosen = pick(critters)
@@ -702,8 +728,9 @@ datum
playsound(get_turf_loc(holder.my_atom), 'phasein.ogg', 100, 1)
for(var/mob/living/carbon/M in viewers(get_turf_loc(holder.my_atom), null))
flick("e_flash", M.flash)
for(var/mob/living/carbon/human/M in viewers(get_turf_loc(holder.my_atom), null))
if(M:eyecheck() <= 0)
flick("e_flash", M.flash)
for(var/i = 1, i <= created_volume, i++)
var/chosen = pick(borks)

View File

@@ -20,6 +20,7 @@
melee_damage_upper = 50
angertext = "runs"
attacktext = "chomps"
attack_sound = 'bite.ogg'
/obj/effect/critter/roach
@@ -122,6 +123,7 @@
melee_damage_upper = 8
angertext = "charges"
attacktext = "hits"
attack_sound = 'genhit1.ogg'
Die()
..()

View File

@@ -140,6 +140,7 @@
message = dd_replacetext(message, "grief", "grife")
message = dd_replacetext(message, "space", "spess")
message = dd_replacetext(message, "carp", "crap")
message = dd_replacetext(message, "reason", "raisin")
if(prob(50))
message = uppertext(message)
message += "[stutter(pick("!", "!!", "!!!"))]"
@@ -174,6 +175,7 @@
message_range = 1
italics = 1
if ("secure headset")
if (src:l_ear && istype(src:l_ear,/obj/item/device/radio))
src:l_ear.talk_into(src, message, 1)

View File

@@ -21,6 +21,8 @@
mind.key = key
mind.current = src
spawn() Playmusic() // git some tunes up in heeyaa~
var/starting_loc = pick(newplayer_start)
if(!starting_loc) starting_loc = locate(1,1,1)
loc = starting_loc
@@ -94,6 +96,7 @@
src << browse_rsc('sos_14.png')
//End PDA Resource Initialisation =====================================================>
Logout()
ready = 0
..()
@@ -125,6 +128,21 @@
src << browse(output,"window=playersetup;size=250x233;can_close=0")
return
proc/Playmusic()
while(!ticker) // wait for ticker to be created
sleep(1)
var/waits = 0
var/maxwaits = 100
while(!ticker.login_music)
sleep(2)
waits++ // prevents DDoSing the server via badminery
if(waits >= maxwaits)
break
src << sound(ticker.login_music, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS
Stat()
..()
@@ -343,6 +361,9 @@
else
preferences.copy_to(new_character)
src << sound(null, repeat = 0, wait = 0, volume = 85, channel = 1) // MAD JAMS cant last forever yo
new_character.dna.ready_dna(new_character)
if(mind)
mind.transfer_to(new_character)