Merge pull request #1815 from CHOMPStationBot/upstream-merge-10157

[MIRROR] Adminbus Update

code/game/machinery/portable_turret_vr.dm

@@ -24,7 +24,7 @@
 	name = "military CIWS turret"
 	desc = "A ship weapons turret designed for anti-fighter defense."
 	req_one_access = list(access_cent_general)
-	installation = /obj/item/weapon/gun/energy/lasercannon
+	installation = /obj/item/weapon/gun/energy/pulse_rifle/destroyer
 	health = 500
 	maxhealth = 500
 	enabled = TRUE

code/modules/mining/shelter_atoms_vr.dm

@@ -332,6 +332,9 @@ GLOBAL_LIST_EMPTY(unique_deployable)
 	light_power = 1
 	light_color = "#FFFFFF"
 
+/obj/structure/fans/hardlight/ex_act()
+	return
+
 /obj/structure/fans/hardlight/colorable
 	name = "hardlight shield"
 	icon_state = "hardlight_colorable"

maps/offmap_vr/om_ships/shelter_6.dm

@@ -48,6 +48,6 @@
 [i]Transponder[/i]: Transmitting (MIL), NanoTrasen
 [b]Notice[/b]: Experimental vessel"}
 	color = "#8800ff" //Indigo
-	vessel_mass = 5000
+	vessel_mass = 3000
 	vessel_size = SHIP_SIZE_SMALL
 	shuttle = "NDV Tabiranth"

maps/southern_cross/loadout/loadout_head.dm

@@ -1,4 +1,4 @@
 /datum/gear/head/pilot
 	display_name = "helmet, pilot (Pilot)"
-	path = /obj/item/clothing/head/pilot/alt
+	path = /obj/item/clothing/head/ompilot/alt //VOREStation Edit
 	allowed_roles = list("Pilot")