Merge branch 'release' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/_helpers/unsorted.dm
#	code/modules/events/event_container_vr.dm
#	icons/misc/title_vr.dmi
#	interface/skin.dmf
#	vorestation.dme

code/modules/modular_computers/NTNet/NTNet.dm

@@ -31,9 +31,10 @@ var/global/datum/ntnet/ntnet_global = new()
 /datum/ntnet/New()
 	if(ntnet_global && (ntnet_global != src))
 		ntnet_global = src // There can be only one.
-	for(var/obj/machinery/ntnet_relay/R in machines)
-		relays.Add(R)
-		R.NTNet = src
+	if (SSatoms && SSatoms.initialized > INITIALIZATION_INSSATOMS)
+		for(var/obj/machinery/ntnet_relay/R in machines)
+			relays.Add(R)
+			R.NTNet = src
 	build_software_lists()
 	build_news_list()
 	build_emails_list()

code/modules/modular_computers/NTNet/NTNet_relay.dm

@@ -8,6 +8,7 @@
 	icon_state = "bus"
 	anchored = 1
 	density = 1
+	circuit = /obj/item/weapon/circuitboard/ntnet_relay
 	var/datum/ntnet/NTNet = null // This is mostly for backwards reference and to allow varedit modifications from ingame.
 	var/enabled = 1				// Set to 0 if the relay was turned off
 	var/dos_failure = 0			// Set to 1 if the relay failed due to (D)DoS attack
@@ -93,17 +94,16 @@
 		return 1
 
 /obj/machinery/ntnet_relay/New()
-	uid = gl_uid
-	gl_uid++
-	component_parts = list()
-	component_parts += new /obj/item/stack/cable_coil(src,15)
-	component_parts += new /obj/item/weapon/circuitboard/ntnet_relay(src)
+	..()
+	assign_uid()
+	default_apply_parts()
 
+/obj/machinery/ntnet_relay/Initialize()
+	. = ..()
 	if(ntnet_global)
 		ntnet_global.relays.Add(src)
 		NTNet = ntnet_global
 		ntnet_global.add_log("New quantum relay activated. Current amount of linked relays: [NTNet.relays.len]")
-	..()
 
 /obj/machinery/ntnet_relay/Destroy()
 	if(ntnet_global)
@@ -113,24 +113,11 @@
 	for(var/datum/computer_file/program/ntnet_dos/D in dos_sources)
 		D.target = null
 		D.error = "Connection to quantum relay severed"
+	. = ..()
+
+/obj/machinery/ntnet_relay/attackby(var/obj/item/W as obj, var/mob/user as mob)
+	if(default_deconstruction_screwdriver(user, W))
+		return
+	if(default_deconstruction_crowbar(user, W))
+		return
 	..()
-
-/obj/machinery/ntnet_relay/attackby(var/obj/item/weapon/W as obj, var/mob/user as mob)
-	if(W.is_screwdriver())
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
-		panel_open = !panel_open
-		to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch")
-		return
-	if(W.is_crowbar())
-		if(!panel_open)
-			to_chat(user, "Open the maintenance panel first.")
-			return
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-		to_chat(user, "You disassemble \the [src]!")
-
-		for(var/atom/movable/A in component_parts)
-			A.forceMove(src.loc)
-		new /obj/structure/frame(src.loc)
-		qdel(src)
-		return
-	..()

code/modules/modular_computers/computers/modular_computer/core.dm

@@ -41,14 +41,14 @@
 /obj/item/modular_computer/proc/install_default_programs()
 	return 1
 
-/obj/item/modular_computer/New()
+/obj/item/modular_computer/Initialize()
 	START_PROCESSING(SSobj, src)
 	install_default_hardware()
 	if(hard_drive)
 		install_default_programs()
 	update_icon()
 	update_verbs()
-	..()
+	. = ..()
 
 /obj/item/modular_computer/Destroy()
 	kill_program(1)

code/modules/modular_computers/computers/modular_computer/power.dm

@@ -16,6 +16,12 @@
 		return TRUE
 	return FALSE
 
+/obj/item/modular_computer/get_cell()
+	if(battery_module)
+		return battery_module.battery
+	else
+		..()
+
 // Tries to use power from APC, if present.
 /obj/item/modular_computer/proc/apc_power(var/power_usage = 0)
 	apc_powered = TRUE

code/modules/modular_computers/computers/modular_computer/variables.dm

