Merge remote-tracking branch 'upstream/master'

code/ATMOSPHERICS/atmospherics.dm

@@ -16,7 +16,7 @@ Pipelines + Other Objects -> Pipe network
 	power_channel = ENVIRON
 	var/nodealert = 0
 	var/power_rating //the maximum amount of power the machine can use to do work, affects how powerful the machine is, in Watts
-	
+
 	unacidable = TRUE
 	layer = ATMOS_LAYER
 	plane = PLATING_PLANE
@@ -171,6 +171,9 @@ Pipelines + Other Objects -> Pipe network
 	if(construction_type)
 		var/obj/item/pipe/I = new construction_type(loc, null, null, src)
 		I.setPipingLayer(piping_layer)
+		if(istype(I, /obj/item/pipe/trinary/flippable))
+			var/obj/item/pipe/trinary/flippable/flip = I
+			flip.icon_state = "[flip.icon_state][flip.mirrored ? "m" : ""]"
 		transfer_fingerprints_to(I)
 	qdel(src)
 

code/ATMOSPHERICS/components/omni_devices/filter.dm

@@ -131,8 +131,8 @@
 	if(portData.len)
 		data["ports"] = portData
 	if(output)
-		data["set_flow_rate"] = round(set_flow_rate*10)		//because nanoui can't handle rounded decimals.
-		data["last_flow_rate"] = round(last_flow_rate*10)
+		data["set_flow_rate"] = round(set_flow_rate)
+		data["last_flow_rate"] = round(last_flow_rate)
 
 	return data
 
@@ -154,7 +154,7 @@
 /obj/machinery/atmospherics/omni/atmos_filter/tgui_act(action, params)
 	if(..())
 		return TRUE
-	
+
 	switch(action)
 		if("power")
 			if(!configuring)
@@ -266,4 +266,4 @@
 		else
 			initialize_directions |= P.dir
 			P.connect()
-	P.update = 1
+	P.update = 1

code/ATMOSPHERICS/components/omni_devices/mixer.dm

@@ -158,8 +158,8 @@
 	if(portData.len)
 		data["ports"] = portData
 	if(output)
-		data["set_flow_rate"] = round(set_flow_rate*10)		//because nanoui can't handle rounded decimals.
-		data["last_flow_rate"] = round(last_flow_rate*10)
+		data["set_flow_rate"] = round(set_flow_rate)
+		data["last_flow_rate"] = round(last_flow_rate)
 
 	return data
 
@@ -294,4 +294,4 @@
 /obj/machinery/atmospherics/omni/mixer/proc/con_lock(var/port = NORTH)
 	for(var/datum/omni_port/P in inputs)
 		if(P.dir == port)
-			P.con_lock = !P.con_lock
+			P.con_lock = !P.con_lock

code/__defines/admin_vr.dm

@@ -16,4 +16,7 @@
 #define MODIFIY_ROBOT_SWAP_MODULE	"Swap a Robot Module"
 #define MODIFIY_ROBOT_RESET_MODULE	"Fully Reset Robot Module"
 #define MODIFIY_ROBOT_TOGGLE_ERT	"Toggle ERT Module Overwrite"
+#define MODIFIY_ROBOT_LIMIT_MODULES_ADD	"Restrict Modules to"
+#define MODIFIY_ROBOT_LIMIT_MODULES_REMOVE	"Remove from restricted Modules"
+#define MODIFIY_ROBOT_TOGGLE_STATION_ACCESS "Toggle All Station Access Codes"
 #define MODIFIY_ROBOT_TOGGLE_CENT_ACCESS	"Toggle Central Access Codes"

code/__defines/belly_modes_vr.dm

@@ -36,3 +36,9 @@
 #define MIN_NUTRITION_TO_GAIN	450	// Above this amount you will gain weight
 #define MAX_NUTRITION_TO_LOSE	50	// Below this amount you will lose weight
 // #define WEIGHT_PER_NUTRITION	0.0285 // Tuned so 1050 (nutrition for average mob) = 30 lbs
+
+// Drain modes
+#define DR_NORMAL								"Normal"
+#define DR_SLEEP 								"Sleep"
+#define DR_FAKE									"False Sleep"
+#define DR_WEIGHT								"Weight Drain"

code/_onclick/hud/_defines.dm

@@ -58,9 +58,11 @@
 #define ui_zonesel "EAST-1:28,SOUTH:5"
 #define ui_acti_alt "EAST-1:28,SOUTH:5" //alternative intent switcher for when the interface is hidden (F12)
 
