Skip to content

Commit

Permalink
Spanifies aliens
Browse files Browse the repository at this point in the history
  • Loading branch information
Jordie0608 committed Aug 12, 2014
1 parent 1ed6d79 commit a6c3564
Show file tree
Hide file tree
Showing 12 changed files with 97 additions and 96 deletions.
36 changes: 18 additions & 18 deletions code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ Doesn't work on other aliens/AI.*/

/mob/living/carbon/alien/proc/powerc(X, Y)//Y is optional, checks for weed planting. X can be null.
if(stat)
src << "\green You must be conscious to do this."
src << "<span class='noticealien'>You must be conscious to do this.</span>"
return 0
else if(X && getPlasma() < X)
src << "\green Not enough plasma stored."
src << "<span class='noticealien'>Not enough plasma stored.</span>"
return 0
else if(Y && (!isturf(src.loc) || istype(src.loc, /turf/space)))
src << "\green Bad place for a garden!"
src << "<span class='noticealien'>Bad place for a garden!</span>"
return 0
else return 1

Expand All @@ -30,7 +30,7 @@ Doesn't work on other aliens/AI.*/
if(powerc(50,1))
adjustToxLoss(-50)
for(var/mob/O in viewers(src, null))
O.show_message(text("\green <B>[src] has planted some alien weeds!</B>"), 1)
O.show_message(text("<span class='alertalien'>[src] has planted some alien weeds!</span>"), 1)
new /obj/structure/alien/weeds/node(loc)
return

Expand All @@ -57,8 +57,8 @@ Doesn't work on other aliens/AI.*/
var/msg = sanitize(input("Message:", "Alien Whisper") as text|null)
if(msg)
log_say("AlienWhisper: [key_name(src)]->[M.key] : [msg]")
M << "\green You hear a strange, alien voice in your head... \italic [msg]"
src << {"\green You said: "[msg]" to [M]"}
M << "<span class='noticealien'>You hear a strange, alien voice in your head...</span>[msg]"
src << {"<span class='noticealien'>You said: "[msg]" to [M]</span>"}
return

/mob/living/carbon/alien/humanoid/verb/transfer_plasma(mob/living/carbon/alien/M as mob in oview())
Expand All @@ -74,10 +74,10 @@ Doesn't work on other aliens/AI.*/
if (get_dist(src,M) <= 1)
M.adjustToxLoss(amount)
adjustToxLoss(-amount)
M << "\green [src] has transfered [amount] plasma to you."
src << {"\green You have trasferred [amount] plasma to [M]"}
M << "<span class='noticealien'>[src] has transfered [amount] plasma to you.</span>"
src << {"<span class='noticealien'>You have trasferred [amount] plasma to [M]</span>"}
else
src << "\green You need to be closer."
src << "<span class='noticealien'>You need to be closer.</span>"
return


Expand All @@ -92,27 +92,27 @@ Doesn't work on other aliens/AI.*/
if(isobj(O))
var/obj/I = O
if(I.unacidable) //So the aliens don't destroy energy fields/singularies/other aliens/etc with their acid.
src << "\green You cannot dissolve this object."
src << "<span class='noticealien'>You cannot dissolve this object.</span>"
return
// TURF CHECK
else if(istype(O, /turf/simulated))
var/turf/T = O
// R WALL
if(istype(T, /turf/simulated/wall/r_wall))
src << "\green You cannot dissolve this object."
src << "<span class='noticealien'>You cannot dissolve this object.</span>"
return
// R FLOOR
if(istype(T, /turf/simulated/floor/engine))
src << "\green You cannot dissolve this object."
src << "<span class='noticealien'>You cannot dissolve this object.</span>"
return
else// Not a type we can acid.
return

adjustToxLoss(-200)
new /obj/effect/acid(get_turf(O), O)
visible_message("\green <B>[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!</B>")
visible_message("<span class='alertalien'>[src] vomits globs of vile stuff all over [O]. It begins to sizzle and melt under the bubbling mess of acid!</span>")
else
src << "\green Target is too far away."
src << "<span class='noticealien'>Target is too far away.</span>"
return