@@ -24,8 +24,8 @@
 
 	icon = null												// This thing isn't meant to be used on it's own. Subtypes should supply their own icon.
 	icon_state = null
-	//center_of_mass = null									// No pixelshifting by placing on tables, etc.
-	//randpixel = 0											// And no random pixelshifting on-creation either.
+	center_of_mass = null									// No pixelshifting by placing on tables, etc.
+	randpixel = 0											// And no random pixelshifting on-creation either.
 	var/icon_state_unpowered = null							// Icon state when the computer is turned off
 	var/icon_state_menu = "menu"							// Icon state overlay when the computer is turned on, but no program is loaded that would override the screen.
 	var/icon_state_screensaver = null

code/modules/modular_computers/computers/subtypes/dev_laptop.dm

@@ -4,7 +4,7 @@
 	desc = "A portable computer."
 	hardware_flag = PROGRAM_LAPTOP
 	icon_state_unpowered = "laptop-open"
-	icon = 'icons/obj/modular_laptop.dmi'
+	icon = 'icons/obj/modular_laptop_vr.dmi' //VOREStation Edit
 	icon_state = "laptop-open"
 	icon_state_screensaver = "standby"
 	base_idle_power_usage = 25

code/modules/modular_computers/computers/subtypes/preset_laptop.dm

@@ -46,23 +46,3 @@
 	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
 	battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
 	battery_module.charge_to_full()
-
-//VOREStation Add Start
-/obj/item/modular_computer/laptop/preset/custom_loadout/rugged
-	name = "rugged laptop computer"
-	desc = "A rugged portable computer."
-	icon = 'icons/obj/modular_laptop_vr.dmi'
-	max_damage = 300
-	broken_damage = 200
-
-/obj/item/modular_computer/laptop/preset/custom_loadout/rugged/install_default_hardware()
-	..()
-	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
-	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
-	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(src)
-	network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
-	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
-	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
-	battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
-	battery_module.charge_to_full()
-//VOREStation Add End

code/modules/modular_computers/computers/subtypes/preset_laptop_vr.dm

@@ -0,0 +1,48 @@
+//Rugged laptop
+/obj/item/modular_computer/laptop/preset/custom_loadout/rugged
+	name = "rugged laptop computer"
+	desc = "A rugged portable computer."
+	icon_state_unpowered = "ruggedplus-open"
+	icon_state = "ruggedplus-open"
+	icon_state_closed = "ruggedplus-closed"
+
+	max_damage = 300
+	broken_damage = 200
+
+/obj/item/modular_computer/laptop/preset/custom_loadout/rugged/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
+	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/advanced(src)
+	network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
+	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
+	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
+	battery_module = new/obj/item/weapon/computer_hardware/battery_module/super(src)
+	battery_module.charge_to_full()
+
+//Fancy Schmancy - this is defined in normal file, just swapping the icon
+/obj/item/modular_computer/laptop/preset/custom_loadout/elite
+	name = "elite laptop computer"
+	desc = "Fancy shcmancy laptop."
+	icon_state_unpowered = "elite-open"
+	icon_state = "elite-open"
+	icon_state_closed = "elite-closed"
+
+//Alien/Human hybrid tech
+/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid
+	name = "hybrid laptop computer"
+	desc = "Weird glowy alien/human crossover tech."
+	icon_state_unpowered = "hybrid-open"
+	icon_state = "hybrid-open"
+	icon_state_closed = "hybrid-closed"
+
+/obj/item/modular_computer/laptop/preset/custom_loadout/hybrid/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic(src)
+	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/super(src)
+	network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
+	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
+	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
+	battery_module = new/obj/item/weapon/computer_hardware/battery_module/lambda(src)
+	battery_module.charge_to_full()

code/modules/modular_computers/computers/subtypes/preset_tablet_vr.dm

