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

Merge pull request #43409 from AutomaticFrenzy/patch/blood-brothers

Browse Source 
Fix blood brothers causing the whole end-round report to be bold
This commit is contained in:
oranges
2019-04-01 10:33:46 +13:00
committed by GitHub
parent 12c8eebf04 6b175bfd1e
commit eaf73214e6
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
code/modules/mob/living/simple_animal/guardian/types/explosive.dm
View File

@@ -34,17 +34,17 @@
if(!istype(A))
return
if(loc == summoner)
to_chat(src, "<span class='danger'><B>You must be manifested to create bombs!</span></B>")
to_chat(src, "<span class='danger'><B>You must be manifested to create bombs!</B></span>")
return
if(isobj(A) && Adjacent(A))
if(bomb_cooldown <= world.time && !stat)
var/obj/guardian_bomb/B = new /obj/guardian_bomb(get_turf(A))
to_chat(src, "<span class='danger'><B>Success! Bomb armed!</span></B>")
to_chat(src, "<span class='danger'><B>Success! Bomb armed!</B></span>")
bomb_cooldown = world.time + 200
B.spawner = src
B.disguise(A)
else
to_chat(src, "<span class='danger'><B>Your powers are on cooldown! You must wait 20 seconds between bombs.</span></B>")
to_chat(src, "<span class='danger'><B>Your powers are on cooldown! You must wait 20 seconds between bombs.</B></span>")
/obj/guardian_bomb
name = "bomb"
@@ -64,14 +64,14 @@
/obj/guardian_bomb/proc/disable()
stored_obj.forceMove(get_turf(src))
to_chat(spawner, "<span class='danger'><B>Failure! Your trap didn't catch anyone this time.</span></B>")
to_chat(spawner, "<span class='danger'><B>Failure! Your trap didn't catch anyone this time.</B></span>")
qdel(src)
/obj/guardian_bomb/proc/detonate(mob/living/user)
if(isliving(user))
if(user != spawner && user != spawner.summoner && !spawner.hasmatchingsummoner(user))
to_chat(user, "<span class='danger'><B>[src] was boobytrapped!</span></B>")
to_chat(spawner, "<span class='danger'><B>Success! Your trap caught [user]</span></B>")
to_chat(user, "<span class='danger'><B>[src] was boobytrapped!</B></span>")
to_chat(spawner, "<span class='danger'><B>Success! Your trap caught [user]</B></span>")
var/turf/T = get_turf(src)
stored_obj.forceMove(T)
playsound(T,'sound/effects/explosion2.ogg', 200, 1)