Expand All @@ -123,7 +123,7 @@ Doesn't work on other aliens/AI.*/

if(powerc(50))
adjustToxLoss(-50)
src.visible_message("\red [src] spits neurotoxin!", "\green You spit neurotoxin.")
src.visible_message("<span class='danger'>[src] spits neurotoxin!", "<span class='alertalien'>You spit neurotoxin.</span>")

var/turf/T = loc
var/turf/U = get_step(src, dir) // Get the tile infront of the move, based on their direction
Expand All @@ -146,9 +146,9 @@ Doesn't work on other aliens/AI.*/
var/choice = input("Choose what you wish to shape.","Resin building") as null|anything in list("resin door","resin wall","resin membrane","resin nest") //would do it through typesof but then the player choice would have the type path and we don't want the internal workings to be exposed ICly - Urist
if(!choice || !powerc(75)) return
adjustToxLoss(-75)
src << "\green You shape a [choice]."
src << "<span class='userdanger'>You shape a [choice].</span>"
for(var/mob/O in viewers(src, null))
O.show_message(text("\red <B>[src] vomits up a thick purple substance and begins to shape it!</B>"), 1)
O.show_message(text("<span class='userdanger'>[src] vomits up a thick purple substance and begins to shape it!</span>"), 1)
switch(choice)
if("resin door")
new /obj/structure/mineral_door/resin(loc)
Expand All @@ -171,5 +171,5 @@ Doesn't work on other aliens/AI.*/
stomach_contents.Remove(A)
A.loc = loc
//Paralyse(10)
src.visible_message("\green <B>[src] hurls out the contents of their stomach!</B>")
src.visible_message("<span class='alertealien'>[src] hurls out the contents of their stomach!</span>")
return
4 changes: 2 additions & 2 deletions code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@

if(no_queen)
adjustToxLoss(-500)
src << "\green You begin to evolve!"
src << "<span class='noticealien'>You begin to evolve!</span>"
for(var/mob/O in viewers(src, null))
O.show_message(text("\green <B>[src] begins to twist and contort!</B>"), 1)
O.show_message(text("<span class='alertalien'>[src] begins to twist and contort!</span>"), 1)
var/mob/living/carbon/alien/humanoid/queen/new_xeno = new (loc)
mind.transfer_to(new_xeno)
qdel(src)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/alien/humanoid/death.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
if(!gibbed)
playsound(loc, 'sound/voice/hiss6.ogg', 80, 1, 1)
for(var/mob/O in viewers(src, null))
O.show_message("<B>[src]</B> lets out a waning guttural screech, green blood bubbling from its maw...", 1)
O.show_message("<span class='name'>[src]</span> lets out a waning guttural screech, green blood bubbling from its maw...", 1)
update_canmove()
if(client) blind.layer = 0
update_icons()
Expand Down
22 changes: 11 additions & 11 deletions code/modules/mob/living/carbon/alien/humanoid/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -14,54 +14,54 @@

switch(act) //Alphabetical please
if ("deathgasp")
message = "<B>[src]</B> lets out a waning guttural screech, green blood bubbling from its maw..."
message = "<span class='name'>[src]</span> lets out a waning guttural screech, green blood bubbling from its maw..."
m_type = 2

if ("gnarl")
if (!muzzled)
message = "<B>[src]</B> gnarls and shows its teeth.."
message = "<span class='name'>[src]</span> gnarls and shows its teeth.."
m_type = 2

if ("hiss")
if(!muzzled)
message = "<B>[src]</B> hisses."
message = "<span class='name'>[src]</span> hisses."
m_type = 2

if ("moan")
message = "<B>[src]</B> moans!"
message = "<span class='name'>[src]</span> moans!"
m_type = 2

