cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

#Fixed all known bugs with ninja voice.

Browse Source 
#As an added bonus, voice-changers will protect from flash. Can be easily removed if needed.
#Added more recharge locations for ninjas: cells, smes, and cyborgs.
#Recharge changed so that it takes less time but recharges for less.
#Adamantine sprites per request.
#Updated Ripley sprites per request(?).

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1444 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
noisomehollow@lycos.com
2011-04-14 18:20:20 +00:00
parent ad6a6e42aa
commit e55521799a
25 changed files with 303 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/life.dm
+1 -1
View File
@@ -731,7 +731,7 @@
else
seer = 0
see_invisible = 0
else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/space_ninja))
else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja))
switch(src.wear_mask:mode)
if(1)
src.see_in_dark = 5
code/modules/mob/living/carbon/human/say.dm
+2 -1
View File
@@ -25,7 +25,8 @@
pick_list -= H
message = dd_list2text(temp_message, " ")
//Ninja mask obscures text and voice if set to do so.
if(istype(src.wear_mask, /obj/item/clothing/mask/gas/space_ninja)&&src.wear_mask:voice=="Unknown")
//Would make it more global but it's sort of ninja specific.
if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
if(copytext(message, 1, 2) != "*")
var/list/temp_message = dd_text2list(message, " ")
var/list/pick_list = list()
code/modules/mob/living/carbon/human/whisper.dm
+44 -10
View File
@@ -30,6 +30,25 @@
var/italics = 1
var/message_range = 1
if(istype(src.wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja)&&src.wear_mask:voice=="Unknown")
if(copytext(message, 1, 2) != "*")
var/list/temp_message = dd_text2list(message, " ")
var/list/pick_list = list()
for(var/i = 1, i <= temp_message.len, i++)
pick_list += i
for(var/i=1, i <= abs(temp_message.len/3), i++)
var/H = pick(pick_list)
if(findtext(temp_message[H], "*") || findtext(temp_message[H], ";") || findtext(temp_message[H], ":")) continue
temp_message[H] = ninjaspeak(temp_message[H])
pick_list -= H
message = dd_list2text(temp_message, " ")
message = dd_replaceText(message, "o", "¤")
message = dd_replaceText(message, "p", "þ")
message = dd_replaceText(message, "l", "£")
message = dd_replaceText(message, "s", "§")
message = dd_replaceText(message, "u", "µ")
message = dd_replaceText(message, "b", "ß")
if (src.stuttering)
message = stutter(message)
@@ -72,11 +91,16 @@
if (italics)
message_a = "<i>[message_a]</i>"
if (!istype(src, /mob/living/carbon/human) || istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
//This appears copied from carbon/living say.dm so the istype check for mob is probably not needed. Appending for src is also not needed as the game will check that automatically.
if (!istype(src, /mob/living/carbon/human))
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
else if (istype(wear_mask, /obj/item/clothing/mask/gas/voice))
if (wear_mask:vchange)
rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_a]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[src.real_name]</span>[alt_name] whispers, <span class='message'>\"[message_a]\"</span></span>"
rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message_a]\"</span></span>"
for (var/mob/M in heard_a)
M.show_message(rendered, 2)
@@ -101,10 +125,15 @@
if (M.say_understands(src))
var/message_c
message_c = stars(message)
if (!istype(src, /mob/living/carbon/human) || istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
if (!istype(src, /mob/living/carbon/human))
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
if(wear_mask:vchange)
rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message_c]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[src.real_name]</span>[alt_name] whispers, <span class='message'>\"[message_c]\"</span></span>"
rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message_c]\"</span></span>"
M.show_message(rendered, 2)
else
rendered = "<span class='game say'><span class='name'>[src.voice_name]</span> whispers something.</span>"
@@ -113,10 +142,15 @@
if (italics)
message = "<i>[message]</i>"
if (!istype(src, /mob/living/carbon/human) || istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
rendered = "<span class='game say'><span class='name'>[src.name]</span> whispers, <span class='message'>\"[message]\"</span></span>"
if (!istype(src, /mob/living/carbon/human))
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message]\"</span></span>"
else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
if(wear_mask:vchange)
rendered = "<span class='game say'><span class='name'>[wear_mask:voice]</span> whispers, <span class='message'>\"[message]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[name]</span> whispers, <span class='message'>\"[message]\"</span></span>"
else
rendered = "<span class='game say'><span class='name'>[src.real_name]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span></span>"
rendered = "<span class='game say'><span class='name'>[real_name]</span>[alt_name] whispers, <span class='message'>\"[message]\"</span></span>"
for (var/mob/M in world)
if (istype(M, /mob/new_player))
code/modules/mob/living/say.dm
+7 -4
View File
@@ -257,7 +257,7 @@
else
if (M.ghost_ears && !(M in listening))
listening+=M
for (var/obj/O in ((V | src.contents)-used_radios)) //radio in pocket could work, radio in backpack wouldn't --rastaf0
spawn (0)
if (O)
@@ -278,10 +278,13 @@
if (italics)
message_a = "<i>[message_a]</i>"
if (!istype(src, /mob/living/carbon/human) || istype(src.wear_mask, /obj/item/clothing/mask/gas/voice))
if (!istype(src, /mob/living/carbon/human))
rendered = "<span class='game say'><span class='name'>[src.name]</span> <span class='message'>[message_a]</span></span>"
else if (istype(src.wear_mask, /obj/item/clothing/mask/gas/space_ninja))
rendered = "<span class='game say'><span class='name'>[src.wear_mask:voice]</span> <span class='message'>[message_a]</span></span>"
else if(istype(wear_mask, /obj/item/clothing/mask/gas/voice))
if(wear_mask:vchange)
rendered = "<span class='game say'><span class='name'>[src.wear_mask:voice]</span> <span class='message'>[message_a]</span></span>"
else
rendered = "<span class='game say'><span class='name'>[src.name]</span> <span class='message'>[message_a]</span></span>"
else
rendered = "<span class='game say'><span class='name'>[src.real_name]</span>[alt_name] <span class='message'>[message_a]</span></span>"
code/modules/mob/living/silicon/robot/robot.dm
+32 -1
View File
@@ -1,6 +1,8 @@
/mob/living/silicon/robot/New(loc,var/syndie = 0)
spark_system = new /datum/effects/system/spark_spread()
spark_system.set_up(5, 0, src)
spark_system.attach(src)
spawn (1)
src << "\blue Your icons have been generated!"
playsound(src.loc, 'liveagain.ogg', 50, 1, -3)
@@ -591,6 +593,35 @@
user << "You remove the power cell."
src.updateicon()
if(ishuman(user))
var/mob/living/carbon/human/U = user
if(istype(U.gloves, /obj/item/clothing/gloves/space_ninja)&&U.gloves:candrain&&!U.gloves:draining)
var/obj/item/clothing/suit/space/space_ninja/S = U.wear_suit
var/obj/item/clothing/gloves/space_ninja/G = U.gloves
user << "\blue Now charging battery..."
src << "\red Warning: Unauthorized access through sub-route 12, block C, detected."
G.draining = 1
if(cell&&cell.charge)
var/drain = 0
var/totaldrain = 0
while(cell.charge>0)
drain = rand(100,300)
if(cell.charge<drain)
drain = cell.charge
if (do_after(U,10))
spark_system.start()
playsound(src.loc, "sparks", 50, 1)
cell.charge-=drain
S.charge+=drain
totaldrain+=drain
else break
U << "\blue Gained <B>[totaldrain]</B> energy from [src]."
G.draining = 0
return
else
U << "\red Their battery has run dry of power. You must find another source."
return
/mob/living/silicon/robot/proc/allowed(mob/M)
//check if it doesn't require any access at all