cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-17 02:54:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8315 from phil235/BigUserdanger

Browse Source 
Makes the message when you're attacked slightly bigger
This commit is contained in:
Jordie
2015-03-16 18:30:21 +11:00
parent fb6aa85094 78d28a6d64
commit 9c148ff13e
54 changed files with 114 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -196,11 +196,11 @@ MASS SPECTROMETER
if(H.reagents.reagent_list.len)
user.show_message("<span class='notice'>Subject contains the following reagents:</span>")
for(var/datum/reagent/R in H.reagents.reagent_list)
user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'userdanger'>OVERDOSING</span>" : ".</span>"]")
user.show_message("<span class='notice'>[R.volume]u of [R.name][R.overdosed == 1 ? "</span> - <span class = 'boldannounce'>OVERDOSING</span>" : ".</span>"]")
else
user.show_message("<span class = 'notice'>Subject contains no reagents.</span>")
if(H.reagents.addiction_list.len)
user.show_message("<span class='userdanger'>Subject is addicted to the following reagents:</span>")
user.show_message("<span class='boldannounce'>Subject is addicted to the following reagents:</span>")
for(var/datum/reagent/R in H.reagents.addiction_list)
user.show_message("<span class='danger'>[R.name]</span>")
else
code/game/objects/items/weapons/implants/implantchair.dm
+2 -2
View File
@@ -107,10 +107,10 @@
/obj/machinery/implantchair/put_mob(mob/living/carbon/M as mob)
if(!iscarbon(M))
usr << "<span class='userdanger'>The [src.name] cannot hold this!</span>"
usr << "<span class='warning'>The [src.name] cannot hold this!</span>"
return
if(src.occupant)
usr << "<span class='userdanger'>The [src.name] is already occupied!</span>"
usr << "<span class='warning'>The [src.name] is already occupied!</span>"
return
if(M.client)
M.client.perspective = EYE_PERSPECTIVE