cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 03:33:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4084 from VOREStation/upstream-merge-5441

Browse Source 
[MIRROR] Fixes the PDA Halogen Scanner's tendency to be number one.
This commit is contained in:
Spades
2018-08-17 16:12:24 -04:00
committed by GitHub
parent 887899f50b d7eb00fdfa
commit c1c7af946b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/devices/PDA/PDA.dm
View File

@@ -1254,7 +1254,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
if(isnull(cartridge)) if(isnull(cartridge))
to_chat(usr, "<span class='notice'>There's no cartridge to eject.</span>") to_chat(usr, "<span class='notice'>There's no cartridge to eject.</span>")
return return
cartridge.forceMove(get_turf(src)) cartridge.forceMove(get_turf(src))
if(ismob(loc)) if(ismob(loc))
@@ -1382,7 +1382,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
to_chat(user, "<span class='notice'>Blood type: [C:blood_DNA[blood]]\nDNA: [blood]</span>") to_chat(user, "<span class='notice'>Blood type: [C:blood_DNA[blood]]\nDNA: [blood]</span>")
if(4) if(4)
user.visible_message("<span class='warning'>\The [user] has analyzed [C]'s radiation levels!</span>", 1) user.visible_message("<span class='warning'>\The [user] has analyzed [C]'s radiation levels!</span>", "<span class='notice'>You have analyzed [C]'s radiation levels!</span>")
to_chat(user, "<span class='notice'>Analyzing Results for [C]:</span>") to_chat(user, "<span class='notice'>Analyzing Results for [C]:</span>")
if(C.radiation) if(C.radiation)
to_chat(user, "<span class='notice'>Radiation Level: [C.radiation]</span>") to_chat(user, "<span class='notice'>Radiation Level: [C.radiation]</span>")