diff --git a/_build_dependencies.sh b/_build_dependencies.sh index 18ecd657cd2..24a33ed3644 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -8,4 +8,4 @@ export PHP_VERSION=5.6 # Byond Major export BYOND_MAJOR=513 # Byond Minor -export BYOND_MAJOR=1505 +export BYOND_MINOR=1505 diff --git a/code/__DEFINES/logs.dm b/code/__DEFINES/logs.dm index a8a4a457c7c..25d1fac7323 100644 --- a/code/__DEFINES/logs.dm +++ b/code/__DEFINES/logs.dm @@ -3,4 +3,4 @@ #define CONVERSION_LOG "Conversion" #define SAY_LOG "Say" #define EMOTE_LOG "Emote" -#define MISC_LOG "Misc" \ No newline at end of file +#define MISC_LOG "Misc" diff --git a/code/datums/diseases/critical.dm b/code/datums/diseases/critical.dm index 8dc910e3baf..3afb48ce534 100644 --- a/code/datums/diseases/critical.dm +++ b/code/datums/diseases/critical.dm @@ -199,4 +199,4 @@ affected_mob.emote("collapse") if(prob(12)) to_chat(affected_mob, "You feel [pick("tired", "exhausted", "sluggish")].") - affected_mob.Slowed(rand(4, 16)) \ No newline at end of file + affected_mob.Slowed(rand(4, 16)) diff --git a/code/game/gamemodes/miniantags/abduction/abduction.dm b/code/game/gamemodes/miniantags/abduction/abduction.dm index 1888d0e4a1d..60de5ba4238 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction.dm @@ -282,4 +282,4 @@ /datum/game_mode/proc/update_abductor_icons_removed(datum/mind/alien_mind) var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_ABDUCTOR] hud.leave_hud(alien_mind.current) - set_antag_hud(alien_mind.current, null) \ No newline at end of file + set_antag_hud(alien_mind.current, null) diff --git a/code/game/gamemodes/wizard/rightandwrong.dm b/code/game/gamemodes/wizard/rightandwrong.dm index 3dbd9211399..82f6d833d16 100644 --- a/code/game/gamemodes/wizard/rightandwrong.dm +++ b/code/game/gamemodes/wizard/rightandwrong.dm @@ -168,4 +168,4 @@ GLOBAL_VAR_INIT(summon_magic_triggered, FALSE) if(summon_type == SUMMON_MAGIC) give_magic(H) else - give_guns(H) \ No newline at end of file + give_guns(H) diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index d8b948fc865..de9a9209925 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -431,4 +431,4 @@ if("l_hand") . = "left hand" if("r_hand") - . = "right hand" \ No newline at end of file + . = "right hand" diff --git a/code/modules/mob/living/carbon/human/species/slime.dm b/code/modules/mob/living/carbon/human/species/slime.dm index 622e0919b45..3a3f4c3d3ac 100644 --- a/code/modules/mob/living/carbon/human/species/slime.dm +++ b/code/modules/mob/living/carbon/human/species/slime.dm @@ -198,4 +198,4 @@ #undef SLIMEPERSON_HUNGERCOST #undef SLIMEPERSON_MINHUNGER -#undef SLIMEPERSON_REGROWTHDELAY \ No newline at end of file +#undef SLIMEPERSON_REGROWTHDELAY diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index d93b2723024..d08ef11db0f 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1413,4 +1413,4 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \ ///Force set the mob nutrition /mob/proc/set_nutrition(change) - nutrition = max(0, change) \ No newline at end of file + nutrition = max(0, change) diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 2f074aeaa9f..ef972ec97b3 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -211,4 +211,4 @@ var/list/tkgrabbed_objects = list() // Assoc list of items to TK grabs var/forced_look = null // This can either be a numerical direction or a soft object reference (UID). It makes the mob always face towards the selected thing. - var/registered_z \ No newline at end of file + var/registered_z diff --git a/goon/browserassets/html/browserOutput.html b/goon/browserassets/html/browserOutput.html index a7dfb16abee..ed2c77a306c 100644 --- a/goon/browserassets/html/browserOutput.html +++ b/goon/browserassets/html/browserOutput.html @@ -15,7 +15,7 @@ - + diff --git a/goon/browserassets/json/unicode_9_annotations.json b/goon/browserassets/js/unicode_9_annotations.js similarity index 99% rename from goon/browserassets/json/unicode_9_annotations.json rename to goon/browserassets/js/unicode_9_annotations.js index 50b00d32116..483e08d47ff 100644 --- a/goon/browserassets/json/unicode_9_annotations.json +++ b/goon/browserassets/js/unicode_9_annotations.js @@ -1487,4 +1487,4 @@ var UNICODE_9_EMOJI = { "zimbabwe": "πŸ‡ΏπŸ‡Ό", "zipper_mouth_face": "🀐", "zzz": "πŸ’€" -}; \ No newline at end of file +}; diff --git a/goon/code/datums/browserOutput.dm b/goon/code/datums/browserOutput.dm index e85d8e2368a..7f39a366588 100644 --- a/goon/code/datums/browserOutput.dm +++ b/goon/code/datums/browserOutput.dm @@ -4,6 +4,7 @@ var/list/chatResources = list( "goon/browserassets/js/json2.min.js", "goon/browserassets/js/twemoji.min.js", "goon/browserassets/js/browserOutput.js", + "goon/browserassets/js/unicode_9_annotations.json", "goon/browserassets/css/fonts/fontawesome-webfont.eot", "goon/browserassets/css/fonts/fontawesome-webfont.svg", "goon/browserassets/css/fonts/fontawesome-webfont.ttf", @@ -12,7 +13,6 @@ var/list/chatResources = list( "goon/browserassets/css/font-awesome.css", "goon/browserassets/css/browserOutput.css", "goon/browserassets/css/browserOutput-dark.css", - "goon/browserassets/json/unicode_9_annotations.json", "goon/browserassets/html/saveInstructions.html" )