diff --git a/baystation12.dme b/baystation12.dme index 1f79d17639..8b044669b1 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -146,6 +146,7 @@ #define FILE_DIR "code/WorkInProgress/Cael_Aislinn" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" +#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites" #define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/Mini" #define FILE_DIR "code/WorkInProgress/organs" @@ -191,7 +192,6 @@ #define FILE_DIR "sound/scary" #define FILE_DIR "sound/voice" #define FILE_DIR "sound/weapons" -#define FILE_DIR "tajara_sprites" // END_FILE_DIR // BEGIN_PREFERENCES #define DEBUG diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm index d9fa426115..de9cf148e0 100644 --- a/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm +++ b/code/WorkInProgress/Cael_Aislinn/Tajara/say.dm @@ -6,7 +6,7 @@ var/is_decipherable = 0 var/n = length(text) var/p = 0 - while(p <= n) + while(p < n) if (copytext(text, p, p + 1) in tajspeak_letters) p++ continue @@ -65,6 +65,7 @@ return html_encode(t)*/ /mob/living/carbon/human/tajaran/say(var/message) + world << "\blue check1:\"[message]\")" var/message_old = message message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN)) @@ -169,6 +170,8 @@ if (!ishuman(src) && (message_mode=="department" || (message_mode in radiochannels))) message_mode = null //only humans can use headsets + world << "\blue check2:\"[message]\")" + if (!message) return @@ -214,6 +217,8 @@ */ var/list/obj/item/used_radios = new + world << "\blue check3:\"[message]\")" + switch (message_mode) if ("headset") if (src:l_ear && istype(src:l_ear,/obj/item/device/radio)) @@ -308,12 +313,16 @@ italics = 1 /////SPECIAL HEADSETS END + world << "\blue check4:\"[message]\")" + //work out if we're speaking tajaran or not var/is_speaking_taj = 0 if(copytext(message, 1, 3) == ":j") is_speaking_taj = 1 message = trim(copytext(message, 1, 3)) + world << "\blue check5:\"[message]\")" + var/list/listening /* if(istype(loc, /obj/item/device/aicard)) // -- TLE @@ -409,6 +418,7 @@ else rendered = "[real_name][alt_name] [message_a]" + /* // Create speech bubble var/obj/effect/speech_bubble/B = new/obj/effect/speech_bubble @@ -427,6 +437,7 @@ if(istype(src, /mob/living/carbon/metroid)) presay = "metroid" */ + world << "\blue check6:\"[message]\")" for (var/mob/M in heard_a) M.show_message(rendered, 2) @@ -442,6 +453,9 @@ I.override = 1 M << I */ + + world << "\blue check7:\"[message]\")" + /* // find the suffix, if bot, human or monkey var/punctuation = "" @@ -526,3 +540,5 @@ sleep(11) del(B) */ + + world << "\blue check8:\"[message]\")" diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index d31d658cdf..777dd831bc 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -1,4 +1,4 @@ -#define METEOR_TEMPERATURE +#define METEOR_TEMPERATURE 0 //set to 0 until we work out a good number for it /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round @@ -106,7 +106,7 @@ pass_flags = PASSTABLE | PASSGRILLE /obj/effect/meteor/Move() - var/turf/T = src.loc + //var/turf/T = src.loc //FUCK YOU. FUCK YOU ALL, METEORS. ~Hawk. /*if (istype(T, /turf)) T.hotspot_expose(METEOR_TEMPERATURE, 1000) */ diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index f701ba2a0a..f94090c71a 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -387,6 +387,7 @@ if(istype(src, /mob/living/carbon/metroid)) presay = "metroid" */ + world << "\blue rendered: \"[rendered]\"" for (var/mob/M in heard_a) M.show_message(rendered, 2) diff --git a/config/admins.txt b/config/admins.txt index 790541e986..d5a5205d8e 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -2,6 +2,7 @@ abi79 - Game Master arcalane - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin +caelaislinn - Game Admin cajoes - Game Admin cib - Game Master compactninja - Game Master diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index e2686681f3..62d567ec1b 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ diff --git a/sound/scary/behind_you1.ogg b/sound/scary/behind_you1.ogg new file mode 100644 index 0000000000..d3ddef7480 Binary files /dev/null and b/sound/scary/behind_you1.ogg differ diff --git a/sound/scary/behind_you2.ogg b/sound/scary/behind_you2.ogg new file mode 100644 index 0000000000..530a71698c Binary files /dev/null and b/sound/scary/behind_you2.ogg differ diff --git a/sound/scary/far_noise.ogg b/sound/scary/far_noise.ogg new file mode 100644 index 0000000000..11d849a89f Binary files /dev/null and b/sound/scary/far_noise.ogg differ diff --git a/sound/scary/growl1.ogg b/sound/scary/growl1.ogg new file mode 100644 index 0000000000..80aca01ce7 Binary files /dev/null and b/sound/scary/growl1.ogg differ diff --git a/sound/scary/growl2.ogg b/sound/scary/growl2.ogg new file mode 100644 index 0000000000..f10abf0fb2 Binary files /dev/null and b/sound/scary/growl2.ogg differ diff --git a/sound/scary/growl3.ogg b/sound/scary/growl3.ogg new file mode 100644 index 0000000000..3f3799bc0f Binary files /dev/null and b/sound/scary/growl3.ogg differ diff --git a/sound/scary/i_see_you1.ogg b/sound/scary/i_see_you1.ogg new file mode 100644 index 0000000000..66d5b65d59 Binary files /dev/null and b/sound/scary/i_see_you1.ogg differ diff --git a/sound/scary/i_see_you2.ogg b/sound/scary/i_see_you2.ogg new file mode 100644 index 0000000000..da908f2c4b Binary files /dev/null and b/sound/scary/i_see_you2.ogg differ diff --git a/sound/scary/im_here1.ogg b/sound/scary/im_here1.ogg new file mode 100644 index 0000000000..b3a7142365 Binary files /dev/null and b/sound/scary/im_here1.ogg differ diff --git a/sound/scary/im_here2.ogg b/sound/scary/im_here2.ogg new file mode 100644 index 0000000000..bd841bcdb1 Binary files /dev/null and b/sound/scary/im_here2.ogg differ diff --git a/sound/scary/look_up1.ogg b/sound/scary/look_up1.ogg new file mode 100644 index 0000000000..045d5d4a76 Binary files /dev/null and b/sound/scary/look_up1.ogg differ diff --git a/sound/scary/look_up2.ogg b/sound/scary/look_up2.ogg new file mode 100644 index 0000000000..1e6f14b21b Binary files /dev/null and b/sound/scary/look_up2.ogg differ diff --git a/sound/scary/over_here1.ogg b/sound/scary/over_here1.ogg new file mode 100644 index 0000000000..90f557b005 Binary files /dev/null and b/sound/scary/over_here1.ogg differ diff --git a/sound/scary/over_here2.ogg b/sound/scary/over_here2.ogg new file mode 100644 index 0000000000..2719e204a2 Binary files /dev/null and b/sound/scary/over_here2.ogg differ diff --git a/sound/scary/over_here3.ogg b/sound/scary/over_here3.ogg new file mode 100644 index 0000000000..1ef1a1d834 Binary files /dev/null and b/sound/scary/over_here3.ogg differ diff --git a/sound/scary/turn_around1.ogg b/sound/scary/turn_around1.ogg new file mode 100644 index 0000000000..7a83755a93 Binary files /dev/null and b/sound/scary/turn_around1.ogg differ diff --git a/sound/scary/turn_around2.ogg b/sound/scary/turn_around2.ogg new file mode 100644 index 0000000000..f4328458dd Binary files /dev/null and b/sound/scary/turn_around2.ogg differ diff --git a/sound/scary/veryfar_noise.ogg b/sound/scary/veryfar_noise.ogg new file mode 100644 index 0000000000..b27ce5dce9 Binary files /dev/null and b/sound/scary/veryfar_noise.ogg differ diff --git a/sound/scary/wail.ogg b/sound/scary/wail.ogg new file mode 100644 index 0000000000..66318be3e9 Binary files /dev/null and b/sound/scary/wail.ogg differ