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

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

Browse Source
This commit is contained in:
Ren Erthilo
2012-03-29 08:37:47 +01:00
parent c578b76935 737459a8d9
commit 63c027aca9
9 changed files with 50 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/customitems/item_defines.dm
+11 -1
View File
@@ -32,4 +32,14 @@
name = "Bespectacled Mesonic Surveyors"
desc = "One of the older meson scanner models retrofitted to perform like its modern counterparts."
icon = 'custom_items.dmi'
icon_state = "book_berner_1"
icon_state = "book_berner_1"
/obj/item/fluff/sarah_carbrokes_1
name = "Locket"
desc = "A grey locket with a picture of a black haired man in it. The text above it reads: \"Edwin Carbrokes\"."
icon_state = "sarah_carbrokes_1"
/obj/item/clothing/glasses/fluff/serithi_artalis_1
name = "Extranet HUD"
desc = "A heads-up display with limited connectivity to the NanoTrasen Extranet, capable of displaying information from official NanoTrasen records."
icon_state = "serithi_artalis_1"