shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit

Browse Source
This commit is contained in:
kevinz000
2020-02-03 13:07:49 -07:00
parent 402abd9287 2393dc26eb
commit 8910efadfa
1017 changed files with 48557 additions and 10431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/custom_loadout/custom_items.dm
+2 -1
View File
@@ -364,10 +364,11 @@
worn_x_dimension = 64
worn_y_dimension = 34
/obj/item/bedsheet/custom/flagcape
/obj/item/clothing/neck/flagcape
name = "Flag Cape"
desc = "A truly patriotic form of heroic attire."
icon = 'icons/obj/custom.dmi'
resistance_flags = FLAMMABLE
alternate_worn_icon = 'icons/mob/custom_w.dmi'
icon_state = "flagcape"
item_state = "flagcape"
modular_citadel/code/modules/custom_loadout/read_from_file.dm
+9 -9
View File
@@ -13,18 +13,18 @@ GLOBAL_LIST(custom_item_list)
GLOB.custom_item_list = list()
var/list/file_lines = world.file2list(custom_filelist)
for(var/line in file_lines)
if(length(line) == 0) //Emptyline, no one cares.
if(!length(line)) //Emptyline, no one cares.
continue
if(copytext(line,1,3) == "//") //Commented line, ignore.
if(copytext(line,1,3) == "//") //Commented line, ignore. 3 == length("//") + 1
continue
var/ckey_str_sep = findtext(line, "|") //Process our stuff..
var/char_str_sep = findtext(line, "|", ckey_str_sep+1)
var/job_str_sep = findtext(line, "|", char_str_sep+1)
var/item_str_sep = findtext(line, "|", job_str_sep+1)
var/char_str_sep = findtext(line, "|", ckey_str_sep + length(ckey_str_sep))
var/job_str_sep = findtext(line, "|", char_str_sep + length(char_str_sep))
var/item_str_sep = findtext(line, "|", job_str_sep + length(job_str_sep))
var/ckey_str = ckey(copytext(line, 1, ckey_str_sep))
var/char_str = copytext(line, ckey_str_sep+1, char_str_sep)
var/job_str = copytext(line, char_str_sep+1, job_str_sep)
var/item_str = copytext(line, job_str_sep+1, item_str_sep)
var/char_str = copytext(line, ckey_str_sep + length(ckey_str_sep), char_str_sep)
var/job_str = copytext(line, char_str_sep + length(char_str_sep), job_str_sep)
var/item_str = copytext(line, job_str_sep + length(job_str_sep), item_str_sep)
if(!ckey_str || !char_str || !job_str || !item_str || !length(ckey_str) || !length(char_str) || !length(job_str) || !length(item_str))
log_admin("Errored custom_items_whitelist line: [line] - Component/separator missing!")
if(!islist(GLOB.custom_item_list[ckey_str]))
@@ -42,7 +42,7 @@ GLOBAL_LIST(custom_item_list)
for(var/item_string in item_strings)
var/path_str_sep = findtext(item_string, "=")
var/path = copytext(item_string, 1, path_str_sep) //Path to spawn
var/amount = copytext(item_string, path_str_sep+1) //Amount to spawn
var/amount = copytext(item_string, path_str_sep + length(path_str_sep)) //Amount to spawn
//world << "DEBUG: Item string [item_string] processed"
amount = text2num(amount)
path = text2path(path)