cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2250 from tigercat2000/xenoputers

Browse Source 
Remove remaining arbitrary restrictions
This commit is contained in:
Mark van Alphen
2015-10-02 19:30:40 +02:00
parent 5fe12d313a 413f35298e
commit 5f2fb9a7a4
12 changed files with 51 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/flashlight.dm
+2 -2
View File
@@ -183,7 +183,7 @@ obj/item/device/flashlight/lamp/bananalamp
update_brightness(U)
else
update_brightness(null)
/obj/item/device/flashlight/flare/update_brightness(var/mob/user = null)
..()
if(on)
@@ -207,7 +207,7 @@ obj/item/device/flashlight/lamp/bananalamp
src.force = on_damage
src.damtype = "fire"
processing_objects += src
/obj/item/device/flashlight/flare/torch
name = "torch"
desc = "A torch fashioned from some leaves and a log."
code/game/objects/items/devices/scanners.dm
+11 -11
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 (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "\red You don't have the dexterity to do this!"
if (!user.IsAdvancedToolUser())
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"])
@@ -441,13 +441,13 @@ REAGENT SCANNER
/obj/item/device/reagent_scanner/afterattack(obj/O, mob/user as mob)
if (user.stat)
return
if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
user << "\red You don't have the dexterity to do this!"
if (!user.IsAdvancedToolUser())
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/stacks/medical.dm
+1 -1
View File
@@ -15,7 +15,7 @@
user << "<span class='danger'>\The [src] cannot be applied to [M]!</span>"
return 1
if (!(istype(user, /mob/living/carbon/human) || istype(user, /mob/living/silicon)))
if (!user.IsAdvancedToolUser())
user << "<span class='danger'>You don't have the dexterity to do this!</span>"
return 1
code/game/objects/items/toys.dm
+4 -5
View File
@@ -169,18 +169,17 @@
afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
if (flag)
return
if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
usr << "\red You don't have the dexterity to do this!"
if (!user.IsAdvancedToolUser())
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"