cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5318 from phil235/MsgFix2

Browse Source 
More messages fixed
This commit is contained in:
Cheridan
2014-10-19 21:39:06 -05:00
parent 8c7cf3d329 9b9481d65c
commit 455b526cc1
15 changed files with 166 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/ninja.dm
+122 -128
View File
@@ -2207,9 +2207,8 @@ ________________________________________________________________________________
anim(U.loc,U,'icons/mob/mob.dmi',,"cloak",,U.dir)
s_active=!s_active
U.alpha = 0
U << "<span class='notice'>You are now invisible to normal detection.</span>"
for(var/mob/O in oviewers(U))
O.show_message("[U.name] vanishes into thin air!",1)
U.visible_message("<span class='warning'>[U.name] vanishes into thin air!</span>", \
"<span class='notice'>You are now invisible to normal detection.</span>")
return
/obj/item/clothing/suit/space/space_ninja/proc/cancel_stealth()
@@ -2219,9 +2218,8 @@ ________________________________________________________________________________
anim(U.loc,U,'icons/mob/mob.dmi',,"uncloak",,U.dir)
s_active=!s_active
U.alpha = 255
U << "<span class='notice'>You are now visible.</span>"
for(var/mob/O in oviewers(U))
O.show_message("[U.name] appears from thin air!",1)
U.visible_message("<span class='warning'>[U.name] appears from thin air!</span>", \
"<span class='notice'>You are now visible.</span>")
return 1
return 0
@@ -2610,143 +2608,139 @@ It is possible to destroy the net by the occupant or someone else.
var/mob/living/affecting = null//Who it is currently affecting, if anyone.
var/mob/living/master = null//Who shot web. Will let this person know if the net was successful or failed.
proc
healthcheck()
if(health <=0)
density = 0
if(affecting)
var/mob/living/carbon/M = affecting
M.anchored = 0
for(var/mob/O in viewers(src, 3))
O.show_message(text("[] was recovered from the energy net!", M.name), 1, text("You hear a grunt."), 2)
if(!isnull(master))//As long as they still exist.
master << "<span class='userdanger'>ERROR</span>: \black unable to initiate transport protocol. Procedure terminated."
qdel(src)
return
process(var/mob/living/carbon/M as mob)
var/check = 30//30 seconds before teleportation. Could be extended I guess.
var/mob_name = affecting.name//Since they will report as null if terminated before teleport.
//The person can still try and attack the net when inside.
while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed.
check--
sleep(10)
if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location.
if(!isnull(master))//As long as they still exist.
master << "<span class='userdanger'>ERROR</span>: \black unable to locate \the [mob_name]. Procedure terminated."
qdel(src)//Get rid of the net.
return
if(!isnull(src))//As long as both net and person exist.
//No need to check for countdown here since while() broke, it's implicit that it finished.
density = 0//Make the net pass-through.
invisibility = 101//Make the net invisible so all the animations can play out.
health = INFINITY//Make the net invincible so that an explosion/something else won't kill it while, spawn() is running.
for(var/obj/item/W in M)
if(istype(M,/mob/living/carbon/human))
if(W==M:w_uniform) continue//So all they're left with are shoes and uniform.
if(W==M:shoes) continue
M.unEquip(W)
spawn(0)
playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
M << "<span class='danger'>You appear in a strange place!</span>"
spawn(0)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, M.loc)
spark_system.start()
playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
/obj/effect/energy_net/proc/healthcheck()
if(health <=0)
density = 0
if(affecting)
var/mob/living/carbon/M = affecting
M.anchored = 0
for(var/mob/O in viewers(src, 3))
O.show_message(text("[] vanished!", M), 1, text("You hear sparks flying!"), 2)
O.show_message("[M.name] was recovered from the energy net!", 1, "You hear a grunt.", 2)
if(!isnull(master))//As long as they still exist.
master << "<span class='notice'><b>SUCCESS</b>: \black transport procedure of \the [affecting] complete.</span>"
master << "<span class='userdanger'>ERROR</span>: \black unable to initiate transport protocol. Procedure terminated."
qdel(src)
return
M.anchored = 0//Important.
/obj/effect/energy_net/process(var/mob/living/carbon/M as mob)
var/check = 30//30 seconds before teleportation. Could be extended I guess.
var/mob_name = affecting.name//Since they will report as null if terminated before teleport.
//The person can still try and attack the net when inside.
while(!isnull(M)&&!isnull(src)&&check>0)//While M and net exist, and 30 seconds have not passed.
check--
sleep(10)
else//And they are free.
M << "<span class='notice'>You are free of the net!</span>"
if(isnull(M)||M.loc!=loc)//If mob is gone or not at the location.
if(!isnull(master))//As long as they still exist.
master << "<span class='userdanger'>ERROR</span>: \black unable to locate \the [mob_name]. Procedure terminated."
qdel(src)//Get rid of the net.
return
bullet_act(var/obj/item/projectile/Proj)
health -= Proj.damage
healthcheck()
..()
if(!isnull(src))//As long as both net and person exist.
//No need to check for countdown here since while() broke, it's implicit that it finished.
ex_act(severity)
switch(severity)
if(1.0)
health-=50
if(2.0)
health-=50
if(3.0)
health-=prob(50)?50:25
healthcheck()
return
density = 0//Make the net pass-through.
invisibility = 101//Make the net invisible so all the animations can play out.
health = INFINITY//Make the net invincible so that an explosion/something else won't kill it while, spawn() is running.
for(var/obj/item/W in M)
if(istype(M,/mob/living/carbon/human))
if(W==M:w_uniform) continue//So all they're left with are shoes and uniform.
if(W==M:shoes) continue
M.unEquip(W)
blob_act()
health-=50
healthcheck()
return
spawn(0)
playsound(M.loc, 'sound/effects/sparks4.ogg', 50, 1)
anim(M.loc,M,'icons/mob/mob.dmi',,"phaseout",,M.dir)
hitby(AM as mob|obj)
..()
for(var/mob/O in viewers(src, null))
O.show_message(text("<span class='danger'>[src] was hit by [AM].</span>"), 1)
var/tforce = 0
if(ismob(AM))
tforce = 10
else
tforce = AM:throwforce
playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
health = max(0, health - tforce)
healthcheck()
..()
return
M.loc = pick(holdingfacility)//Throw mob in to the holding facility.
M << "<span class='danger'>You appear in a strange place!</span>"
attack_hand()
if (HULK in usr.mutations)
usr << text("<span class='notice'>You easily destroy the energy net.</span>")
for(var/mob/O in oviewers(src))
O.show_message(text("<span class='danger'>[] rips the energy net apart!</span>", usr), 1)
spawn(0)
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
spark_system.set_up(5, 0, M.loc)
spark_system.start()
playsound(M.loc, 'sound/effects/phasein.ogg', 25, 1)
playsound(M.loc, 'sound/effects/sparks2.ogg', 50, 1)
anim(M.loc,M,'icons/mob/mob.dmi',,"phasein",,M.dir)
qdel(src)//Wait for everything to finish, delete the net. Else it will stop everything once net is deleted, including the spawn(0).
for(var/mob/O in viewers(src, 3))
O.show_message("[M] vanished!", 1, "You hear sparks flying!", 2)
if(!isnull(master))//As long as they still exist.
master << "<span class='notice'><b>SUCCESS</b>: \black transport procedure of \the [affecting] complete.</span>"
M.anchored = 0//Important.
else//And they are free.
M << "<span class='notice'>You are free of the net!</span>"
return
/obj/effect/energy_net/bullet_act(var/obj/item/projectile/Proj)
health -= Proj.damage
healthcheck()
..()
/obj/effect/energy_net/ex_act(severity)
switch(severity)
if(1.0)
health-=50
healthcheck()
return
if(2.0)
health-=50
if(3.0)
health-=prob(50)?50:25
healthcheck()
return
attack_paw()
return attack_hand()
/obj/effect/energy_net/blob_act()
health-=50
healthcheck()
return
attack_alien()
if (islarva(usr))
return
usr << text("\green You claw at the net.")
for(var/mob/O in oviewers(src))
O.show_message(text("<span class='danger'>[] claws at the energy net!</span>", usr), 1)
playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
health -= rand(10, 20)
if(health <= 0)
usr << text("\green You slice the energy net to pieces.")
for(var/mob/O in oviewers(src))
O.show_message(text("<span class='danger'>[] slices the energy net apart!</span>", usr), 1)
healthcheck()
return
/obj/effect/energy_net/hitby(AM as mob|obj)
..()
visible_message("<span class='danger'>[src] was hit by [AM].</span>")
var/tforce = 0
if(ismob(AM))
tforce = 10
else
tforce = AM:throwforce
playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
health = max(0, health - tforce)
healthcheck()
..()
return
attackby(obj/item/weapon/W as obj, mob/user as mob)
var/aforce = W.force
health = max(0, health - aforce)
healthcheck()
..()
/obj/effect/energy_net/attack_hand(mob/user)
if (HULK in user.mutations)
user.visible_message("<span class='danger'>[user] rips the energy net apart!</span>", \
"<span class='notice'>You easily destroy the energy net.</span>")
health-=50
healthcheck()
return
/obj/effect/energy_net/attack_paw(mob/user)
return attack_hand()
/obj/effect/energy_net/attack_alien(mob/user as mob)
if (islarva(user))
return
playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
health -= rand(10, 20)
if(health > 0)
user.visible_message("<span class='danger'>[user] claws at the energy net!</span>", \
"\green You claw at the net.")
else
user.visible_message("<span class='danger'>[user] slices the energy net apart!</span>", \
"\green You slice the energy net to pieces.")
healthcheck()
return
/obj/effect/energy_net/attackby(obj/item/weapon/W as obj, mob/user as mob)
var/aforce = W.force
health = max(0, health - aforce)
healthcheck()
..()
return
proc/create_ninja_mind(key)
var/datum/mind/Mind = new /datum/mind(key)
code/modules/flufftext/Hallucination.dm
+3 -4
View File
@@ -247,9 +247,8 @@ proc/check_panel(mob/M)
/obj/effect/fake_attacker/attackby(var/obj/item/weapon/P as obj, mob/user as mob)
step_away(src,my_target,2)
for(var/mob/M in oviewers(world.view,my_target))
M << "<span class='userdanger'>[my_target] flails around wildly.</span>"
my_target.show_message("<span class='userdanger'>[src] has been attacked by [my_target] </span>", 1) //Lazy.
my_target.visible_message("<span class='danger'>[my_target] flails around wildly.</span>", \
"<span class='userdanger'>[src] has been attacked by [my_target] </span>")
src.health -= P.force
@@ -261,7 +260,7 @@ proc/check_panel(mob/M)
step_away(src,my_target,2)
if(prob(30))
for(var/mob/O in oviewers(world.view , my_target))
O << "<span class='userdanger'>[my_target] stumbles around.</span>"
O << "<span class='danger'>[my_target] stumbles around.</span>"
/obj/effect/fake_attacker/New()
..()
code/modules/mining/equipment_locker.dm
+2 -1
View File
@@ -453,7 +453,8 @@
shake_camera(L, 20, 1)
spawn(20)
if(L)
L.visible_message("<span class='danger'>[L.name] vomits from travelling through the [src.name]!</span>")
L.visible_message("<span class='danger'>[L.name] vomits from travelling through the [src.name]!</span>", \
"<span class='userdanger'>You throw up from travelling through the [src.name]!</span>")
L.nutrition -= 20
L.adjustToxLoss(-3)
var/turf/T = get_turf(L)
code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
+1 -2
View File
@@ -150,8 +150,7 @@ Doesn't work on other aliens/AI.*/
if(!choice || !powerc(55)) return
adjustToxLoss(-55)
src << "<span class='notice'>You shape a [choice].</span>"
for(var/mob/O in viewers(src, null))
O.show_message(text("<span class='notice'>[src] vomits up a thick purple substance and begins to shape it.</span>"), 1)
visible_message("<span class='notice'>[src] vomits up a thick purple substance and begins to shape it.</span>")
switch(choice)
if("resin wall")
new /obj/structure/alien/resin/wall(loc)
code/modules/mob/living/carbon/alien/larva/powers.dm
+4 -8
View File
@@ -9,16 +9,12 @@
if (layer != TURF_LAYER+0.2)
layer = TURF_LAYER+0.2
src << text("<span class='noticealien'>You are now hiding.</span>")
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("<span class='name'>[] scurries to the ground!</span>", src)
visible_message("<span class='name'>[src] scurries to the ground!</span>", \
"<span class='noticealien'>You are now hiding.</span>")
else
layer = MOB_LAYER
src << text("<span class='noticealien'>You have stopped hiding.</span>")
for(var/mob/O in oviewers(src, null))
if ((O.client && !( O.blinded )))
O << text("[] slowly peaks up from the ground...", src)
visible_message("[src] slowly peaks up from the ground...", \
"<span class='noticealien'>You have stopped hiding.</span>")
/mob/living/carbon/alien/larva/verb/evolve()
set name = "Evolve"
code/modules/mob/living/carbon/alien/special/facehugger.dm
+6 -3
View File
@@ -137,7 +137,8 @@ var/const/MAX_ACTIVE_TIME = 400
if(W.flags & NODROP) return 0
target.unEquip(W)
target.visible_message("<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
target.visible_message("<span class='danger'>[src] tears [W] off of [target]'s face!</span>", \
"<span class='userdanger'>[src] tears [W] off of [target]'s face!</span>")
src.loc = target
target.equip_to_slot(src, slot_wear_mask,,0)
@@ -166,7 +167,8 @@ var/const/MAX_ACTIVE_TIME = 400
if(!sterile)
//target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
target.visible_message("<span class='userdanger'>[src] falls limp after violating [target]'s face!</span>")
target.visible_message("<span class='danger'>[src] falls limp after violating [target]'s face!</span>", \
"<span class='userdanger'>[src] falls limp after violating [target]'s face!</span>")
Die()
icon_state = "[initial(icon_state)]_impregnated"
@@ -180,7 +182,8 @@ var/const/MAX_ACTIVE_TIME = 400
src.loc = get_turf(C)
C.facehugger = null
else
target.visible_message("<span class='userdanger'>[src] violates [target]'s face!</span>")
target.visible_message("<span class='danger'>[src] violates [target]'s face!</span>", \
"<span class='userdanger'>[src] violates [target]'s face!</span>")
return
/obj/item/clothing/mask/facehugger/proc/GoActive()
code/modules/power/singularity/singularity.dm
+3 -4
View File
@@ -438,12 +438,11 @@
if (istype(M,/mob/living/carbon/human))
var/mob/living/carbon/human/H = M
if(istype(H.glasses,/obj/item/clothing/glasses/meson))
H << "<span class='notice'>You look directly into The [src.name], good thing you had your protective eyewear on!</span>"
H << "<span class='notice'>You look directly into the [src.name], good thing you had your protective eyewear on!</span>"
return
M << "<span class='danger'>You look directly into The [src.name] and feel weak.</span>"
M.apply_effect(3, STUN)
for(var/mob/O in viewers(M, null))
O.show_message(text("<span class='userdanger'>[] stares blankly at The []!</span>", M, src), 1)
M.visible_message("<span class='danger'>[M] stares blankly at the [src.name]!</span>", \
"<span class='userdanger'>You look directly into the [src.name] and feel weak.</span>")
return