diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm new file mode 100644 index 00000000000..f3ecc121516 --- /dev/null +++ b/code/datums/spells/horsemask.dm @@ -0,0 +1,39 @@ +/obj/effect/proc_holder/spell/targeted/horsemask + name = "Curse of the Horseman" + desc = "This spell triggers a curse on a target, causing them to wield an unremovable horse head mask. They will speak like a horse! Any masks they are wearing will be disintegrated. This spell does not require robes." + school = "transmutation" + charge_type = "recharge" + charge_max = 150 + charge_counter = 0 + clothes_req = 0 + stat_allowed = 0 + invocation = "KN'A FTAGHU, PUCK 'BTHNK!" + invocation_type = "shout" + range = 7 + selection_type = "range" + var/list/compatible_mobs = list(/mob/living/carbon/human, /mob/living/carbon/monkey) + +/obj/effect/proc_holder/spell/targeted/horsemask/cast(list/targets, mob/user = usr) + if(!targets.len) + user << "No target found in range." + return + + var/mob/living/carbon/target = targets[1] + + if(!(target.type in compatible_mobs)) + user << "It'd be stupid to curse [target] with a horse's head!" + return + + if(!(target in oview(range)))//If they are not in overview after selection. + user << "They are too far away!" + return + + var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead + magichead.canremove = 0 //curses! + magichead.flags_inv = null //so you can still see their face + magichead.voicechange = 1 //NEEEEIIGHH + target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \ + "Your face burns up, and shortly after the fire you realise you have the face of a horse!") + target.equip_to_slot(magichead, slot_wear_mask) + + flick("e_flash", target.flash) diff --git a/code/game/gamemodes/events/space_ninja.dm b/code/game/gamemodes/events/space_ninja.dm index 8e085be5d94..6abc55d2fb1 100644 --- a/code/game/gamemodes/events/space_ninja.dm +++ b/code/game/gamemodes/events/space_ninja.dm @@ -1022,4 +1022,33 @@ That is why you attached them to objects. step_to(current_clone,src,1) sleep(5) if(safety<=0) break - return */ \ No newline at end of file + return */ + +//Alternate ninja speech replacement. +/*This text is hilarious but also absolutely retarded. +message = replacetext(message, "l", "r") +message = replacetext(message, "rr", "ru") +message = replacetext(message, "v", "b") +message = replacetext(message, "f", "hu") +message = replacetext(message, "'t", "") +message = replacetext(message, "t ", "to ") +message = replacetext(message, " I ", " ai ") +message = replacetext(message, "th", "z") +message = replacetext(message, "ish", "isu") +message = replacetext(message, "is", "izu") +message = replacetext(message, "ziz", "zis") +message = replacetext(message, "se", "su") +message = replacetext(message, "br", "bur") +message = replacetext(message, "ry", "ri") +message = replacetext(message, "you", "yuu") +message = replacetext(message, "ck", "cku") +message = replacetext(message, "eu", "uu") +message = replacetext(message, "ow", "au") +message = replacetext(message, "are", "aa") +message = replacetext(message, "ay", "ayu") +message = replacetext(message, "ea", "ii") +message = replacetext(message, "ch", "chi") +message = replacetext(message, "than", "sen") +message = replacetext(message, ".", "") +message = lowertext(message) +*/ \ No newline at end of file diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index 531e3f558d4..59c8b1e3155 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -25,23 +25,24 @@ dat += "Mutate (60)
" dat += "Ethereal Jaunt (60)
" dat += "Knock (10)
" + dat += "Curse of the Horseman (15)
" if(op) - dat += "Summon Guns (One time use, global spell)
" + dat += "Summon Guns (One time use, global spell)
" dat += "
" dat += "Artefacts:
" dat += "Powerful items imbued with eldritch magics. Summoning one will count towards your maximum number of spells.
" dat += "It is recommended that only experienced wizards attempt to wield such artefacts.
" dat += "
" - dat += "Staff of Change
" + dat += "Staff of Change
" dat += "
" - dat += "Six Soul Stone Shards and the spell Artificer
" + dat += "Six Soul Stone Shards and the spell Artificer
" dat += "
" - dat += "Mastercrafted Armor Set
" + dat += "Mastercrafted Armor Set
" dat += "
" - dat += "Staff of Animation
" + dat += "Staff of Animation
" dat += "
" if(op) - dat += "Re-memorize Spells
" + dat += "Re-memorize Spells
" user << browse(dat, "window=radio") onclose(user, "radio") return @@ -58,7 +59,7 @@ if(href_list["spell_choice"]) if(src.uses >= 1 && src.max_uses >=1 && text2num(href_list["spell_choice"]) < 19) src.uses-- - var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock","Summon Guns","Staff of Change","Six Soul Stone Shards and the spell Artificer","Mastercrafted Armor Set", "Staff of Animation") + var/list/available_spells = list("Magic Missile","Fireball","Disintegrate","Disable Tech","Smoke","Blind","Mind Transfer","Forcewall","Blink","Teleport","Mutate","Ethereal Jaunt","Knock","Curse of the Horseman","Summon Guns","Staff of Change","Six Soul Stone Shards and the spell Artificer","Mastercrafted Armor Set", "Staff of Animation") var/already_knows = 0 for(var/obj/effect/proc_holder/spell/aspell in usr.spell_list) if(available_spells[text2num(href_list["spell_choice"])] == aspell.name) @@ -121,22 +122,26 @@ usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/knock(usr) src.temp = "This spell opens nearby doors and does not require wizard garb." if ("14") + feedback_add_details("wizard_spell_learned","HH") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells + usr.spell_list += new /obj/effect/proc_holder/spell/targeted/horsemask(usr) + src.temp = "This spell will curse a person to wear an unremovable horse mask (it has glue on the inside) and speak like a horse. It does not require a wizard garb. Do note the curse will disintegrate the target's current mask if they are wearing one." + if ("15") feedback_add_details("wizard_spell_learned","SG") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells usr.rightandwrong() src.max_uses-- src.temp = "Nothing could possibly go wrong with arming a crew of lunatics just itching for an excuse to kill eachother. Just be careful not to get hit in the crossfire!" - if ("15") + if ("16") feedback_add_details("wizard_spell_learned","ST") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/gun/energy/staff(get_turf(usr)) src.temp = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" src.max_uses-- - if ("16") + if ("17") feedback_add_details("wizard_spell_learned","SS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/storage/belt/soulstone/full(get_turf(usr)) usr.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(usr) src.temp = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." src.max_uses-- - if ("17") + if ("18") feedback_add_details("wizard_spell_learned","HS") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/clothing/shoes/sandal(get_turf(usr)) //In case they've lost them. new /obj/item/clothing/gloves/purple(get_turf(usr))//To complete the outfit @@ -144,13 +149,13 @@ new /obj/item/clothing/head/helmet/space/rig/wizard(get_turf(usr)) src.temp = "An artefact suit of armor that allows you to cast spells while providing more protection against attacks and the void of space." src.max_uses-- - if("18") + if("19") feedback_add_details("wizard_spell_learned","SA") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells new /obj/item/weapon/gun/energy/staff/animate(get_turf(usr)) src.temp = "An artefact that spits bolts of life-force which causes objects which are hit by it to animate and come to life! This magic doesn't affect machines." src.max_uses-- - if (href_list["spell_choice"] == "19") + if (href_list["spell_choice"] == "20") var/area/wizard_station/A = locate() if(usr in A.contents) src.uses = src.max_uses diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm index 873ba06dcbf..3b8d96f190a 100644 --- a/code/modules/clothing/masks/miscellaneous.dm +++ b/code/modules/clothing/masks/miscellaneous.dm @@ -41,4 +41,14 @@ item_state = "pig" flags = FPRINT|TABLEPASS|BLOCKHAIR flags_inv = HIDEFACE - w_class = 2 \ No newline at end of file + w_class = 2 + +/obj/item/clothing/mask/horsehead + name = "horse head mask" + desc = "A mask made of soft vinyl and latex, representing the head of a horse." + icon_state = "horsehead" + item_state = "horsehead" + flags = FPRINT|TABLEPASS|BLOCKHAIR + flags_inv = HIDEFACE + w_class = 2 + var/voicechange = 0 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 86383847d80..c8ba8c0f366 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -1,6 +1,6 @@ /mob/living/carbon/human/say(var/message) - if (silent) + if(silent) return //Mimes dont speak! Changeling hivemind and emotes are allowed. @@ -18,12 +18,12 @@ if (copytext(message, 1, 2) != "*") return - if(src.dna) - if(src.dna.mutantrace == "lizard") + if(dna) + if(dna.mutantrace == "lizard") if(copytext(message, 1, 2) != "*") message = replacetext(message, "s", stutter("ss")) - /*if(src.dna.mutantrace == "slime" && prob(5)) + /*if(dna.mutantrace == "slime" && prob(5)) if(copytext(message, 1, 2) != "*") if(copytext(message, 1, 2) == ";") message = ";" @@ -48,79 +48,58 @@ pick_list -= H //Make sure that you dont HONK the same word twice message = dd_list2text(temp_message, " ") - if(istype(src.wear_mask, /obj/item/clothing/mask/luchador)) - if(copytext(message, 1, 2) != "*") - message = replacetext(message, "captain", "CAPITÁN") - message = replacetext(message, "station", "ESTACIÓN") - message = replacetext(message, "sir", "SEÑOR") - message = replacetext(message, "the ", "el ") - message = replacetext(message, "my ", "mi ") - message = replacetext(message, "is ", "es ") - message = replacetext(message, "it's", "es") - message = replacetext(message, "friend", "amigo") - message = replacetext(message, "buddy", "amigo") - message = replacetext(message, "hello", "hola") - message = replacetext(message, " hot", " caliente") - message = replacetext(message, " very ", " muy ") - message = replacetext(message, "sword", "espada") - message = replacetext(message, "library", "biblioteca") - message = replacetext(message, "traitor", "traidor") - message = replacetext(message, "wizard", "mago") - message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image. - if(prob(25)) - message += " OLE!" + if(wear_mask) + if(istype(wear_mask, /obj/item/clothing/mask/gas/voice/space_ninja) && wear_mask:voice == "Unknown") + if(copytext(message, 1, 2) != "*") + var/list/temp_message = 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 = replacetext(message, "o", "¤") + message = replacetext(message, "p", "þ") + message = replacetext(message, "l", "£") + message = replacetext(message, "s", "§") + message = replacetext(message, "u", "µ") + message = replacetext(message, "b", "ß") + + else if(istype(wear_mask, /obj/item/clothing/mask/luchador)) + if(copytext(message, 1, 2) != "*") + message = replacetext(message, "captain", "CAPITÁN") + message = replacetext(message, "station", "ESTACIÓN") + message = replacetext(message, "sir", "SEÑOR") + message = replacetext(message, "the ", "el ") + message = replacetext(message, "my ", "mi ") + message = replacetext(message, "is ", "es ") + message = replacetext(message, "it's", "es") + message = replacetext(message, "friend", "amigo") + message = replacetext(message, "buddy", "amigo") + message = replacetext(message, "hello", "hola") + message = replacetext(message, " hot", " caliente") + message = replacetext(message, " very ", " muy ") + message = replacetext(message, "sword", "espada") + message = replacetext(message, "library", "biblioteca") + message = replacetext(message, "traitor", "traidor") + message = replacetext(message, "wizard", "mago") + message = uppertext(message) //Things end up looking better this way (no mixed cases), and it fits the macho wrestler image. + if(prob(25)) + message += " OLE!" + + else if(istype(wear_mask, /obj/item/clothing/mask/horsehead)) + var/obj/item/clothing/mask/horsehead/hoers = wear_mask + if(hoers.voicechange) + if(!(copytext(message, 1, 2) == "*" || (mind && mind.changeling && (copytext(message, 1, 3) == ":g" || copytext(message, 1, 3) == ":G" || copytext(message, 1, 3) == ":ï")))) + message = pick("NEEIIGGGHHHH!", "NEEEIIIIGHH!", "NEIIIGGHH!", "HAAWWWWW!", "HAAAWWW!") if ((HULK in mutations) && health >= 25 && length(message)) if(copytext(message, 1, 2) != "*") message = "[uppertext(message)]!!" //because I don't know how to code properly in getting vars from other files -Bro - //Ninja mask obscures text and voice if set to do so. - //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 = 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 = replacetext(message, "o", "¤") - message = replacetext(message, "p", "þ") - message = replacetext(message, "l", "£") - message = replacetext(message, "s", "§") - message = replacetext(message, "u", "µ") - message = replacetext(message, "b", "ß") - /*This text is hilarious but also absolutely retarded. - message = replacetext(message, "l", "r") - message = replacetext(message, "rr", "ru") - message = replacetext(message, "v", "b") - message = replacetext(message, "f", "hu") - message = replacetext(message, "'t", "") - message = replacetext(message, "t ", "to ") - message = replacetext(message, " I ", " ai ") - message = replacetext(message, "th", "z") - message = replacetext(message, "ish", "isu") - message = replacetext(message, "is", "izu") - message = replacetext(message, "ziz", "zis") - message = replacetext(message, "se", "su") - message = replacetext(message, "br", "bur") - message = replacetext(message, "ry", "ri") - message = replacetext(message, "you", "yuu") - message = replacetext(message, "ck", "cku") - message = replacetext(message, "eu", "uu") - message = replacetext(message, "ow", "au") - message = replacetext(message, "are", "aa") - message = replacetext(message, "ay", "ayu") - message = replacetext(message, "ea", "ii") - message = replacetext(message, "ch", "chi") - message = replacetext(message, "than", "sen") - message = replacetext(message, ".", "") - message = lowertext(message) - */ ..(message) /mob/living/carbon/human/say_understands(var/other) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 29cf43eba40..24d0ecdb1f7 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -779,7 +779,7 @@ if(icon_state =="mopgearrex") overlays.Cut() overlays += "eyes-mopgearrex" - if(icon_state =="Miner") + if(icon_state =="Miner" || icon_state =="Miner+j") overlays.Cut() overlays += "eyes-Miner" else diff --git a/html/changelog.html b/html/changelog.html index 2795abb860e..94d4b3c7069 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,15 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

/tg/station 13 Presents

+

Directed by S0ldi3rKr4s0

+

& produced by Petethegoat

+ +
+

12 January 2013

Cael Aislinn updated:

diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 220eaced385..61354f77ceb 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 366c73e4ac8..56c4841a2b0 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -164,6 +164,7 @@ #include "code\datums\spells\ethereal_jaunt.dm" #include "code\datums\spells\explosion.dm" #include "code\datums\spells\genetic.dm" +#include "code\datums\spells\horsemask.dm" #include "code\datums\spells\inflict_handler.dm" #include "code\datums\spells\knock.dm" #include "code\datums\spells\mind_transfer.dm"