Merge pull request #270 from Tastyfish/master

Made custom items read from a config file.
This commit is contained in:
Albert Iordache
2012-01-12 01:02:00 -08:00
3 changed files with 35 additions and 23 deletions

View File

@@ -3,30 +3,38 @@
//gives item to specific people when they join if it can
//for multiple items just add mutliple entries, unless i change it to be a listlistlist
//yes, it has to be an item, you can't pick up nonitems
var/list/CustomItemList = list(
// ckey real_name item path
list("skymarshal", "Phillip Oswald", /obj/item/weapon/coin/silver), //Phillip likes to chew on cigars. Just unlit cigars, don't ask me why. Must be a clone thing. (Cigarette machines dispense cigars if they have a coin in them) --SkyMarshal
list("spaceman96", "Trenna Seber", /obj/item/weapon/pen/multi), //For Spesss.
list("spaceman96", "Trenna Seber", /obj/item/clothing/suit/storage/labcoat/pink), //For Spesss.
list("asanadas", "Book Berner", /obj/item/clothing/under/chameleon/psyche)
)
/proc/EquipCustomItems(mob/living/carbon/human/M)
for(var/list/Entry in CustomItemList)
// load lines
var/file = file2text("config/custom_items.txt")
var/lines = dd_text2list(file, "\n")
for(var/line in lines)
// split & clean up
var/list/Entry = dd_text2list(line, ":")
for(var/i = 1 to Entry.len)
Entry[i] = trim(Entry[i])
if(Entry.len < 3)
continue;
if(Entry[1] == M.ckey && Entry[2] == M.real_name)
var/ok = 0 // 1 if the item was placed successfully
var/path = Entry[3]
var/obj/item/Item = new path()
var/list/Paths = dd_text2list(Entry[3], ",")
for(var/P in Paths)
var/ok = 0 // 1 if the item was placed successfully
P = trim(P)
var/path = text2path(P)
var/obj/item/Item = new path()
if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back first
Item.loc = M.back
ok = 1
else
for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
if (S:len < S:storage_slots)
Item.loc = S
ok = 1
break
if(istype(M.back,/obj/item/weapon/storage) && M.back:contents.len < M.back:storage_slots) // Try to place it in something on the mob's back first
Item.loc = M.back
ok = 1
else
for(var/obj/item/weapon/storage/S in M.contents) // Try to place it in any item that can store stuff, on the mob.
if (S:len < S:storage_slots)
Item.loc = S
ok = 1
break
if (ok == 0) // Finally, since everything else failed, place it on the ground
Item.loc = get_turf(M.loc)
if (ok == 0) // Finally, since everything else failed, place it on the ground
Item.loc = get_turf(M.loc)

View File

@@ -233,7 +233,7 @@
if(owner:organs["r_foot"])
var/datum/organ/external/S = owner:organs["r_foot"]
if(!S.destroyed)
var/obj/item/weapon/organ/l_foot/X = new(owner.loc, owner)
var/obj/item/weapon/organ/r_foot/X = new(owner.loc, owner)
for(var/mob/M in viewers(owner))
M.show_message("\red [owner.name]'s [X.name] flies off flies off in arc.")
var/lol2 = pick(cardinal)