cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Spanssss

Browse Source
This commit is contained in:
Tigercat2000
2015-09-30 13:45:54 -07:00
parent e39c69a8a6
commit d0af69afd5
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+9 -9
View File
@@ -382,17 +382,17 @@ REAGENT SCANNER
if (user.stat)
return
if (crit_fail)
user << "\red This device has critically failed and is no longer functional!"
user << "<span class='warning'>This device has critically failed and is no longer functional!</span>"
return
if (!user.IsAdvancedToolUser())
user << "\red You don't have the dexterity to do this!"
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
return
if(reagents.total_volume)
var/list/blood_traces = list()
for(var/datum/reagent/R in reagents.reagent_list)
if(R.id != "blood")
reagents.clear_reagents()
user << "\red The sample was contaminated! Please insert another sample"
user << "<span class='warning'>The sample was contaminated! Please insert another sample.</span>"
return
else
blood_traces = params2list(R.data["trace_chem"])
@@ -442,12 +442,12 @@ REAGENT SCANNER
if (user.stat)
return
if (!user.IsAdvancedToolUser())
user << "\red You don't have the dexterity to do this!"
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
return
if(!istype(O))
return
if (crit_fail)
user << "\red This device has critically failed and is no longer functional!"
user << "<span class='warning'>This device has critically failed and is no longer functional!</span>"
return
if(!isnull(O.reagents))
@@ -456,7 +456,7 @@ REAGENT SCANNER
var/one_percent = O.reagents.total_volume / 100
for (var/datum/reagent/R in O.reagents.reagent_list)
if(prob(reliability))
dat += "\n \t \blue [R][details ? ": [R.volume / one_percent]%" : ""]"
dat += "<br>[TAB]<span class='notice'>[R][details ? ": [R.volume / one_percent]%" : ""]</span>"
recent_fail = 0
else if(recent_fail)
crit_fail = 1
@@ -465,11 +465,11 @@ REAGENT SCANNER
else
recent_fail = 1
if(dat)
user << "\blue Chemicals found: [dat]"
user << "<span class='notice'>Chemicals found: [dat]</span>"
else
user << "\blue No active chemical agents found in [O]."
user << "<span class='notice'>No active chemical agents found in [O].</span>"
else
user << "\blue No significant chemical agents found in [O]."
user << "<span class='notice'>No significant chemical agents found in [O].</span>"
return
code/game/objects/items/toys.dm
+3 -4
View File
@@ -170,17 +170,16 @@
if (flag)
return
if (!user.IsAdvancedToolUser())
user << "\red You don't have the dexterity to do this!"
user << "<span class='warning'>You don't have the dexterity to do this!</span>"
return
src.add_fingerprint(user)
if (src.bullets < 1)
user.show_message("\red *click* *click*", 2)
user.show_message("<span class='alert'>*click* *click*</span>", 2)
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
return
playsound(user, 'sound/weapons/Gunshot.ogg', 100, 1)
src.bullets--
for(var/mob/O in viewers(user, null))
O.show_message(text("\red <B>[] fires a cap gun at []!</B>", user, target), 1, "\red You hear a gunshot", 2)
user.visible_message("<span class='danger'>[user] fires a cap gun at [target]!</span>", null, "You hear a gunshot.")
/obj/item/toy/ammo/gun
name = "ammo-caps"