cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 07:32:35 +00: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-04-26 18:36:09 +01:00
parent 4f48a518ab d733a9c97e
commit 043d77d6ab
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/customitems/item_defines.dm
View File

@@ -20,7 +20,7 @@
/obj/item/fluff/sarah_calvera_1
name = "Old Photo"
desc = "Looks like it was made on a really old, cheap camera. Low quality. The camera shows a young hispanic looking girl with red hair wearing a white dress is standing in front of an old looking wall. On the back there is a note in black marker that reads \"Sara, Siempre pens<EFBFBD> que eras tan linda con ese vestido. Tu hermano, Carlos.\""
desc = "Looks like it was made on a really old, cheap camera. Low quality. The camera shows a young hispanic looking girl with red hair wearing a white dress is standing in front of an old looking wall. On the back there is a note in black marker that reads \"Sara, Siempre pensé que eras tan linda con ese vestido. Tu hermano, Carlos.\""
icon_state = "sarah_calvera_1"
/obj/item/fluff/angelo_wilkerson_1
@@ -52,4 +52,11 @@
item_state = "hardhat0_red"
color = "red"
armor = list(melee = 30, bullet = 5, laser = 20,energy = 10, bomb = 20, bio = 10, rad = 20)
flags_inv = 0
flags_inv = 0
/obj/item/fluff/ethan_way_1
name = "Old ID"
desc = "A scratched and worn identification card; it appears too damaged to inferface with any technology. You can almost make out \"Tom Cabinet\" in the smeared ink."
icon = 'custom_items.dmi'
icon_state = "ethan_way_1"
flags = FPRINT | TABLEPASS

1
code/modules/mob/living/carbon/human/human.dm
View File

@@ -2782,7 +2782,6 @@ It can still be worn/put on as normal.
target.show_message("\blue You hear [src.real_name]'s voice: [say]")
else
target.show_message("\blue You hear a voice that seems to echo around the room: [say]")
target << "\red This ain't an admin message, this is IC. Act like it. If someone's abusing it, pretending to be us, adminhelp it."
usr.show_message("\blue You project your mind into [target.real_name]: [say]")
for(var/mob/dead/observer/G in world)
G.show_message("<i>Telepathic message from <b>[src]</b> to <b>[target]</b>: [say]</i>")