From 607868a5dee2f8605eea8df406844885ac4b8abb Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Tue, 25 Apr 2017 01:31:50 -0500 Subject: [PATCH 1/6] [s]Exploit whack-a-mole --- code/__HELPERS/type2type.dm.rej | 10 ++++++ code/_globalvars/lists/names.dm | 36 +++++++++---------- code/controllers/configuration.dm | 6 ++-- code/controllers/subsystem/ticker.dm | 4 +-- code/controllers/subsystem/ticker.dm.rej | 10 ++++++ code/datums/ai_laws.dm | 2 +- code/datums/helper_datums/getrev.dm.rej | 10 ++++++ code/game/objects/items/weapons/AI_modules.dm | 2 +- code/modules/admin/admin_ranks.dm | 4 +-- code/modules/admin/verbs/deadsay.dm | 2 +- code/modules/admin/whitelist.dm | 2 +- code/modules/awaymissions/zlevel.dm | 2 +- code/modules/games/cas.dm | 2 +- code/world.dm | 4 +-- tools/Redirector/Configurations.dm | 4 +-- tools/Redirector/textprocs.dm | 2 +- 16 files changed, 66 insertions(+), 36 deletions(-) create mode 100644 code/__HELPERS/type2type.dm.rej create mode 100644 code/controllers/subsystem/ticker.dm.rej create mode 100644 code/datums/helper_datums/getrev.dm.rej diff --git a/code/__HELPERS/type2type.dm.rej b/code/__HELPERS/type2type.dm.rej new file mode 100644 index 0000000000..dcbecaa236 --- /dev/null +++ b/code/__HELPERS/type2type.dm.rej @@ -0,0 +1,10 @@ +diff a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm (rejected hunks) +@@ -72,7 +72,7 @@ + return . + + //Splits the text of a file at seperator and returns them in a list. +-/proc/file2list(filename, seperator="\n") ++/world/proc/file2list(filename, seperator="\n") + return splittext(return_file_text(filename),seperator) + + diff --git a/code/_globalvars/lists/names.dm b/code/_globalvars/lists/names.dm index 5f189b8f94..15a0867667 100644 --- a/code/_globalvars/lists/names.dm +++ b/code/_globalvars/lists/names.dm @@ -1,23 +1,23 @@ -GLOBAL_LIST_INIT(ai_names, file2list("config/names/ai.txt")) -GLOBAL_LIST_INIT(wizard_first, file2list("config/names/wizardfirst.txt")) -GLOBAL_LIST_INIT(wizard_second, file2list("config/names/wizardsecond.txt")) -GLOBAL_LIST_INIT(ninja_titles, file2list("config/names/ninjatitle.txt")) -GLOBAL_LIST_INIT(ninja_names, file2list("config/names/ninjaname.txt")) -GLOBAL_LIST_INIT(commando_names, file2list("config/names/death_commando.txt")) -GLOBAL_LIST_INIT(first_names_male, file2list("config/names/first_male.txt")) -GLOBAL_LIST_INIT(first_names_female, file2list("config/names/first_female.txt")) -GLOBAL_LIST_INIT(last_names, file2list("config/names/last.txt")) -GLOBAL_LIST_INIT(lizard_names_male, file2list("config/names/lizard_male.txt")) -GLOBAL_LIST_INIT(lizard_names_female, file2list("config/names/lizard_female.txt")) -GLOBAL_LIST_INIT(clown_names, file2list("config/names/clown.txt")) -GLOBAL_LIST_INIT(mime_names, file2list("config/names/mime.txt")) -GLOBAL_LIST_INIT(carp_names, file2list("config/names/carp.txt")) -GLOBAL_LIST_INIT(golem_names, file2list("config/names/golem.txt")) -GLOBAL_LIST_INIT(plasmaman_names, file2list("config/names/plasmaman.txt")) +GLOBAL_LIST_INIT(ai_names, world.file2list("config/names/ai.txt")) +GLOBAL_LIST_INIT(wizard_first, world.file2list("config/names/wizardfirst.txt")) +GLOBAL_LIST_INIT(wizard_second, world.file2list("config/names/wizardsecond.txt")) +GLOBAL_LIST_INIT(ninja_titles, world.file2list("config/names/ninjatitle.txt")) +GLOBAL_LIST_INIT(ninja_names, world.file2list("config/names/ninjaname.txt")) +GLOBAL_LIST_INIT(commando_names, world.file2list("config/names/death_commando.txt")) +GLOBAL_LIST_INIT(first_names_male, world.file2list("config/names/first_male.txt")) +GLOBAL_LIST_INIT(first_names_female, world.file2list("config/names/first_female.txt")) +GLOBAL_LIST_INIT(last_names, world.file2list("config/names/last.txt")) +GLOBAL_LIST_INIT(lizard_names_male, world.file2list("config/names/lizard_male.txt")) +GLOBAL_LIST_INIT(lizard_names_female, world.file2list("config/names/lizard_female.txt")) +GLOBAL_LIST_INIT(clown_names, world.file2list("config/names/clown.txt")) +GLOBAL_LIST_INIT(mime_names, world.file2list("config/names/mime.txt")) +GLOBAL_LIST_INIT(carp_names, world.file2list("config/names/carp.txt")) +GLOBAL_LIST_INIT(golem_names, world.file2list("config/names/golem.txt")) +GLOBAL_LIST_INIT(plasmaman_names, world.file2list("config/names/plasmaman.txt")) GLOBAL_LIST_INIT(posibrain_names, list("PBU","HIU","SINA","ARMA","OSI","HBL","MSO","RR","CHRI","CDB","HG","XSI","ORNG","GUN","KOR","MET","FRE","XIS","SLI","PKP","HOG","RZH","GOOF","MRPR","JJR","FIRC","INC","PHL","BGB","ANTR","MIW","WJ","JRD","CHOC","ANCL","JLLO","JNLG","KOS","TKRG","XAL","STLP","CBOS","DUNC","FXMC","DRSD","COI")) -GLOBAL_LIST_INIT(verbs, file2list("config/names/verbs.txt")) -GLOBAL_LIST_INIT(adjectives, file2list("config/names/adjectives.txt")) +GLOBAL_LIST_INIT(verbs, world.file2list("config/names/verbs.txt")) +GLOBAL_LIST_INIT(adjectives, world.file2list("config/names/adjectives.txt")) //loaded on startup because of " //would include in rsc if ' was used diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index fe9d7c5bc5..fd3fe6d685 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -291,7 +291,7 @@ GLOB.abandon_allowed = respawn /datum/configuration/proc/load(filename, type = "config") //the type can also be game_options, in which case it uses a different switch. not making it separate to not copypaste code - Urist - var/list/Lines = file2list(filename) + var/list/Lines = world.file2list(filename) for(var/t in Lines) if(!t) @@ -785,7 +785,7 @@ /datum/configuration/proc/loadmaplist(filename) - var/list/Lines = file2list(filename) + var/list/Lines = world.file2list(filename) var/datum/map_config/currentmap = null for(var/t in Lines) @@ -835,7 +835,7 @@ /datum/configuration/proc/loadsql(filename) - var/list/Lines = file2list(filename) + var/list/Lines = world.file2list(filename) for(var/t in Lines) if(!t) continue diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index f16e8c1ea0..9d3345b18a 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -625,8 +625,8 @@ SUBSYSTEM_DEF(ticker) if(selected_tip) m = selected_tip else - var/list/randomtips = file2list("config/tips.txt") - var/list/memetips = file2list("config/sillytips.txt") + var/list/randomtips = world.file2list("config/tips.txt") + var/list/memetips = world.file2list("config/sillytips.txt") if(randomtips.len && prob(95)) m = pick(randomtips) else if(memetips.len) diff --git a/code/controllers/subsystem/ticker.dm.rej b/code/controllers/subsystem/ticker.dm.rej new file mode 100644 index 0000000000..5b12e61f52 --- /dev/null +++ b/code/controllers/subsystem/ticker.dm.rej @@ -0,0 +1,10 @@ +diff a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm (rejected hunks) +@@ -60,7 +60,7 @@ SUBSYSTEM_DEF(ticker) + var/list/round_start_events + + /datum/controller/subsystem/ticker/Initialize(timeofday) +- var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n") ++ var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") + login_music = pick(music) + + if(!GLOB.syndicate_code_phrase) diff --git a/code/datums/ai_laws.dm b/code/datums/ai_laws.dm index 9abd4df45e..8d817265e6 100644 --- a/code/datums/ai_laws.dm +++ b/code/datums/ai_laws.dm @@ -190,7 +190,7 @@ /datum/ai_laws/custom/New() //This reads silicon_laws.txt and allows server hosts to set custom AI starting laws. ..() - for(var/line in file2list("config/silicon_laws.txt")) + for(var/line in world.file2list("config/silicon_laws.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) diff --git a/code/datums/helper_datums/getrev.dm.rej b/code/datums/helper_datums/getrev.dm.rej new file mode 100644 index 0000000000..f4e397e03a --- /dev/null +++ b/code/datums/helper_datums/getrev.dm.rej @@ -0,0 +1,10 @@ +diff a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm (rejected hunks) +@@ -8,7 +8,7 @@ + /datum/getrev/New() + var/head_file = return_file_text(".git/logs/HEAD") + if(SERVERTOOLS && fexists("..\\prtestjob.lk")) +- var/list/tmp = file2list("..\\prtestjob.lk") ++ var/list/tmp = world.file2list("..\\prtestjob.lk") + for(var/I in tmp) + if(I) + testmerge |= I diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 9457682582..75fbf3a526 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -409,7 +409,7 @@ AI MODULES /obj/item/weapon/aiModule/core/full/custom/New() ..() - for(var/line in file2list("config/silicon_laws.txt")) + for(var/line in world.file2list("config/silicon_laws.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) diff --git a/code/modules/admin/admin_ranks.dm b/code/modules/admin/admin_ranks.dm index b23b4a5c36..b38cc4e289 100644 --- a/code/modules/admin/admin_ranks.dm +++ b/code/modules/admin/admin_ranks.dm @@ -105,7 +105,7 @@ GLOBAL_PROTECT(admin_ranks) if(config.admin_legacy_system) var/previous_rights = 0 //load text from file and process each line seperately - for(var/line in file2list("config/admin_ranks.txt")) + for(var/line in world.file2list("config/admin_ranks.txt")) if(!line) continue if(findtextEx(line,"#",1,2)) @@ -175,7 +175,7 @@ GLOBAL_PROTECT(admin_ranks) if(config.admin_legacy_system) //load text from file - var/list/lines = file2list("config/admins.txt") + var/list/lines = world.file2list("config/admins.txt") //process each line seperately for(var/line in lines) diff --git a/code/modules/admin/verbs/deadsay.dm b/code/modules/admin/verbs/deadsay.dm index a4ccfa9c48..8703784fc6 100644 --- a/code/modules/admin/verbs/deadsay.dm +++ b/code/modules/admin/verbs/deadsay.dm @@ -19,7 +19,7 @@ if (!msg) return - var/nicknames = file2list("config/admin_nicknames.txt") + var/nicknames = world.file2list("config/admin_nicknames.txt") var/rendered = "DEAD: ADMIN([src.holder.fakekey ? pick(nicknames) : src.key]) says, \"[msg]\"" diff --git a/code/modules/admin/whitelist.dm b/code/modules/admin/whitelist.dm index 7162789e3f..934e47aa23 100644 --- a/code/modules/admin/whitelist.dm +++ b/code/modules/admin/whitelist.dm @@ -5,7 +5,7 @@ GLOBAL_PROTECT(whitelist) /proc/load_whitelist() GLOB.whitelist = list() - for(var/line in file2list(WHITELISTFILE)) + for(var/line in world.file2list(WHITELISTFILE)) if(!line) continue if(findtextEx(line,"#",1,2)) diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm index a8ce80bb4a..d486bcb469 100644 --- a/code/modules/awaymissions/zlevel.dm +++ b/code/modules/awaymissions/zlevel.dm @@ -32,7 +32,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away /proc/generateMapList(filename) var/list/potentialMaps = list() - var/list/Lines = file2list(filename) + var/list/Lines = world.file2list(filename) if(!Lines.len) return diff --git a/code/modules/games/cas.dm b/code/modules/games/cas.dm index c34325c904..3858e633a2 100644 --- a/code/modules/games/cas.dm +++ b/code/modules/games/cas.dm @@ -28,7 +28,7 @@ card_text_file = "strings/cas_black.txt" /obj/item/toy/cards/deck/cas/New() - var/static/list/cards_against_space = list("cas_white" = file2list("strings/cas_white.txt"),"cas_black" = file2list("strings/cas_black.txt")) + var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt")) allcards = cards_against_space[card_face] var/list/possiblecards = allcards.Copy() if(possiblecards.len < decksize) // sanity check diff --git a/code/world.dm b/code/world.dm index 48129098e5..7af27a1504 100644 --- a/code/world.dm +++ b/code/world.dm @@ -17,7 +17,7 @@ log_world("World loaded at [time_stamp()]") #if (PRELOAD_RSC == 0) - external_rsc_urls = file2list("config/external_rsc_urls.txt","\n") + external_rsc_urls = world.file2list("config/external_rsc_urls.txt","\n") var/i=1 while(i<=external_rsc_urls.len) if(external_rsc_urls[i]) @@ -253,7 +253,7 @@ world << sound(round_end_sound) /world/proc/load_mode() - var/list/Lines = file2list("data/mode.txt") + var/list/Lines = world.file2list("data/mode.txt") if(Lines.len) if(Lines[1]) GLOB.master_mode = Lines[1] diff --git a/tools/Redirector/Configurations.dm b/tools/Redirector/Configurations.dm index bc0d56361c..9f537a6ae9 100644 --- a/tools/Redirector/Configurations.dm +++ b/tools/Redirector/Configurations.dm @@ -11,7 +11,7 @@ var/list/adminkeys = list() proc/gen_configs() - config_stream = dd_file2list("config.txt") + config_stream = dd_file2list("config.txt") var/server_gen = 0 // if the stream is looking for servers var/admin_gen = 0 // if the stream is looking for admins @@ -43,7 +43,7 @@ proc/gen_configs() // Generate the list of admins now for(var/file in adminfiles) - var/admin_config_stream = dd_file2list(file) + var/admin_config_stream = dd_file2list(file) for(var/line in admin_config_stream) diff --git a/tools/Redirector/textprocs.dm b/tools/Redirector/textprocs.dm index 07440f9f4a..350f967607 100644 --- a/tools/Redirector/textprocs.dm +++ b/tools/Redirector/textprocs.dm @@ -11,7 +11,7 @@ proc /////////////////// // Reading files // /////////////////// - dd_file2list(file_path, separator = "\n") + dd_file2list(file_path, separator = "\n") var/file if (isfile(file_path)) file = file_path From 3d51a072430f4d32b2d1189745ab5da7ac344111 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 01:52:49 -0500 Subject: [PATCH 2/6] world fix --- code/__HELPERS/type2type.dm | 6 +++--- code/controllers/subsystem/ticker.dm | 2 +- code/datums/helper_datums/getrev.dm | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index a8cf2ec3fd..b62ae4d9eb 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -69,11 +69,11 @@ else . = "0" + . i++ - return . +names.dmnames.dm //Splits the text of a file at seperator and returns them in a list. -/proc/file2list(filename, seperator="\n") - return splittext(file2text(filename),seperator) +/world/proc/file2list(filename, seperator="\n") + return splittext(file2text(filename),seperator) //Turns a direction into text diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 9d3345b18a..f701c051da 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -62,7 +62,7 @@ SUBSYSTEM_DEF(ticker) var/modevoted = FALSE //Have we sent a vote for the gamemode? /datum/controller/subsystem/ticker/Initialize(timeofday) - var/list/music = file2list(ROUND_START_MUSIC_LIST, "\n") + var/list/music = world.file2list(ROUND_START_MUSIC_LIST, "\n") login_music = pick(music) if(!GLOB.syndicate_code_phrase) diff --git a/code/datums/helper_datums/getrev.dm b/code/datums/helper_datums/getrev.dm index a9f1e8f6a0..f1b5d3a973 100644 --- a/code/datums/helper_datums/getrev.dm +++ b/code/datums/helper_datums/getrev.dm @@ -6,9 +6,9 @@ var/date /datum/getrev/New() - var/head_file = file2text(".git/logs/HEAD") + var/head_file = file2text(".git/logs/HEAD") if(SERVERTOOLS && fexists("..\\prtestjob.lk")) - var/list/tmp = file2list("..\\prtestjob.lk") + var/list/tmp = world.file2list("..\\prtestjob.lk") for(var/I in tmp) if(I) testmerge |= I From 31e8bee39eef4664372c76743c40924267cac9b6 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 01:54:53 -0500 Subject: [PATCH 3/6] Update type2type.dm --- code/__HELPERS/type2type.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index b62ae4d9eb..9e3178060c 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -69,7 +69,7 @@ else . = "0" + . i++ -names.dmnames.dm + return //Splits the text of a file at seperator and returns them in a list. /world/proc/file2list(filename, seperator="\n") @@ -537,4 +537,4 @@ names.dmnames.dm /proc/color_matrix2color_hex(list/the_matrix) if(!istype(the_matrix) || the_matrix.len != 20) return "#ffffffff" - return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255) \ No newline at end of file + return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255) From 9df952873b293cdba80ea1e8b0aa7dd8acd229f3 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 01:55:12 -0500 Subject: [PATCH 4/6] Update type2type.dm --- code/__HELPERS/type2type.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index 9e3178060c..9130eae7cb 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -69,7 +69,7 @@ else . = "0" + . i++ - return + return . //Splits the text of a file at seperator and returns them in a list. /world/proc/file2list(filename, seperator="\n") From 496107120f11678a6f542150148ae36fe73618d1 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 02:09:21 -0500 Subject: [PATCH 5/6] the fun never ends --- _maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm | 6 +++--- code/__HELPERS/type2type.dm | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm b/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm index 082133aa02..7553242b36 100644 --- a/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm +++ b/_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm @@ -864,7 +864,7 @@ "aqF" = (/obj/machinery/door/airlock{name = "Privacy Bunks";req_access_txt = "0"},/turf/open/floor/plasteel,/area/crew_quarters/sleep) "aqG" = (/obj/machinery/light{dir = 1},/turf/open/floor/plasteel,/area/crew_quarters/sleep) "aqH" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/open/floor/plasteel,/area/crew_quarters/sleep) -"aqI" = (/obj/machinery/door/airlock/titanium,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned) +"aqI" = (/obj/machinery/door/airlock/titanium,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) "aqJ" = (/obj/machinery/light{dir = 8},/turf/open/floor/plasteel/red/corner{dir = 1},/area/construction/hallway{name = "Secure Workstations Hallway"}) "aqK" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{req_access_txt = 1},/obj/structure/grille{density = 0;icon_state = "brokengrille"},/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"}) "aqL" = (/obj/structure/sink{icon_state = "sink";dir = 8;pixel_x = -12;pixel_y = 2},/obj/machinery/camera{c_tag = "Xenobiology South";dir = 4;network = list("SS13","RD")},/turf/open/floor/plasteel/white,/area/toxins/xenobiology) @@ -901,7 +901,7 @@ "arq" = (/obj/item/weapon/paint/green,/turf/open/floor/plating,/area/maintenance/fore) "arr" = (/obj/structure/window/reinforced{dir = 4},/obj/item/weapon/paint/yellow,/turf/open/floor/plating,/area/maintenance/fore) "ars" = (/obj/machinery/door/airlock/glass,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) -"art" = (/obj/machinery/door/airlock/glass,/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned) +"art" = (/obj/machinery/door/airlock/glass,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) "aru" = (/obj/structure/chair{dir = 4},/obj/effect/decal/remains/human,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) "arv" = (/obj/machinery/computer/shuttle/white_ship,/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) "arw" = (/obj/machinery/door/window/northleft{base_state = "right";dir = 8;icon_state = "right";name = "Containment Pen";req_access_txt = "55"},/obj/structure/cable{d1 = 1;d2 = 2;icon_state = "1-2";pixel_y = 0},/obj/machinery/door/poddoor/preopen{id = "xenobio1";name = "containment blast door"},/turf/open/floor/engine,/area/toxins/xenobiology) @@ -1054,7 +1054,7 @@ "aun" = (/obj/machinery/door/airlock{id_tag = "bunk15";name = "Bunk 15"},/turf/open/floor/carpet,/area/crew_quarters/sleep) "auo" = (/obj/machinery/door/airlock{id_tag = "bunk16";name = "Bunk 16"},/turf/open/floor/carpet,/area/crew_quarters/sleep) "aup" = (/obj/structure/bed,/obj/item/weapon/bedsheet,/obj/machinery/button/door{id = "bunk16";name = "Bunk Bolt Control 16";normaldoorcontrol = 1;pixel_x = 25;pixel_y = 0;req_access_txt = "0";specialfunctions = 4},/turf/open/floor/carpet,/area/crew_quarters/sleep) -"auq" = (/obj/structure/frame/computer{anchored = 1},/turf/open/floor/plasteel/shuttle/white,/area/shuttle/abandoned) +"auq" = (/obj/structure/frame/computer{anchored = 1},/turf/open/floor/mineral/titanium,/area/shuttle/abandoned) "aur" = (/obj/structure/closet/secure_closet/bar,/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"}) "aus" = (/obj/structure/chair{dir = 4},/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"}) "aut" = (/obj/structure/chair,/turf/open/floor/plating,/area/maintenance/fpmaint{name = "Secure Workstations Maintenance"}) diff --git a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm index b62ae4d9eb..03ea93e2e4 100644 --- a/code/__HELPERS/type2type.dm +++ b/code/__HELPERS/type2type.dm @@ -69,7 +69,7 @@ else . = "0" + . i++ -names.dmnames.dm + return . //Splits the text of a file at seperator and returns them in a list. /world/proc/file2list(filename, seperator="\n") From 76ed57f90c0a465642288f234b06dd367c71bc1f Mon Sep 17 00:00:00 2001 From: LetterJay Date: Tue, 25 Apr 2017 02:11:11 -0500 Subject: [PATCH 6/6] rej cleanup --- code/__HELPERS/type2type.dm.rej | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100644 code/__HELPERS/type2type.dm.rej diff --git a/code/__HELPERS/type2type.dm.rej b/code/__HELPERS/type2type.dm.rej deleted file mode 100644 index dcbecaa236..0000000000 --- a/code/__HELPERS/type2type.dm.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/code/__HELPERS/type2type.dm b/code/__HELPERS/type2type.dm (rejected hunks) -@@ -72,7 +72,7 @@ - return . - - //Splits the text of a file at seperator and returns them in a list. --/proc/file2list(filename, seperator="\n") -+/world/proc/file2list(filename, seperator="\n") - return splittext(return_file_text(filename),seperator) - -