Merge upstream

_maps/map_files/TgStation/tgstation.2.1.3.dmm

@@ -29169,13 +29169,11 @@
 	},
 /area/hallway/primary/central)
 "bnO" = (
-/obj/structure/table,
 /obj/machinery/newscaster/security_unit{
 	pixel_x = 0;
 	pixel_y = 32
 	},
-/obj/item/weapon/hand_labeler,
-/obj/item/stack/packageWrap,
+/obj/structure/filingcabinet/chestdrawer,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads)
 "bnP" = (
@@ -31259,7 +31257,7 @@
 	icon_state = "4-8";
 	pixel_x = 0
 	},
-/obj/structure/filingcabinet/chestdrawer,
+/obj/machinery/vending/cart,
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads)
 "brX" = (
@@ -33388,7 +33386,11 @@
 /area/crew_quarters/heads)
 "bwk" = (
 /obj/structure/table,
-/obj/item/weapon/book/manual/wiki/security_space_law,
+/obj/item/weapon/hand_labeler,
+/obj/item/stack/packageWrap{
+	pixel_x = -1;
+	pixel_y = -1
+	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/heads)
 "bwl" = (

code/__DEFINES/flags.dm

@@ -36,6 +36,12 @@
 #define INFORM_ADMINS_ON_RELOCATE "inform_admins_on_relocate"
 #define BANG_PROTECT "bang_protect"
 
+// A mob with OMNITONGUE has no restriction in the ability to speak
+// languages that they know. So even if they wouldn't normally be able to
+// through mob or tongue restrictions, this flag allows them to ignore
+// those restrictions.
+#define OMNITONGUE "omnitongue"
+
 //turf-only flags
 #define NOJAUNT		1
 #define UNUSED_TRANSIT_TURF 2
@@ -60,20 +66,6 @@
 #define GROUND 1
 #define FLYING 2
 
-
-/*
-	These defines are used specifically with the atom/movable/languages bitmask.
-	They are used in atom/movable/Hear() and atom/movable/say() to determine whether hearers can understand a message.
-*/
-#define HUMAN 1
-#define MONKEY 2
-#define ALIEN 4
-#define ROBOT 8
-#define SLIME 16
-#define DRONE 32
-#define SWARMER 64
-#define RATVAR 128
-
 // Flags for reagents
 #define REAGENT_NOREACT 1
 
@@ -85,3 +77,5 @@
 #define UNACIDABLE 16 //acid can't even appear on it, let alone melt it.
 #define ACID_PROOF 32 //acid stuck on it doesn't melt it.
 #define INDESTRUCTIBLE 64 //doesn't take damage
+
+// language secondary flags for atoms

code/__DEFINES/language.dm

@@ -0,0 +1,2 @@
+#define NO_STUTTER 1
+#define TONGUELESS_SPEECH 2

code/__DEFINES/lighting.dm

@@ -6,7 +6,7 @@
 #define LIGHTING_HEIGHT         1 // height off the ground of light sources on the pseudo-z-axis, you should probably leave this alone
 #define LIGHTING_ROUND_VALUE    1 / 128 //Value used to round lumcounts, values smaller than 1/255 don't matter (if they do, thanks sinking points), greater values will make lighting less precise, but in turn increase performance, VERY SLIGHTLY.
 
-#define LIGHTING_ICON 'icons/effects/lighting_object.png' // icon used for lighting shading effects
+#define LIGHTING_ICON 'icons/effects/lighting_object.dmi' // icon used for lighting shading effects
 
 // If the max of the lighting lumcounts of each spectrum drops below this, disable luminosity on the lighting objects.
 // Set to zero to disable soft lighting. Luminosity changes then work if it's lit at all.

code/__DEFINES/maps.dm

@@ -41,4 +41,6 @@ Last space-z level = empty
 #define ZLEVEL_EMPTY_SPACE 11
 
 #define ZLEVEL_SPACEMIN 3
-#define ZLEVEL_SPACEMAX 11
+#define ZLEVEL_SPACEMAX 11
+
+#define SPACERUIN_MAP_EDGE_PAD 15

code/__HELPERS/_lists.dm

@@ -65,7 +65,10 @@
 	if(!L || !L.len || !A)
 
 		return 0
-	return L[A.type]
+	if(ispath(A))
+		. = L[A]
+	else
+		. = L[A.type]
 
 //Checks for a string in a list
 /proc/is_string_in_list(string, list/L)

code/__HELPERS/flags.dm

@@ -1,3 +1,4 @@
 #define HAS_SECONDARY_FLAG(atom, sflag) (atom.secondary_flags ? atom.secondary_flags[sflag] : FALSE)
 #define SET_SECONDARY_FLAG(atom, sflag) if(!atom.secondary_flags) { atom.secondary_flags = list(); } atom.secondary_flags[sflag] = TRUE;
 #define CLEAR_SECONDARY_FLAG(atom, sflag) if(atom.secondary_flags) atom.secondary_flags[sflag] = null
+#define TOGGLE_SECONDARY_FLAG(atom, sflag) if(HAS_SECONDARY_FLAG(atom, sflag)) { CLEAR_SECONDARY_FLAG(atom, sflag); } else {SET_SECONDARY_FLAG(atom, sflag) ; }

code/__HELPERS/time.dm

@@ -1,13 +1,15 @@
 //Returns the world time in english
 /proc/worldtime2text()
-	return gameTimestamp("hh:mm:ss")
+	return gameTimestamp("hh:mm:ss", world.time)
 
 /proc/time_stamp(format = "hh:mm:ss", show_ds)
 	var/time_string = time2text(world.timeofday, format)
 	return show_ds ? "[time_string]:[world.timeofday % 10]" : time_string
 
-/proc/gameTimestamp(format = "hh:mm:ss") // Get the game time in text
-	return time2text(world.time - timezoneOffset + 432000 - round_start_time, format)
+/proc/gameTimestamp(format = "hh:mm:ss", wtime=null)
+	if(!wtime)
+		wtime = world.time
+	return time2text(wtime - timezoneOffset + SSticker.gametime_offset - round_start_time, format)
 
 /* Returns 1 if it is the selected month and day */
 /proc/isDay(month, day)

code/__HELPERS/unsorted.dm

@@ -1429,3 +1429,6 @@ var/valid_HTTPSGet = FALSE
 
 /proc/to_chat(target, message)
 	target << message
+
+/proc/pass()
+	return

code/_globalvars/lists/mobs.dm

@@ -14,4 +14,5 @@ var/global/list/dead_mob_list = list()				//all dead mobs, including clientless.
 var/global/list/joined_player_list = list()			//all clients that have joined the game at round-start or as a latejoin.
 var/global/list/silicon_mobs = list()				//all silicon mobs
 var/global/list/pai_list = list()
-var/global/list/available_ai_shells = list()
+var/global/list/available_ai_shells = list()
+var/global/list/language_datums = list()

code/_globalvars/lists/names.dm

@@ -14,6 +14,7 @@ var/list/mime_names = file2list("config/names/mime.txt")
 var/list/carp_names = file2list("config/names/carp.txt")
 var/list/golem_names = file2list("config/names/golem.txt")
 var/list/plasmaman_names = file2list("config/names/plasmaman.txt")
+var/list/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")
 
 
 var/list/verbs = file2list("config/names/verbs.txt")

code/_onclick/hud/_defines.dm

@@ -25,6 +25,7 @@
 #define ui_lingstingdisplay "WEST:6,CENTER-3:11"
 #define ui_crafting	"12:-10,1:5"
 #define ui_building "12:-10,1:21"
+#define ui_language_menu "11:6,2:-11"
 
 #define ui_devilsouldisplay "WEST:6,CENTER-1:15"
 
@@ -61,7 +62,7 @@
 #define ui_borg_store "CENTER+2:16,SOUTH:5"			//borgs
 #define ui_borg_camera "CENTER+3:21,SOUTH:5"		//borgs
 #define ui_borg_album "CENTER+4:21,SOUTH:5"			//borgs
-#define ui_borg_talk_wheel "CENTER+4:21,SOUTH+1:5"	//borgs
+#define ui_borg_language_menu "CENTER+4:21,SOUTH+1:5"	//borgs
 
 #define ui_monkey_head "CENTER-4:13,SOUTH:5"	//monkey
 #define ui_monkey_mask "CENTER-3:14,SOUTH:5"	//monkey
@@ -70,7 +71,7 @@
 
 #define ui_alien_storage_l "CENTER-2:14,SOUTH:5"//alien
 #define ui_alien_storage_r "CENTER+1:18,SOUTH:5"//alien
-#define ui_alien_talk_wheel "EAST-3:26,SOUTH:5" //alien
+#define ui_alien_language_menu "EAST-3:26,SOUTH:5" //alien
 
 #define ui_drone_drop "CENTER+1:18,SOUTH:5"     //maintenance drones
 #define ui_drone_pull "CENTER+2:2,SOUTH:5"      //maintenance drones

code/_onclick/hud/ai.dm

@@ -167,6 +167,11 @@
 	..()
 	var/obj/screen/using
 
+// Language menu
+	using = new /obj/screen/language_menu
+	using.screen_loc = ui_borg_language_menu
+	static_inventory += using
+
 //AI core
 	using = new /obj/screen/ai/aicore()
 	using.screen_loc = ui_ai_core

code/_onclick/hud/alien.dm

@@ -63,9 +63,8 @@
 		H.leap_icon.screen_loc = ui_alien_storage_r
 		static_inventory += H.leap_icon
 
-	using = new/obj/screen/wheel/talk
-	using.screen_loc = ui_alien_talk_wheel
-	wheels += using
+	using = new/obj/screen/language_menu
+	using.screen_loc = ui_alien_language_menu
 	static_inventory += using
 
 	using = new /obj/screen/drop()

code/_onclick/hud/alien_larva.dm

@@ -18,9 +18,8 @@
 	pull_icon.screen_loc = ui_pull_resist
 	hotkeybuttons += pull_icon
 
-	using = new/obj/screen/wheel/talk
-	using.screen_loc = ui_alien_talk_wheel
-	wheels += using
+	using = new/obj/screen/language_menu
+	using.screen_loc = ui_alien_language_menu
 	static_inventory += using
 
 	zone_select = new /obj/screen/zone_sel/alien()

code/_onclick/hud/hud.dm

@@ -33,8 +33,6 @@
 	var/obj/screen/throw_icon
 	var/obj/screen/module_store_icon
 
-	var/list/wheels = list() //list of the wheel screen objects
-
 	var/list/static_inventory = list() //the screen objects which are static
 	var/list/toggleable_inventory = list() //the screen objects which can be hidden
 	var/list/obj/screen/hotkeybuttons = list() //the buttons that can be used via hotkeys
@@ -78,8 +76,6 @@
 	qdel(module_store_icon)
 	module_store_icon = null
 
-	wheels = null //all wheels are also in static_inventory
-
 	if(static_inventory.len)
 		for(var/thing in static_inventory)
 			qdel(thing)
@@ -226,16 +222,6 @@
 /datum/hud/proc/persistent_inventory_update(mob/viewer)
 	if(!mymob)
 		return
-	var/mob/living/L = mymob
-
-	var/mob/screenmob = viewer || L
-
-	for(var/X in wheels)
-		var/obj/screen/wheel/W = X
-		if(W.toggled)
-			screenmob.client.screen |= W.buttons_list
-		else
-			screenmob.client.screen -= W.buttons_list
 
 //Triggered when F12 is pressed (Unless someone changed something in the DMF)
 /mob/verb/button_pressed_F12()

code/_onclick/hud/human.dm

@@ -96,9 +96,8 @@
 	using.icon = ui_style
 	static_inventory += using
 
-	using = new/obj/screen/wheel/talk
+	using = new/obj/screen/language_menu
 	using.icon = ui_style
-	wheels += using
 	static_inventory += using
 
 	using = new /obj/screen/area_creator

code/_onclick/hud/monkey.dm

@@ -15,9 +15,8 @@
 	using.screen_loc = ui_movi
 	static_inventory += using
 
-	using = new/obj/screen/wheel/talk
+	using = new/obj/screen/language_menu
 	using.icon = ui_style
-	wheels += using
 	static_inventory += using
 
 	using = new /obj/screen/drop()

code/_onclick/hud/robot.dm

@@ -96,9 +96,8 @@
 	var/mob/living/silicon/robot/mymobR = mymob
 	var/obj/screen/using
 
-	using = new/obj/screen/wheel/talk
-	using.screen_loc = ui_borg_talk_wheel
-	wheels += using
+	using = new/obj/screen/language_menu
+	using.screen_loc = ui_borg_language_menu
 	static_inventory += using
 
 //Radio