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

code/_onclick/hud/_defines.dm

@@ -49,9 +49,9 @@
 #define ui_storage1 "CENTER+1:18,SOUTH:5"
 #define ui_storage2 "CENTER+2:20,SOUTH:5"
 
-#define ui_borg_sensor "CENTER-3:16, SOUTH:5"		//borgs
-#define ui_borg_lamp "CENTER-4:16, SOUTH:5"			//borgs
-#define ui_borg_thrusters "CENTER-5:16, SOUTH:5"	//borgs
+#define ui_borg_sensor "CENTER-3:15, SOUTH:5"		//borgs
+#define ui_borg_lamp "CENTER-4:15, SOUTH:5"			//borgs
+#define ui_borg_thrusters "CENTER-5:15, SOUTH:5"	//borgs
 #define ui_inv1 "CENTER-2:16,SOUTH:5"				//borgs
 #define ui_inv2 "CENTER-1  :16,SOUTH:5"				//borgs
 #define ui_inv3 "CENTER  :16,SOUTH:5"				//borgs
@@ -59,7 +59,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_language_menu "CENTER+4:21,SOUTH+1:5"	//borgs
+#define ui_borg_language_menu "EAST-1:27,SOUTH+2:8"	//borgs
 
 #define ui_monkey_head "CENTER-5:13,SOUTH:5"	//monkey
 #define ui_monkey_mask "CENTER-4:14,SOUTH:5"	//monkey

code/_onclick/hud/plane_master.dm

@@ -16,6 +16,28 @@
 //Trust me, you need one. Period. If you don't think you do, you're doing something extremely wrong.
 /obj/screen/plane_master/proc/backdrop(mob/mymob)
 
+/obj/screen/plane_master/openspace
+	name = "open space plane master"
+	plane = FLOOR_OPENSPACE_PLANE
+	appearance_flags = PLANE_MASTER
+	blend_mode = BLEND_MULTIPLY
+	alpha = 255
+
+/obj/screen/plane_master/openspace/backdrop(mob/mymob)
+	filters = list()
+	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -10)
+	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -15)
+	filters += filter(type = "drop_shadow", color = "#04080FAA", size = -20)
+
+/obj/screen/plane_master/proc/outline(_size, _color)
+	filters += filter(type = "outline", size = _size, color = _color)
+
+/obj/screen/plane_master/proc/shadow(_size, _offset = 0, _x = 0, _y = 0, _color = "#04080FAA")
+	filters += filter(type = "drop_shadow", x = _x, y = _y, color = _color, size = _size, offset = _offset)
+
+/obj/screen/plane_master/proc/clear_filters()
+	filters = list()
+
 /obj/screen/plane_master/floor
 	name = "floor plane master"
 	plane = FLOOR_PLANE

code/_onclick/hud/robot.dm

@@ -88,6 +88,26 @@
 	var/mob/living/silicon/robot/R = usr
 	R.toggle_ionpulse()
 
+/obj/screen/robot/sensors
+	name = "Sensor Augmentation"
+	icon_state = "cyborg_sensor"
+
+/obj/screen/robot/sensors/Click()
+	if(..())
+		return
+	var/mob/living/silicon/S = usr
+	S.toggle_sensors()
+
+/obj/screen/robot/language_menu
+	name = "silicon language selection"
+	icon_state = "talk_wheel"
+
+/obj/screen/robot/language_menu/Click()
+	if(..())
+		return
+	var/mob/living/silicon/S = usr
+	S.open_language_menu(usr)
+
 /datum/hud/robot
 	ui_style = 'icons/mob/screen_cyborg.dmi'
 
@@ -96,7 +116,7 @@
 	var/mob/living/silicon/robot/mymobR = mymob
 	var/obj/screen/using
 
-	using = new/obj/screen/language_menu
+	using = new/obj/screen/robot/language_menu
 	using.screen_loc = ui_borg_language_menu
 	static_inventory += using
 
@@ -133,7 +153,7 @@
 	static_inventory += using
 
 //Sec/Med HUDs
-	using = new /obj/screen/ai/sensors()
+	using = new /obj/screen/robot/sensors()
 	using.screen_loc = ui_borg_sensor
 	static_inventory += using
 

code/_onclick/hud/screen_objects.dm

@@ -157,7 +157,7 @@
 		var/image/item_overlay = image(holding)
 		item_overlay.alpha = 92
 
-		if(!user.can_equip(holding, slot_id, disable_warning = TRUE))
+		if(!user.can_equip(holding, slot_id, TRUE))
 			item_overlay.color = "#FF0000"
 		else
 			item_overlay.color = "#00ff00"