if ("roar")
if (!muzzled)
message = "<B>[src]</B> roars."
message = "<span class='name'>[src]</span> roars."
m_type = 2

if ("roll")
if (!src.restrained())
message = "<B>[src]</B> rolls."
message = "<span class='name'>[src]</span> rolls."
m_type = 1

if ("scratch")
if (!src.restrained())
message = "<B>[src]</B> scratches."
message = "<span class='name'>[src]</span> scratches."
m_type = 1

if ("scretch")
if (!muzzled)
message = "<B>[src]</B> scretches."
message = "<span class='name'>[src]</span> scretches."
m_type = 2

if ("shiver")
message = "<B>[src]</B> shivers."
message = "<span class='name'>[src]</span> shivers."
m_type = 2

if ("sign")
if (!src.restrained())
message = text("<B>[src]</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
message = text("<span class='name'>[src]</span> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
m_type = 1

if ("tail")
message = "<B>[src]</B> waves its tail."
message = "<span class='name'>[src]</span> waves its tail."
m_type = 1

if ("help") //This is an exception
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/alien/humanoid/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@

if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
if(prob(20))
src << "\red You feel a searing heat in your lungs!"
src << "<span class='danger'>You feel a searing heat in your lungs!>/span>"
fire_alert = max(fire_alert, 1)
else
fire_alert = 0
Expand Down Expand Up @@ -267,12 +267,12 @@
if(FAT in mutations)
if(nutrition < 100)
if(prob(round((50 - nutrition) / 100)))
src << "\blue You feel fit again!"
src << "<span class='info'>You feel fit again!</span>"
mutations.Remove(FAT)
else
if(nutrition > 500)
if(prob(5 + round((nutrition - 200) / 2)))
src << "\red You suddenly feel blubbery!"
src << "<span class='danger'>You suddenly feel blubbery!</span>"
mutations.Add(FAT)

if (nutrition > 0)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/carbon/alien/humanoid/queen.dm
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
if(powerc(75,1))//Can't plant eggs on spess tiles. That's silly.
adjustToxLoss(-75)
for(var/mob/O in viewers(src, null))
O.show_message(text("\green <B>[src] has laid an egg!</B>"), 1)
O.show_message(text("<span class='alertalien'>[src] has laid an egg!</span>"), 1)
new /obj/structure/alien/egg(loc)
return

Expand Down
50 changes: 25 additions & 25 deletions code/modules/mob/living/carbon/alien/larva/emote.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,92 +15,92 @@
switch(act) //Alphabetically sorted please.
if ("burp")
if (!muzzled)
message = "<B>[src]</B> burps."
message = "<span class='name'>[src]</span> burps."
m_type = 2
if ("choke")
message = "<B>[src]</B> chokes."
message = "<span class='name'>[src]</span> chokes."
m_type = 2
if ("collapse")
Paralyse(2)
message = "<B>[src]</B> collapses!"
message = "<span class='name'>[src]</span> collapses!"
m_type = 2
if ("dance")
if (!src.restrained())
message = "<B>[src]</B> dances around happily."
message = "<span class='name'>[src]</span> dances around happily."
m_type = 1
if ("drool")
message = "<B>[src]</B> drools."
message = "<span class='name'>[src]</span> drools."
m_type = 1
if ("gasp")
message = "<B>[src]</B> gasps."
message = "<span class='name'>[src]</span> gasps."
m_type = 2
if ("gnarl")
if (!muzzled)
message = "<B>[src]</B> gnarls and shows its teeth.."
message = "<span class='name'>[src]</span> gnarls and shows its teeth.."
m_type = 2
if ("hiss")
message = "<B>[src]</B> hisses softly."
message = "<span class='name'>[src]</span> hisses softly."
m_type = 1
if ("jump")
message = "<B>[src]</B> jumps!"
message = "<span class='name'>[src]</span> jumps!"
m_type = 1
if ("moan")
message = "<B>[src]</B> moans!"
message = "<span class='name'>[src]</span> moans!"
m_type = 2
if ("nod")
message = "<B>[src]</B> nods its head."
message = "<span class='name'>[src]</span> nods its head."
m_type = 1
// if ("roar")
// if (!muzzled)
// message = "<B>[src]</B> roars." Commenting out since larva shouldn't roar /N
// message = "<span class='name'>[src]</span> roars." Commenting out since larva shouldn't roar /N
// m_type = 2
if ("roll")
if (!src.restrained())
message = "<B>[src]</B> rolls."
message = "<span class='name'>[src]</span> rolls."
m_type = 1
if ("scratch")
if (!src.restrained())
message = "<B>[src]</B> scratches."
message = "<span class='name'>[src]</span> scratches."
m_type = 1
if ("scretch")
if (!muzzled)
message = "<B>[src]</B> scretches."
message = "<span class='name'>[src]</span> scretches."
m_type = 2
if ("shake")
message = "<B>[src]</B> shakes its head."
message = "<span class='name'>[src]</span> shakes its head."
m_type = 1
if ("shiver")
message = "<B>[src]</B> shivers."
message = "<span class='name'>[src]</span> shivers."
m_type = 2
if ("sign")
if (!src.restrained())
message = text("<B>The alien</B> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
message = text("<span class='name'>[src]</span> signs[].", (text2num(param) ? text(" the number []", text2num(param)) : null))
m_type = 1
// if ("sit")
// message = "<B>[src]</B> sits down." //Larvan can't sit down, /N
// message = "<span class='name'>[src]</span> sits down." //Larvan can't sit down, /N
// m_type = 1
if ("sulk")
message = "<B>[src]</B> sulks down sadly."
message = "<span class='name'>[src]</span> sulks down sadly."
m_type = 1
if ("sway")
message = "<B>[src]</B> sways around dizzily."
message = "<span class='name'>[src]</span> sways around dizzily."
m_type = 1
if ("tail")
message = "<B>[src]</B> waves its tail."
message = "<span class='name'>[src]</span> waves its tail."
m_type = 1
if ("twitch")
message = "<B>[src]</B> twitches violently."
message = "<span class='name'>[src]</span> twitches violently."
m_type = 1
if ("whimper")
if (!muzzled)
message = "<B>[src]</B> whimpers."
message = "<span class='name'>[src]</span> whimpers."
m_type = 2

if ("help") //"The exception"
src << "Help for larva emotes. You can use these emotes with say \"*emote\":\n\nburp, choke, collapse, dance, drool, gasp, gnarl, hiss, jump, moan, nod, roll, scratch,\nscretch, shake, shiver, sign-#, sulk, sway, tail, twitch, whimper"

else
src << "\blue Unusable emote '[act]'. Say *help for a list."
src << "<span class='info'> Unusable emote '[act]'. Say *help for a list.</span>"
if ((message && src.stat == 0))
log_emote("[name]/[key] : [message]")
if (m_type & 1)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/mob/living/carbon/alien/larva/life.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@

if(breath.temperature > (T0C+66) && !(COLD_RESISTANCE in mutations)) // Hot air hurts :(
if(prob(20))
src << "\red You feel a searing heat in your lungs!"
src << "<span class='danger'>You feel a searing heat in your lungs!</span>"
fire_alert = max(fire_alert, 1)
else
fire_alert = 0
Expand All @@ -184,12 +184,12 @@
if(FAT in mutations)
if(nutrition < 100)
if(prob(round((50 - nutrition) / 100)))
src << "\blue You feel fit again!"
src << "<span class='info'>You feel fit again!</span>"
mutations.Add(FAT)
else
if(nutrition > 500)
if(prob(5 + round((nutrition - max_grown) / 2)))
src << "\red You suddenly feel blubbery!"
src << "<span class='danger'>You suddenly feel blubbery!</span>"
mutations.Add(FAT)

if (nutrition > 0)
Expand Down
Loading

0 comments on commit a6c3564

Please sign in to comment.