-#define ui_borg_pull "EAST-3:24,SOUTH+1:7"
-#define ui_borg_module "EAST-2:26,SOUTH+1:7"
-#define ui_borg_panel "EAST-1:28,SOUTH+1:7"
+#define ui_borg_pull "EAST-4:24,SOUTH+1:7" //borgs
+#define ui_borg_radio "EAST-2:26,SOUTH+1:7" //borgs
+#define ui_borg_panel "EAST-1:28,SOUTH+1:7" //borgs
+#define ui_borg_module "EAST-3:24,SOUTH+1:5"//borgs
+#define ui_vtec_control "EAST-3:24,SOUTH:5"//borgs
 
 #define ui_ai_core "SOUTH:6,WEST:16"
 #define ui_ai_camera_list "SOUTH:6,WEST+1:16"
@@ -197,4 +199,4 @@
 #define ui_mech_deco1_f "WEST+2:-7, SOUTH+8"
 #define ui_mech_deco2_f "WEST+2:-7, SOUTH+9"
 
-#define ui_smallquad "EAST-4:22,SOUTH:5"
+#define ui_smallquad "EAST-4:22,SOUTH:5"

code/_onclick/hud/hud.dm

@@ -176,6 +176,7 @@ var/list/global_huds = list(
 	var/obj/screen/l_hand_hud_object
 	var/obj/screen/action_intent
 	var/obj/screen/move_intent
+	var/obj/screen/control_vtec
 
 	var/list/adding
 	/// Misc hud elements that are hidden when the hud is minimized
@@ -219,6 +220,7 @@ var/list/global_huds = list(
 	l_hand_hud_object = null
 	action_intent = null
 	move_intent = null
+	control_vtec = null
 	adding = null
 	other = null
 	other_important = null

code/_onclick/hud/robot.dm

@@ -25,7 +25,7 @@ var/obj/screen/robot_inventory
 	using.color = HUD.ui_color
 	using.alpha = HUD.ui_alpha
 	using.icon_state = "radio"
-	using.screen_loc = ui_movi
+	using.screen_loc = ui_borg_radio
 	using.layer = HUD_LAYER
 	adding += using
 
@@ -81,6 +81,17 @@ var/obj/screen/robot_inventory
 	adding += using
 	HUD.action_intent = using
 
+	//Move intent (walk/run)
+	using = new /obj/screen()
+	using.name = "mov_intent"
+	using.icon = HUD.ui_style
+	using.icon_state = (m_intent == "run" ? "running" : "walking")
+	using.screen_loc = ui_movi
+	using.color = HUD.ui_color
+	using.alpha = HUD.ui_alpha
+	HUD.adding += using
+	HUD.move_intent = using
+
 //Health
 	healths = new /obj/screen()
 	healths.icon = HUD.ui_style
@@ -206,6 +217,32 @@ var/obj/screen/robot_inventory
 		client.screen += HUD.adding + HUD.other
 		client.screen += client.void
 
+/datum/hud/proc/toggle_vtec_control()
+	if(!isrobot(mymob))
+		return
+
+	var/mob/living/silicon/robot/R = mymob
+	if(!control_vtec)
+		var/obj/screen/using = new /obj/screen()
+		using.name = "control_vtec"
+		using.icon = ui_style
+		using.screen_loc = ui_vtec_control
+		using.color = ui_color
+		using.alpha = ui_alpha
+		control_vtec = using
+	if(R.vtec_active)
+		if(R.speed == 0)
+			control_vtec.icon_state = "speed_0"
+		else if(R.speed == -0.5)
+			control_vtec.icon_state = "speed_1"
+		else if(R.speed == -1)
+			control_vtec.icon_state = "speed_2"
+		R.m_intent = "run"
+		R.hud_used.move_intent.icon_state = "running"
+		R.client.screen += control_vtec
+	else
+		R.client.screen -= control_vtec
+		R.speed = 0
 
 /datum/hud/proc/toggle_show_robot_modules()
 	if(!isrobot(mymob))
@@ -276,7 +313,7 @@ var/obj/screen/robot_inventory
 	else
 		//Modules display is hidden
 		//r.client.screen -= robot_inventory	//"store" icon
-		for(var/atom/A in r.module.modules)
+		for(var/atom/A in r.module?.modules)
 			if(r.client && (A != r.module_state_1) && (A != r.module_state_2) && (A != r.module_state_3) )
 				//Module is not currently active
 				r.client.screen -= A

code/_onclick/hud/screen_objects.dm

@@ -272,6 +272,19 @@
 				var/mob/living/L = usr
 				L.resist()
 
+		if("control_vtec")
+			if(isrobot(usr))
+				var/mob/living/silicon/robot/R = usr
+				if(R.speed == 0 && R.vtec_active)
+					R.speed = -0.5
+					R.hud_used.control_vtec.icon_state = "speed_1"
+				else if(R.speed == -0.5 && R.vtec_active)
+					R.speed = -1
+					R.hud_used.control_vtec.icon_state = "speed_2"
+				else
+					R.speed = 0
+					R.hud_used.control_vtec.icon_state = "speed_0"
+
 		if("mov_intent")
 			if(isliving(usr))
 				if(iscarbon(usr))

code/datums/outfits/outfit.dm

@@ -127,7 +127,8 @@ var/list/outfits_decls_by_type_
 	if(gloves)
 		H.equip_to_slot_or_del(new gloves(H),slot_gloves)
 	if(shoes)
-		H.equip_to_slot_or_del(new shoes(H),slot_shoes)
+		if(!(H.client?.prefs?.shoe_hater))	//RS ADD
+			H.equip_to_slot_or_del(new shoes(H),slot_shoes)
 	if(mask)
 		H.equip_to_slot_or_del(new mask(H),slot_wear_mask)
 	if(head)

code/game/jobs/job_controller.dm

@@ -430,6 +430,8 @@ var/global/datum/controller/occupations/job_master
 					//if(G.slot == slot_wear_mask || G.slot == slot_wear_suit || G.slot == slot_head)
 					//	custom_equip_leftovers += thing
 					//else
+					if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)	//RS ADD
+						continue
 					if(H.equip_to_slot_or_del(G.spawn_item(H, metadata), G.slot))
 						to_chat(H, "<span class='notice'>Equipping you with \the [thing]!</span>")
 						if(G.slot != slot_tie)
@@ -455,6 +457,8 @@ var/global/datum/controller/occupations/job_master
 		// If some custom items could not be equipped before, try again now.
 		for(var/thing in custom_equip_leftovers)
 			var/datum/gear/G = gear_datums[thing]
+			if(G.slot == slot_shoes && H.client?.prefs?.shoe_hater)	//RS ADD
+				continue
 			if(G.slot in custom_equip_slots)
 				spawn_in_storage += thing
 			else

code/game/machinery/lightswitch.dm

@@ -86,4 +86,14 @@
 		..(severity)
 		return
 	power_change()
-	..(severity)
+	..(severity)
+
+//Breakers for event maps
+
+/obj/machinery/light_switch/breaker
+	name = "lights breaker"
+	desc = "A breaker for controlling power to the lights connected to the circuit."
+	icon = 'icons/obj/power_breaker.dmi'
+	icon_state = "light1"
+	on = 0
+

code/game/machinery/telecomms/machine_interactions.dm

@@ -313,13 +313,13 @@
 
 
 		if("freq")
-			var/newfreq = input(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, network) as null|num
+			var/newfreq = tgui_input_number(usr, "Specify a new frequency to filter (GHz). Decimals assigned automatically.", src, max_value=9999)
 			if(newfreq && canAccess(usr))
 				if(findtext(num2text(newfreq), "."))
 					newfreq *= 10 // shift the decimal one place
 				if(!(newfreq in freq_listening) && newfreq < 10000)
 					freq_listening.Add(newfreq)
-					set_temp("-% New frequency filter assigned: \"[newfreq] GHz\" %-", "average")
+					set_temp("-% New frequency filter assigned: \"[newfreq/10] GHz\" %-", "average")
 				. = TRUE
 
 		if("delete")

code/game/objects/items/robot/robot_upgrades.dm

@@ -109,7 +109,8 @@
 		return 0
 
 	R.verbs += /mob/living/silicon/robot/proc/toggle_vtec
-	R.speed = -1
+	R.vtec_active = TRUE
+	R.hud_used.toggle_vtec_control()
 	return 1
 
 /obj/item/borg/upgrade/basic/sizeshift

code/game/objects/items/weapons/capture_crystal.dm

@@ -844,7 +844,13 @@
 		list(/mob/living/simple_mob/vore/sheep),
 		list(/mob/living/simple_mob/vore/weretiger),
 		list(/mob/living/simple_mob/vore/alienanimals/skeleton),
-		list(/mob/living/simple_mob/vore/alienanimals/dustjumper)
+		list(/mob/living/simple_mob/vore/alienanimals/dustjumper),
+		list(/mob/living/simple_mob/vore/cryptdrake),
+		list(/mob/living/simple_mob/vore/stalker),
+		list(/mob/living/simple_mob/vore/horse/kelpie),
+		list(/mob/living/simple_mob/vore/scrubble),
+		list(/mob/living/simple_mob/vore/sonadile),
+		list(/mob/living/simple_mob/vore/devil)
 		)
 
 /obj/item/capture_crystal/random/Initialize()

