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

More tigerfixes

Browse Source
This commit is contained in:
FlattestGuitar
2017-09-11 22:31:22 +02:00
parent 81b23e4595
commit b4226898cb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/gamemodes/miniantags/guardian/types/bomb.dm
+4 -4
View File
@@ -13,12 +13,12 @@
if(!istype(A))
return
if(get_dist(get_turf(src), get_turf(A)) > 1)
to_chat(src, "<span class='danger'><B>You're too far from [A] to disguise it as a bomb.</span>")
to_chat(src, "<span class='danger'>You're too far from [A] to disguise it as a bomb.</span>")
return
if(istype(A, /obj/))
if(bomb_cooldown <= world.time && !stat)
var/obj/item/weapon/guardian_bomb/B = new /obj/item/weapon/guardian_bomb(get_turf(A))
to_chat(src, "<span class='danger'><B>Success! Bomb on [A] armed!</B></span>")
to_chat(src, "<span class='danger'>Success! Bomb on [A] armed!</span>")
if(summoner)
to_chat(summoner, "<span class='warning'>Your guardian has primed [A] to explode!</span>")
bomb_cooldown = world.time + 200
@@ -44,7 +44,7 @@
if(src)
stored_obj.loc = get_turf(loc)
if(spawner)
to_chat(spawner, "<span class='danger'><B>Failure! Your trap on [stored_obj] didn't catch anyone this time.</B></span>")
to_chat(spawner, "<span class='danger'>Failure! Your trap on [stored_obj] didn't catch anyone this time.</span>")
qdel(src)
/obj/item/weapon/guardian_bomb/proc/detonate(var/mob/living/user)
@@ -56,7 +56,7 @@
stored_obj.loc = get_turf(loc)
qdel(src)
return
to_chat(spawner, "<span class='danger'><B>Success! Your trap on [src] caught [user]!</B></span>")
to_chat(spawner, "<span class='danger'>Success! Your trap on [src] caught [user]!</span>")
stored_obj.loc = get_turf(loc)
playsound(get_turf(src),'sound/effects/Explosion2.ogg', 200, 1)
user.ex_act(2)
code/game/gamemodes/miniantags/guardian/types/standard.dm
+1 -1
View File
@@ -21,7 +21,7 @@
..()
if(iscarbon(target) && target != summoner)
if(length(battlecry) > 11)//no more then 11 letters in a battle cry.
visible_message("<span class='danger'><B>[src] punches [target]!</B></span>")
visible_message("<span class='danger'>[src] punches [target]!</span>")
else
say("[battlecry][battlecry][battlecry][battlecry][battlecry]")
playsound(loc, attack_sound, 50, 1, 1)