@@ -0,0 +1,53 @@
+/obj/item/modular_computer/tablet/preset/custom_loadout/rugged
+	name = "rugged tablet computer"
+	desc = "A rugged tablet computer."
+	icon = 'icons/obj/modular_tablet_vr.dmi'
+	icon_state = "rugged"
+	icon_state_unpowered = "rugged"
+	max_damage = 300
+	broken_damage = 200
+
+/obj/item/modular_computer/tablet/preset/custom_loadout/rugged/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
+	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
+	network_card = new/obj/item/weapon/computer_hardware/network_card(src)
+	battery_module = new/obj/item/weapon/computer_hardware/battery_module/micro(src)
+	battery_module.charge_to_full()
+
+/obj/item/modular_computer/tablet/preset/custom_loadout/elite
+	name = "elite tablet computer"
+	desc = "A more expensive tablet computer."
+	icon = 'icons/obj/modular_tablet_vr.dmi'
+	icon_state = "elite"
+	icon_state_unpowered = "elite"
+
+/obj/item/modular_computer/tablet/preset/custom_loadout/elite/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/small(src)
+	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
+	network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
+	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
+	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
+	battery_module = new/obj/item/weapon/computer_hardware/battery_module(src)
+	battery_module.charge_to_full()
+
+/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid
+	name = "hybrid tablet computer"
+	desc = "A human/alien hybrid tech tablet computer."
+	icon = 'icons/obj/modular_tablet_vr.dmi'
+	icon_state = "hybrid"
+	icon_state_unpowered = "hybrid"
+
+/obj/item/modular_computer/tablet/preset/custom_loadout/hybrid/install_default_hardware()
+	..()
+	processor_unit = new/obj/item/weapon/computer_hardware/processor_unit/photonic/small(src)
+	tesla_link = new/obj/item/weapon/computer_hardware/tesla_link(src)
+	hard_drive = new/obj/item/weapon/computer_hardware/hard_drive/small(src)
+	network_card = new/obj/item/weapon/computer_hardware/network_card/advanced(src)
+	nano_printer = new/obj/item/weapon/computer_hardware/nano_printer(src)
+	card_slot = new/obj/item/weapon/computer_hardware/card_slot(src)
+	battery_module = new/obj/item/weapon/computer_hardware/battery_module/lambda(src)
+	battery_module.charge_to_full()

code/modules/modular_computers/file_system/computer_file.dm

@@ -23,7 +23,7 @@ var/global/file_uid = 0
 	if(holder.holder2 && holder.holder2.active_program == src)
 		holder.holder2.kill_program(1)
 	holder = null
-	..()
+	return ..()
 
 // Returns independent copy of this file.
 /datum/computer_file/proc/clone(var/rename = 0)

code/modules/modular_computers/file_system/programs/security/digitalwarrant.dm

@@ -90,7 +90,7 @@ var/warrant_uid = 0
 				W.fields["auth"] = "Unauthorized"
 				W.fields["arrestsearch"] = "arrest"
 			if(temp == "search")
-				W.fields["namewarrant"] = "No location given"
+				W.fields["namewarrant"] = "No suspect/location given" // VOREStation edit
 				W.fields["charges"] = "No reason given"
 				W.fields["auth"] = "Unauthorized"
 				W.fields["arrestsearch"] = "search"
@@ -135,7 +135,9 @@ var/warrant_uid = 0
 
 	if(href_list["editwarrantauth"])
 		. = 1
-
+		if(!(access_hos in I.access)) // VOREStation edit begin
+			to_chat(user, "<span class='warning'>You don't have the access to do this!</span>")
+			return // VOREStation edit end
 		activewarrant.fields["auth"] = "[I.registered_name] - [I.assignment ? I.assignment : "(Unknown)"]"
 
 	if(href_list["back"])

code/modules/modular_computers/hardware/_hardware.dm

@@ -47,6 +47,7 @@
 	to_chat(user, "Hardware Integrity Test... (Corruption: [damage]/[max_damage]) [damage > damage_failure ? "FAIL" : damage > damage_malfunction ? "WARN" : "PASS"]")
 
 /obj/item/weapon/computer_hardware/New(var/obj/L)
+	..()
 	w_class = hardware_size
 	if(istype(L, /obj/item/modular_computer))
 		holder2 = L

code/modules/modular_computers/hardware/battery_module.dm

@@ -76,4 +76,7 @@
 
 /obj/item/weapon/computer_hardware/battery_module/proc/charge_to_full()
 	if(battery)
-		battery.charge = battery.maxcharge
+		battery.charge = battery.maxcharge
+
+/obj/item/weapon/computer_hardware/battery_module/get_cell()
+	return battery

code/modules/modular_computers/hardware/network_card.dm

@@ -97,4 +97,4 @@ var/global/ntnet_card_uid = 1
 /obj/item/weapon/computer_hardware/network_card/Destroy()
 	if(holder2 && (holder2.network_card == src))
 		holder2.network_card = null
-	..()
+	return ..()