code/game/objects/items/weapons/paint.dm

@@ -26,8 +26,8 @@ var/global/list/cached_icons = list()
 	else
 		return ..()
 
-/obj/item/weapon/reagent_containers/glass/paint/New()
-	..()
+/obj/item/weapon/reagent_containers/glass/paint/Initialize()
+	.=..()
 	if(paint_type)
 		reagents.add_reagent("paint", volume, paint_type)
 

code/game/objects/structures/ghost_pods/event_vr.dm

@@ -46,6 +46,10 @@
 								  "Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost,
 								  "Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless,
 								  "Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless,
+								  "Red Dragon" = /mob/living/simple_mob/vore/aggressive/dragon,
+								  "Phoron Dragon" = /mob/living/simple_mob/vore/aggressive/dragon/virgo3b,
+								  "Space Dragon" = /mob/living/simple_mob/vore/aggressive/dragon/space,
+								  "Crypt Drake" = /mob/living/simple_mob/vore/cryptdrake,
 								  "Weretiger" = /mob/living/simple_mob/vore/weretiger,
 								  "Catslug" = /mob/living/simple_mob/vore/alienanimals/catslug,
 								  "Squirrel" = /mob/living/simple_mob/vore/squirrel/big,
@@ -60,7 +64,13 @@
 								  "Scel (Blue)" = /mob/living/simple_mob/vore/scel/blue,
 								  "Scel (Purple)" = /mob/living/simple_mob/vore/scel/purple,
 								  "Scel (Red)" = /mob/living/simple_mob/vore/scel/red,
