diff --git a/baystation12.dme b/baystation12.dme index 5e837b628c6..5f69e8ea441 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -17,7 +17,6 @@ #include "code\world.dm" #include "code\__defines\admin.dm" #include "code\__defines\atmos.dm" -#include "code\__defines\chemical_effects.dm" #include "code\__defines\chemistry.dm" #include "code\__defines\damage_organs.dm" #include "code\__defines\dna.dm" @@ -30,23 +29,23 @@ #include "code\__defines\research.dm" #include "code\__defines\species.dm" #include "code\__defines\species_languages.dm" -#include "code\_HELPERS\datum_pool.dm" -#include "code\_HELPERS\files.dm" -#include "code\_HELPERS\game.dm" -#include "code\_HELPERS\global_lists.dm" -#include "code\_HELPERS\icons.dm" -#include "code\_HELPERS\lists.dm" -#include "code\_HELPERS\logging.dm" -#include "code\_HELPERS\maths.dm" -#include "code\_HELPERS\mobs.dm" -#include "code\_HELPERS\names.dm" -#include "code\_HELPERS\sanitize_values.dm" -#include "code\_HELPERS\text.dm" -#include "code\_HELPERS\time.dm" -#include "code\_HELPERS\turfs.dm" -#include "code\_HELPERS\type2type.dm" -#include "code\_HELPERS\unsorted.dm" -#include "code\_HELPERS\vector.dm" +#include "code\_helpers\datum_pool.dm" +#include "code\_helpers\files.dm" +#include "code\_helpers\game.dm" +#include "code\_helpers\global_lists.dm" +#include "code\_helpers\icons.dm" +#include "code\_helpers\lists.dm" +#include "code\_helpers\logging.dm" +#include "code\_helpers\maths.dm" +#include "code\_helpers\mobs.dm" +#include "code\_helpers\names.dm" +#include "code\_helpers\sanitize_values.dm" +#include "code\_helpers\text.dm" +#include "code\_helpers\time.dm" +#include "code\_helpers\turfs.dm" +#include "code\_helpers\type2type.dm" +#include "code\_helpers\unsorted.dm" +#include "code\_helpers\vector.dm" #include "code\_onclick\adjacent.dm" #include "code\_onclick\ai.dm" #include "code\_onclick\click.dm" diff --git a/code/__defines/atmos.dm b/code/__defines/atmos.dm index 36bd1dd2be0..bb673f63fe5 100644 --- a/code/__defines/atmos.dm +++ b/code/__defines/atmos.dm @@ -81,12 +81,6 @@ #define HEATPIPERATE 8 // Heat-exchange pipe insulation. #define FLOWFRAC 0.99 // Fraction of gas transfered per process. -#define GAS_O2 (1 << 0) -#define GAS_N2 (1 << 1) -#define GAS_PL (1 << 2) -#define GAS_CO2 (1 << 3) -#define GAS_N2O (1 << 4) - //Flags for zone sleeping #define ZONE_ACTIVE 1 #define ZONE_SLEEPING 0 diff --git a/code/__defines/chemical_effects.dm b/code/__defines/chemical_effects.dm deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/code/__defines/chemistry.dm b/code/__defines/chemistry.dm index 6609bfbcc08..7091ea81d72 100644 --- a/code/__defines/chemistry.dm +++ b/code/__defines/chemistry.dm @@ -30,4 +30,10 @@ #define CE_PAINKILLER "painkiller" #define CE_ALCOHOL "alcohol" // Liver filtering #define CE_ALCOHOL_TOXIC "alcotoxic" // Liver damage -#define CE_SPEEDBOOST "gofast" // Hyperzine \ No newline at end of file +#define CE_SPEEDBOOST "gofast" // Hyperzine + +// Chemistry lists. +var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate. +var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") // Decrease heart rate. +var/list/heartstopper = list("potassium_phorochloride", "zombie_powder") // This stops the heart. +var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional diff --git a/code/__defines/dna.dm b/code/__defines/dna.dm index 3ea97e74a88..2e1e9da0ccd 100644 --- a/code/__defines/dna.dm +++ b/code/__defines/dna.dm @@ -40,4 +40,37 @@ // sdisabilities #define BLIND 1 #define MUTE 2 -#define DEAF 4 \ No newline at end of file +#define DEAF 4 + +// The way blocks are handled badly needs a rewrite, this is horrible. +// Too much of a project to handle at the moment, TODO for later. +var/BLINDBLOCK = 0 +var/DEAFBLOCK = 0 +var/HULKBLOCK = 0 +var/TELEBLOCK = 0 +var/FIREBLOCK = 0 +var/XRAYBLOCK = 0 +var/CLUMSYBLOCK = 0 +var/FAKEBLOCK = 0 +var/COUGHBLOCK = 0 +var/GLASSESBLOCK = 0 +var/EPILEPSYBLOCK = 0 +var/TWITCHBLOCK = 0 +var/NERVOUSBLOCK = 0 +var/MONKEYBLOCK = STRUCDNASIZE + +var/BLOCKADD = 0 +var/DIFFMUT = 0 + +var/HEADACHEBLOCK = 0 +var/NOBREATHBLOCK = 0 +var/REMOTEVIEWBLOCK = 0 +var/REGENERATEBLOCK = 0 +var/INCREASERUNBLOCK = 0 +var/REMOTETALKBLOCK = 0 +var/MORPHBLOCK = 0 +var/BLENDBLOCK = 0 +var/HALLUCINATIONBLOCK = 0 +var/NOPRINTSBLOCK = 0 +var/SHOCKIMMUNITYBLOCK = 0 +var/SMALLSIZEBLOCK = 0 diff --git a/code/__defines/gamemode.dm b/code/__defines/gamemode.dm index 9efb8dc26f0..936d80890d7 100644 --- a/code/__defines/gamemode.dm +++ b/code/__defines/gamemode.dm @@ -1,4 +1,3 @@ - #define GAME_STATE_PREGAME 1 #define GAME_STATE_SETTING_UP 2 #define GAME_STATE_PLAYING 3 @@ -59,6 +58,7 @@ var/list/be_special_flags = list( #define ANTAG_RANDSPAWN 256 // Potentially randomly spawns due to events. #define ANTAG_VOTABLE 512 // Can be voted as an additional antagonist before roundstart. #define ANTAG_SET_APPEARANCE 1024 // Causes antagonists to use an appearance modifier on spawn. + // Mode/antag template macros. #define MODE_BORER "borer" #define MODE_XENOMORPH "xeno" diff --git a/code/__defines/items_clothing.dm b/code/__defines/items_clothing.dm index 13a79f6b1c9..7a461cedf6c 100644 --- a/code/__defines/items_clothing.dm +++ b/code/__defines/items_clothing.dm @@ -2,6 +2,8 @@ #define SHOES_SLOWDOWN -1.0 // How much shoes slow you down by default. Negative values speed you up. +#define CANDLE_LUM 3 // For how bright candles are. + // Item inventory slot bitmasks. #define SLOT_OCLOTHING 1 #define SLOT_ICLOTHING 2 @@ -120,8 +122,6 @@ #define HANDS 6144 // HAND_LEFT | HAND_RIGHT #define FULL_BODY 8191 -#define CANDLE_LUM 3 // For how bright candles are. - // Bitflags for the percentual amount of protection a piece of clothing which covers the body part offers. // Used with human/proc/get_heat_protection() and human/proc/get_cold_protection(). // The values here should add up to 1, e.g., the head has 30% protection. diff --git a/code/__defines/machinery.dm b/code/__defines/machinery.dm index aabe5d599f2..978d88fd956 100644 --- a/code/__defines/machinery.dm +++ b/code/__defines/machinery.dm @@ -1,3 +1,9 @@ +var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manually after an event. + +var/CELLRATE = 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) + // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided +var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second) + // Doors! #define DOOR_CRUSH_DAMAGE 10 #define ALIEN_SELECT_AFK_BUFFER 1 // How many minutes that a person can be AFK before not being allowed to be an alien. @@ -24,6 +30,8 @@ #define AI_CAMERA_LUMINOSITY 6 +// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. +var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret") // Camera networks #define NETWORK_CRESCENT "Crescent" diff --git a/code/__defines/math_physics.dm b/code/__defines/math_physics.dm index 8a702d82104..9b339d40669 100644 --- a/code/__defines/math_physics.dm +++ b/code/__defines/math_physics.dm @@ -14,20 +14,16 @@ #define RADIATOR_OPTIMUM_PRESSURE 3771 // kPa at 20 C. This should be higher as gases aren't great conductors until they are dense. Used the critical pressure for air. #define GAS_CRITICAL_TEMPERATURE 132.65 // K. The critical point temperature for air. -/* - The pipe looks to be thin vertically and wide horizontally, so we'll assume that it's - three centimeters thick, one meter wide, and only explosed to the sun 3 degrees off of edge-on. - Since the radiatior is uniform along it's length, the ratio of surface area touched by sunlight - to the total surface area is the same as the ratio of the perimeter of the cross-section. -*/ #define RADIATOR_EXPOSED_SURFACE_AREA_RATIO 0.04 // (3 cm + 100 cm * sin(3deg))/(2*(3+100 cm)). Unitless ratio. #define T0C 273.15 // 0.0 degrees celcius #define T20C 293.15 // 20.0 degrees celcius #define TCMB 2.7 // -270.3 degrees celcius - #define CLAMP01(x) max(0, min(1, x)) #define QUANTIZE(variable) (round(variable,0.0001)) -#define INFINITY 1.#INF \ No newline at end of file +#define INFINITY 1.#INF + +#define TICKS_IN_DAY 24*60*60*10 +#define TICKS_IN_SECOND 10 \ No newline at end of file diff --git a/code/__defines/misc.dm b/code/__defines/misc.dm index 6e95dc116a6..fdaa07c594b 100644 --- a/code/__defines/misc.dm +++ b/code/__defines/misc.dm @@ -73,9 +73,7 @@ #define COLOR_WHITE "#FFFFFF" #define COLOR_BLACK "#000000" -/* - * Shuttles. -*/ +// Shuttles. // These define the time taken for the shuttle to get to the space station, and the time before it leaves again. #define SHUTTLE_PREPTIME 300 // 5 minutes = 300 seconds - after this time, the shuttle departs centcom and cannot be recalled. @@ -95,11 +93,6 @@ #define WAIT_ARRIVE 3 #define WAIT_FINISH 4 - -#define BACKGROUND_ENABLED 0 // The default value for all uses of set background. Set background can - // cause gradual lag and is recommended you only turn this on if necessary. - // 1 will enable set background. 0 will disable set background. - // Setting this much higher than 1024 could allow spammers to DOS the server easily. #define MAX_MESSAGE_LEN 1024 #define MAX_PAPER_MESSAGE_LEN 3072 diff --git a/code/game/gamemodes/cult/narsie.dm b/code/game/gamemodes/cult/narsie.dm index 4dbbb4ce2f3..4a129741174 100644 --- a/code/game/gamemodes/cult/narsie.dm +++ b/code/game/gamemodes/cult/narsie.dm @@ -70,8 +70,6 @@ var/global/list/narsie_list = list() mezzer() /obj/singularity/narsie/large/eat() - set background = BACKGROUND_ENABLED - for (var/turf/A in orange(consume_range, src)) consume(A) @@ -355,8 +353,6 @@ var/global/list/narsie_list = list() grav_pull = 0 /obj/singularity/narsie/wizard/eat() - set background = BACKGROUND_ENABLED - for (var/turf/T in trange(consume_range, src)) consume(T) diff --git a/code/game/gamemodes/events.dm b/code/game/gamemodes/events.dm index d49247263f9..3753bee1518 100644 --- a/code/game/gamemodes/events.dm +++ b/code/game/gamemodes/events.dm @@ -102,6 +102,8 @@ if(15) communications_blackout() */ +var/eventchance = 10 // Percent chance per 5 minutes. +var/hadevent = 0 /proc/appendicitis() for(var/mob/living/carbon/human/H in living_mob_list) diff --git a/code/game/gamemodes/events/miniblob.dm b/code/game/gamemodes/events/miniblob.dm index 93fbbb8c2dd..28b482414a2 100644 --- a/code/game/gamemodes/events/miniblob.dm +++ b/code/game/gamemodes/events/miniblob.dm @@ -1,3 +1,5 @@ +var/blobevent = 0 + /proc/mini_blob_event() var/turf/T = pick(blobstart) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 06d9b291a2d..293631f2a84 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -1,6 +1,6 @@ /var/const/meteor_wave_delay = 625 //minimum wait between waves in tenths of seconds //set to at least 100 unless you want evarr ruining every round - +/var/wavesecret = 0 /var/const/meteors_in_wave = 50 /var/const/meteors_in_small_wave = 10 @@ -161,7 +161,7 @@ if(istype(W, /obj/item/weapon/pickaxe)) qdel(src) return - ..() + ..() /obj/effect/meteor/touch_map_edge() - qdel(src) + qdel(src) diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 1c5c8766de9..4ea2f416f77 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -417,8 +417,6 @@ /obj/machinery/porta_turret/process() //the main machinery process - set background = BACKGROUND_ENABLED - if(cover == null && anchored) //if it has no cover and is anchored if(stat & BROKEN) //if the turret is borked qdel(cover) //delete its cover, assuming it has one. Workaround for a pesky little bug diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index 6ca10456713..aeac044f38e 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -11,16 +11,6 @@ invisibility = 101 switch(name) //some of these are probably obsolete - if("shuttle") - shuttle_z = z - qdel(src) - return - if("airtunnel_stop") - airtunnel_stop = x - if("airtunnel_start") - airtunnel_start = x - if("airtunnel_bottom") - airtunnel_bottom = y if("monkey") monkeystart += loc qdel(src) diff --git a/code/global.dm b/code/global.dm index bfb1806b809..6455ff02ecf 100644 --- a/code/global.dm +++ b/code/global.dm @@ -13,82 +13,16 @@ var/global/list/active_diseases = list() var/global/list/med_hud_users = list() // List of all entities using a medical HUD. var/global/list/sec_hud_users = list() // List of all entities using a security HUD. -// Those networks can only be accessed by pre-existing terminals. AIs and new terminals can't use them. -var/list/restricted_camera_networks = list("thunder","ERT","NUKE","Secret") var/global/list/global_mutations = list() // List of hidden mutation things. -var/global/defer_powernet_rebuild = 0 // True if net rebuild will be called manually after an event. - -// The resulting sector map looks like: -// ___ ___ -// | 1 | 4 | -// ---+--- -// | 5 | 3 | -// --- --- -// -// 1: SS13. -// 4: Derelict. -// 3: AI satellite. -// 5: Empty space. var/global/datum/universal_state/universe = new var/global/list/global_map = null -//var/global/list/global_map = list(list(1,5),list(4,3)) // Noises made when hit while typing. var/list/hit_appends = list("-OOF", "-ACK", "-UGH", "-HRNK", "-HURGH", "-GLORF") -var/list/paper_tag_whitelist = list( - "center", "p", "div", "span", "pre", "h1", "h2", "h3", "h4", "h5", "h6", "br", "hr", - "big", "small", "font", "i", "u", "b", "s", "sub", "sup", "tt", "ol", "ul", "li", - "caption", "col", "table", "td", "th", "tr" -) -var/list/paper_blacklist = list( - "java", "onblur", "onchange", "onclick", "ondblclick", "onselect", "onfocus", - "onsubmit", "onreset", "onload", "onunload", "onkeydown", "onkeyup", "onkeypress", - "onmousedown", "onmouseup", "onmousemove", "onmouseout", "onmouseover", -) - -// The way blocks are handled badly needs a rewrite, this is horrible. -// Too much of a project to handle at the moment, TODO for later. -var/BLINDBLOCK = 0 -var/DEAFBLOCK = 0 -var/HULKBLOCK = 0 -var/TELEBLOCK = 0 -var/FIREBLOCK = 0 -var/XRAYBLOCK = 0 -var/CLUMSYBLOCK = 0 -var/FAKEBLOCK = 0 -var/COUGHBLOCK = 0 -var/GLASSESBLOCK = 0 -var/EPILEPSYBLOCK = 0 -var/TWITCHBLOCK = 0 -var/NERVOUSBLOCK = 0 -var/MONKEYBLOCK = 27 - -var/BLOCKADD = 0 -var/DIFFMUT = 0 - -var/HEADACHEBLOCK = 0 -var/NOBREATHBLOCK = 0 -var/REMOTEVIEWBLOCK = 0 -var/REGENERATEBLOCK = 0 -var/INCREASERUNBLOCK = 0 -var/REMOTETALKBLOCK = 0 -var/MORPHBLOCK = 0 -var/BLENDBLOCK = 0 -var/HALLUCINATIONBLOCK = 0 -var/NOPRINTSBLOCK = 0 -var/SHOCKIMMUNITYBLOCK = 0 -var/SMALLSIZEBLOCK = 0 - -var/skipupdate = 0 - -var/eventchance = 10 // Percent chance per 5 minutes. -var/event = 0 -var/hadevent = 0 -var/blobevent = 0 var/diary = null var/href_logfile = null @@ -97,14 +31,11 @@ var/game_version = "Baystation12" var/changelog_hash = "" var/game_year = (text2num(time2text(world.realtime, "YYYY")) + 544) -var/going = 1.0 +var/roundstart_nodelay = 1 var/master_mode = "extended" // "extended" var/secret_force_mode = "secret" // if this is anything but "secret", the secret rotation will forceably choose this mode. -var/host = null -var/shuttle_frozen = 0 -var/shuttle_left = 0 -var/shuttlecoming = 0 +var/host = null //only here until check @ code\modules\ghosttrap\trap.dm:112 is fixed var/list/jobMax = list() var/list/bombers = list() @@ -112,19 +43,9 @@ var/list/admin_log = list() var/list/lastsignalers = list() // Keeps last 100 signals here in format: "[src] used \ref[src] @ location [src.loc]: [freq]/[code]" var/list/lawchanges = list() // Stores who uploaded laws to which silicon-based lifeform, and what the law was. var/list/reg_dna = list() -//var/list/traitobj = list() var/mouse_respawn_time = 5 // Amount of time that must pass between a player dying as a mouse and repawning as a mouse. In minutes. -var/CELLRATE = 0.002 // Multiplier for watts per tick <> cell storage (e.g., 0.02 means if there is a load of 1000 watts, 20 units will be taken from a cell per second) - // It's a conversion constant. power_used*CELLRATE = charge_provided, or charge_used/CELLRATE = power_provided -var/CHARGELEVEL = 0.0005 // Cap for how fast cells charge, as a percentage-per-tick (0.01 means cellcharge is capped to 1% per second) - -var/shuttle_z = 2 // Default. -var/airtunnel_start = 68 // Default. -var/airtunnel_stop = 68 // Default. -var/airtunnel_bottom = 72 // Default. - var/list/monkeystart = list() var/list/wizardstart = list() var/list/newplayer_start = list() @@ -138,7 +59,6 @@ var/list/latejoin_cyborg = list() var/list/prisonwarp = list() // Prisoners go to these var/list/holdingfacility = list() // Captured people go here var/list/xeno_spawn = list() // Aliens spawn at at these. -//var/list/mazewarp = list() var/list/tdome1 = list() var/list/tdome2 = list() var/list/tdomeobserve = list() @@ -147,7 +67,6 @@ var/list/prisonsecuritywarp = list() // Prison security goes to these. var/list/prisonwarped = list() // List of players already warped. var/list/blobstart = list() var/list/ninjastart = list() -//var/list/traitors = list() // Traitor list. var/list/cardinal = list(NORTH, SOUTH, EAST, WEST) var/list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST) @@ -168,17 +87,14 @@ var/list/adminlog = list() var/list/powernets = list() -var/Debug = 0 // Global debug switch. var/Debug2 = 0 var/datum/debug/debugobj var/datum/moduletypes/mods = new() -var/wavesecret = 0 var/gravity_is_on = 1 var/join_motd = null -var/forceblob = 0 var/datum/nanomanager/nanomanager = new() // NanoManager, the manager for Nano UIs. var/datum/event_manager/event_manager = new() // Event Manager, the manager for events. @@ -225,11 +141,6 @@ var/DBConnection/dbcon_old = new() // /tg/station database (Old database) -- see // Added for Xenoarchaeology, might be useful for other stuff. var/global/list/alphabet_uppercase = list("A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z") -// Chemistry lists. -var/list/tachycardics = list("coffee", "inaprovaline", "hyperzine", "nitroglycerin", "thirteenloko", "nicotine") // Increase heart rate. -var/list/bradycardics = list("neurotoxin", "cryoxadone", "clonexadone", "space_drugs", "stoxin") // Decrease heart rate. -var/list/heartstopper = list("potassium_phorochloride", "zombie_powder") // This stops the heart. -var/list/cheartstopper = list("potassium_chloride") // This stops the heart when overdose is met. -- c = conditional // Used by robots and robot preferences. var/list/robot_module_types = list( @@ -265,7 +176,4 @@ var/max_explosion_range = 14 // Announcer intercom, because too much stuff creates an intercom for one message then hard del()s it. var/global/obj/item/device/radio/intercom/global_announcer = new(null) -var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") - -var/global/const/TICKS_IN_DAY = 864000 -var/global/const/TICKS_IN_SECOND = 10 +var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Civilian") \ No newline at end of file diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm index b02875304e8..d2899e4b8a3 100644 --- a/code/modules/client/client procs.dm +++ b/code/modules/client/client procs.dm @@ -148,9 +148,6 @@ src << "[custom_event_msg]" src << "
" - if( (world.address == address || !address) && !host ) - host = key - world.update_status() if(holder) add_admin_verbs() diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index b2ff53ba908..38f1bca254f 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -495,10 +495,6 @@ default behaviour is: if(!( isturf(pulling.loc) )) stop_pulling() return - else - if(Debug) - log_debug("pulling disappeared? at [__LINE__] in mob.dm - pulling = [pulling]") - log_debug("REPORT THIS") ///// if(pulling && pulling.anchored) diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm index 55b4fad1a47..76cdf04f0ad 100644 --- a/code/modules/power/singularity/singularity.dm +++ b/code/modules/power/singularity/singularity.dm @@ -270,8 +270,6 @@ return 1 /obj/singularity/proc/eat() - set background = BACKGROUND_ENABLED - for(var/atom/X in orange(grav_pull, src)) var/dist = get_dist(X, src) var/obj/singularity/S = src diff --git a/code/world.dm b/code/world.dm index 9c78a38ceca..e53096574e3 100644 --- a/code/world.dm +++ b/code/world.dm @@ -1,7 +1,7 @@ /* The initialization of the game happens roughly like this: - + 1. All global variables are initialized (including the global_init instance). 2. The map is initialized, and map objects are created. 3. world/New() runs, creating the process scheduler (and the old master controller) and spawning their setup. @@ -18,7 +18,7 @@ var/global/datum/global_init/init = new () makeDatumRefLists() load_configuration() - + initialize_chemical_reagents() initialize_chemical_reactions() @@ -342,13 +342,8 @@ var/world_topic_spam_protect_time = world.timeofday else if (n > 0) features += "~[n] player" - /* - is there a reason for this? the byond site shows 'hosted by X' when there is a proper host already. - if (host) - features += "hosted by [host]" - */ - if (!host && config && config.hostedby) + if (config && config.hostedby) features += "hosted by [config.hostedby]" if (features)