cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-27 14:46:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #265 from SueTheCake/Forensics

Browse Source 
Forensics
This commit is contained in:
skull132
2014-09-13 20:39:50 +03:00
parent 7ec04bb1ed a6ec5adf9a
commit a2b7b28aef
28 changed files with 1012 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/security.dm
+26 -8
View File
@@ -232,6 +232,31 @@
new /obj/item/device/encryptionkey/headset_med(src)
return
/obj/structure/closet/secure_closet/forensics
name = "Forensic tech's closet"
req_access = list(access_forensics_lockers)
icon_state = "sec1"
icon_closed = "sec"
icon_locked = "sec1"
icon_opened = "secopen"
icon_broken = "secbroken"
icon_off = "secoff"
New()
..()
sleep(2)
new /obj/item/clothing/under/rank/navy/det/forensics(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
new /obj/item/clothing/suit/storage/forensics/red(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/taperoll/police(src)
new /obj/item/clothing/tie/holobadge(src)
return
/obj/structure/closet/secure_closet/detective
name = "Detective's Cabinet"
@@ -248,24 +273,17 @@
sleep(2)
new /obj/item/clothing/under/det(src)
new /obj/item/clothing/under/det/black(src)
new /obj/item/clothing/under/det/slob(src)
new /obj/item/clothing/suit/storage/det_suit(src)
new /obj/item/clothing/suit/storage/det_suit/black(src)
new /obj/item/clothing/suit/storage/forensics/blue(src)
new /obj/item/clothing/suit/storage/forensics/red(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/det_hat(src)
new /obj/item/clothing/head/det_hat/black(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/storage/box/evidence(src)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/device/detective_scanner(src)
new /obj/item/clothing/suit/armor/det_suit(src)
new /obj/item/ammo_magazine/c45r(src)
new /obj/item/ammo_magazine/c45r(src)
new /obj/item/taperoll/police(src)
new /obj/item/weapon/gun/projectile/detective/semiauto(src)
new /obj/item/clothing/tie/holster/armpit(src)
new /obj/item/clothing/tie/holobadge(src)
return
/obj/structure/closet/secure_closet/detective/update_icon()
code/game/objects/structures/watercloset.dm
+13
View File
@@ -344,6 +344,14 @@
M.clean_blood()
if(ishuman(M))
M:update_inv_gloves()
if(ishuman(M))
var/mob/living/carbon/human/B = M
if(B.gloves)
var/obj/item/clothing/gloves/C = B.gloves
C.gsr = 0
else
B.gsr = 0
for(var/mob/V in viewers(src, null))
V.show_message("\blue [M] washes their hands using \the [src].")
@@ -392,6 +400,11 @@
if(user.get_active_hand() != I) return //Person has switched hands or the item in their hands
O.clean_blood()
if(istype(O, /obj/item/clothing))
var/obj/item/clothing/G = O
G.gsr = 0
user.visible_message( \
"\blue [user] washes \a [I] using \the [src].", \
"\blue You wash \a [I] using \the [src].")