diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index ddd1923248..efde1f1f01 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -98,7 +98,7 @@ var/obj/item/weapon/implant/I = locate(href_list["warn"]) if((I)&&(I.imp_in)) var/mob/living/carbon/R = I.imp_in - R << "\green You hear a voice in your head saying: '[warning]'" + R << "\green You think: '[warning]'" src.add_fingerprint(usr) src.updateUsrDialog() diff --git a/code/game/objects/storage/backpack.dm b/code/game/objects/storage/backpack.dm index e307576215..46579882f0 100644 --- a/code/game/objects/storage/backpack.dm +++ b/code/game/objects/storage/backpack.dm @@ -49,6 +49,7 @@ if(crit_fail) user << "\red The Bluespace generator isn't working." return + /* Remove these comments to re-enable BoH BoH Singuloths.-Hawk. if(istype(W, /obj/item/weapon/storage/backpack/holding) && !W.crit_fail) user << "\red The Bluespace interfaces of the two devices catastrophically malfunction!" del(W) @@ -58,6 +59,7 @@ log_game("[key_name(user)] detonated a bag of holding") del(src) return + */ ..() proc/failcheck(mob/user as mob) diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 1354741ae5..880935c27b 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -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é 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 2bcb447d31..39ba8fc0b1 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -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("Telepathic message from [src] to [target]: [say]") diff --git a/config/custom_items.txt b/config/custom_items.txt index 851d52d15a..1b79e2ee93 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -12,4 +12,5 @@ fniff: Sarah Calvera: /obj/item/fluff/sarah_calvera_1 fniff: Angleo Wilkerson: /obj/item/fluff/angelo_wilkerson_1 gvazdas: Sarah Carbrokes: /obj/item/fluff/sarah_carbrokes_1 serithi: Serithi Artalis: /obj/item/clothing/glasses/fluff/serithi_artalis_1 -deusdactyl: Greg Anderson: /obj/item/clothing/head/fluff/greg_anderson_1 \ No newline at end of file +deusdactyl: Greg Anderson: /obj/item/clothing/head/fluff/greg_anderson_1 +whitellama: Ethan Way: /obj/item/fluff/ethan_way_1 \ No newline at end of file diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi index e149785db1..b4e7f53467 100644 Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