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

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

Browse Source
This commit is contained in:
Erthilo
2012-06-02 15:52:52 +01:00
parent 1ece0d492f a4900f428e
commit f90ec4b414
6 changed files with 4255 additions and 4233 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/DetectiveWork/detective_work.dm
+2 -4
View File
@@ -134,10 +134,8 @@ obj/machinery/computer/forensic_scanning
authenticated = 1
updateDialog()
return
var/obj/item/weapon/card/id/I = M.equipped()
if (I && istype(I))
if(src.check_access(I))
authenticated = 1
if (allowed(M))
authenticated = 1
//usr << "\green Access Granted"
//if(!authenticated)
//usr << "\red Access Denied"
code/modules/mob/living/carbon/human/hud_overlays.dm
+13 -1
View File
@@ -4,4 +4,16 @@ mob/living/carbon/human
var/image/sec_img
var/image/sec2_img
var/image/imp_img
var/image/health_img
var/image/health_img
mob/New()
. = ..()
antag_img = image('icons/mob/hud.dmi',src)
mob/living/carbon/human/New()
. = ..()
med_img = image('icons/mob/hud.dmi',src)
sec_img = image('icons/mob/hud.dmi',src)
sec2_img = image('icons/mob/hud.dmi',src)
imp_img = image('icons/mob/hud.dmi',src)
health_img = image('icons/mob/hud.dmi',src)