-								  "Scel (Green)" = /mob/living/simple_mob/vore/scel/green
+								  "Scel (Green)" = /mob/living/simple_mob/vore/scel/green,
+								  "Cave Stalker" = /mob/living/simple_mob/vore/stalker,
+								  "Kelpie" = /mob/living/simple_mob/vore/horse/kelpie,
+								  "Scrubble" = /mob/living/simple_mob/vore/scrubble,
+								  "Sonadile" = /mob/living/simple_mob/vore/sonadile,
+								  "kururak" = /mob/living/simple_mob/animal/sif/kururak,
+								  "Statue of Temptation" = /mob/living/simple_mob/vore/devil
 								  )
 
 /obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)

code/global.dm

@@ -177,7 +177,7 @@ 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/omni/global_announcer = new /obj/item/device/radio/intercom/omni(null)
 
-var/list/station_departments = list("Command", "Medical", "Engineering", "Science", "Security", "Cargo", "Exploration", "Civilian") //VOREStation Edit
+var/list/station_departments = list("Command", "Medical", "Engineering", "Research", "Security", "Cargo", "Exploration", "Civilian") //VOREStation Edit
 
 //Icons for in-game HUD glasses. Why don't we just share these a little bit?
 var/static/icon/ingame_hud = icon('icons/mob/hud.dmi')

code/modules/admin/admin_verb_lists_vr.dm

@@ -130,7 +130,8 @@ var/list/admin_verbs_admin = list(
 	/client/proc/make_mentor,
 	/client/proc/unmake_mentor,
 	/client/proc/removetickets,
-	/client/proc/delbook
+	/client/proc/delbook,
+	/client/proc/toggle_spawning_with_recolour
 	)
 
 var/list/admin_verbs_ban = list(
@@ -222,8 +223,7 @@ var/list/admin_verbs_server = list(
 	/client/proc/recipe_dump,
 	/client/proc/panicbunker,
 	/client/proc/paranoia_logging,
-	/client/proc/ip_reputation,
-	/client/proc/toggle_spawning_with_recolour
+	/client/proc/ip_reputation
 	)
 
 var/list/admin_verbs_debug = list(
@@ -561,7 +561,8 @@ var/list/admin_verbs_event_manager = list(
 	/client/proc/cmd_admin_delete,		//delete an instance/object/mob/etc,
 	/client/proc/cmd_debug_del_all,
 	/client/proc/toggle_random_events,
-	/client/proc/modify_server_news
+	/client/proc/modify_server_news,
+	/client/proc/toggle_spawning_with_recolour
 
 )
 

code/modules/admin/admin_verbs_vr.dm

@@ -126,7 +126,7 @@
 	set desc = "Makes it so new robots/simple_mobs spawn with a verb to recolour themselves for this round. You must set them separately."
 	set category = "Server"
 
-	if(!check_rights(R_SERVER))
+	if(!check_rights(R_ADMIN|R_EVENT|R_FUN))
 		return
 
 	var/which = tgui_alert(usr, "Which do you want to toggle?", "Choose Recolour Toggle", list("Robot", "Simple Mob"))