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

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
LetterJay
2017-04-25 03:27:32 -05:00
parent 3fc34d1ded 8c56b5645b
commit 306e7c1cba
18 changed files with 65 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/map_files/CitadelStation/CitadelStation-1.2.1.dmm
+3 -3
View File
@@ -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"})
code/__HELPERS/type2type.dm
+3 -3
View File
@@ -72,8 +72,8 @@
return .
//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
@@ -537,4 +537,4 @@
/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)
return rgb(the_matrix[1]*255, the_matrix[6]*255, the_matrix[11]*255, the_matrix[16]*255)
code/_globalvars/lists/names.dm
+18 -18
View File
@@ -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
code/controllers/configuration.dm
+3 -3
View File
@@ -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
code/controllers/subsystem/ticker.dm
+3 -3
View File
@@ -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)
@@ -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)
code/controllers/subsystem/ticker.dm.rej
+10
View File
@@ -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)
code/datums/ai_laws.dm
+1 -1
View File
@@ -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))
code/datums/helper_datums/getrev.dm
+2 -2
View File
@@ -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
code/datums/helper_datums/getrev.dm.rej
+10
View File
@@ -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
code/game/objects/items/weapons/AI_modules.dm
+1 -1
View File
@@ -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))
code/modules/admin/admin_ranks.dm
+2 -2
View File
@@ -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)
code/modules/admin/verbs/deadsay.dm
+1 -1
View File
@@ -19,7 +19,7 @@
if (!msg)
return
var/nicknames = file2list("config/admin_nicknames.txt")
var/nicknames = world.file2list("config/admin_nicknames.txt")
var/rendered = "<span class='game deadsay'><span class='prefix'>DEAD:</span> <span class='name'>ADMIN([src.holder.fakekey ? pick(nicknames) : src.key])</span> says, <span class='message'>\"[msg]\"</span></span>"
code/modules/admin/whitelist.dm
+1 -1
View File
@@ -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))
code/modules/awaymissions/zlevel.dm
+1 -1
View File
@@ -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
code/modules/games/cas.dm
+1 -1
View File
@@ -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
code/world.dm
+2 -2
View File
@@ -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]
tools/Redirector/Configurations.dm
+2 -2
View File
@@ -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)
tools/Redirector/textprocs.dm
+1 -1
View File
@@ -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