custom item stuff: updated roaper(enos adlai) comfy hat sprite, added searif (ara al-jazari) classy bartender uniform, sirribbit (james mcreary) mcreary's journal, serithi (tribunal) custom ai sprites (player has manual selection of both normal and malf states), removed (commented out) searif's one nations flagmask

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-01 00:27:24 +10:00
parent 6db38dbda7
commit 1b307f26de
6 changed files with 28 additions and 1 deletions

View File

@@ -333,6 +333,8 @@
set_picture("ai_facepalm") set_picture("ai_facepalm")
if("Friend Computer") if("Friend Computer")
set_picture("ai_friend") set_picture("ai_friend")
if("Tribunal")
set_picture("tribunal")
return return

View File

@@ -6,6 +6,8 @@
usr <<"You cannot change your emotional status because you are dead!" usr <<"You cannot change your emotional status because you are dead!"
return return
var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer") var/list/ai_emotions = list("Very Happy", "Happy", "Neutral", "Unsure", "Confused", "Sad", "BSOD", "Blank", "Problems?", "Awesome", "Facepalm", "Friend Computer")
if(src.ckey == "serithi")
ai_emotions.Add("Tribunal","Tribunal Malfunctioning")
var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions var/emote = input("Please, select a status!", "AI Status", null, null) in ai_emotions
for (var/obj/machinery/ai_status_display/AISD in world) //change status for (var/obj/machinery/ai_status_display/AISD in world) //change status
spawn( 0 ) spawn( 0 )

View File

@@ -252,6 +252,13 @@
icon = 'custom_items.dmi' icon = 'custom_items.dmi'
icon_state = "odysseus_spec_id" icon_state = "odysseus_spec_id"
/obj/item/weapon/clipboard/fluff/mcreary_journal //sirribbot: James McReary
name = "McReary's journal"
desc = "A journal with a warning sticker on the front cover. The initials \"J.M.\" are written on the back."
icon = 'custom_items.dmi'
icon_state = "mcreary_journal"
item_state = "mcreary_journal"
////////////////////////////////// //////////////////////////////////
//////////// Clothing //////////// //////////// Clothing ////////////
////////////////////////////////// //////////////////////////////////
@@ -326,7 +333,6 @@
desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense." desc = "Because when you're the toughest Mother Hubbard on the station, nobody's criticizing your fashion sense."
icon = 'custom_items.dmi' icon = 'custom_items.dmi'
icon_state = "enos_adlai_1" icon_state = "enos_adlai_1"
flags = FPRINT|TABLEPASS
//////////// Suits //////////// //////////// Suits ////////////
@@ -398,8 +404,17 @@
item_state = "tian_dress" item_state = "tian_dress"
color = "tian_dress" color = "tian_dress"
/obj/item/clothing/under/rank/bartender/fluff/classy //searif: Ara Al-Jazari
name = "classy bartender uniform"
desc = "A prim and proper uniform that looks very similar to a bartender's, the only differences being a red tie, waistcoat and a rag hanging out of the back pocket."
icon = 'custom_items.dmi'
icon_state = "ara_bar_uniform"
item_state = "ara_bar_uniform"
color = "ara_bar_uniform"
//////////// Masks //////////// //////////// Masks ////////////
/*
/obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell /obj/item/clothing/mask/fluff/flagmask //searif: Tsiokeriio Tarbell
name = "\improper First Nations facemask" name = "\improper First Nations facemask"
desc = "A simple cloth rag that bears the flag of the first nations." desc = "A simple cloth rag that bears the flag of the first nations."
@@ -409,6 +424,7 @@
flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH
w_class = 2 w_class = 2
gas_transfer_coefficient = 0.90 gas_transfer_coefficient = 0.90
*/
/obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick /obj/item/clothing/mask/mara_kilpatrick_1 //staghorn: Mara Kilpatrick
name = "shamrock pendant" name = "shamrock pendant"

View File

@@ -125,6 +125,9 @@
icons += "B.A.N.N.E.D." icons += "B.A.N.N.E.D."
if (src.name == "M00X-BC" && src.ckey == "searif") if (src.name == "M00X-BC" && src.ckey == "searif")
icons += "M00X-BC" icons += "M00X-BC"
if (src.name == "TRIBUNAL" && src.ckey == "serithi")
icons += "Tribunal"
icons += "Tribunal Malfunctioning"
icontype = input("Please, select a display!", "AI", null/*, null*/) in icons icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
if(icontype == "Blue") if(icontype == "Blue")
icon_state = "ai" icon_state = "ai"
@@ -156,6 +159,10 @@
icon_state = "ai-malf" icon_state = "ai-malf"
else if(icontype == "Static") else if(icontype == "Static")
icon_state = "ai-static" icon_state = "ai-static"
else if(icontype == "Tribunal")
icon_state = "ai-tribunal"
else if(icontype == "Tribunal Malfunctioning")
icon_state = "ai-tribunal-malf"
else//(icontype == "Matrix") else//(icontype == "Matrix")
icon_state = "ai-matrix" icon_state = "ai-matrix"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 196 KiB

After

Width:  |  Height:  |  Size: 197 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB