changes

code/__DEFINES/camera.dm

@@ -11,7 +11,6 @@
 #define CAMERA_NET_TORNADO "Tornado"
 #define CAMERA_NET_TYPHOON "Typhoon"
 #define CAMERA_NET_TRIPOLI "Tripoli"
-#define CAMERA_NET_CHEROKEE "Cherokee"
 #define CAMERA_NET_COLONY "Colony"
 #define CAMERA_NET_ARES "ARES"
 

code/__DEFINES/shuttles.dm

@@ -120,7 +120,6 @@
 #define DROPSHIP_TORNADO "dropship_tornado"
 #define DROPSHIP_TYPHOON "dropship_typhoon"
 #define DROPSHIP_TRIPOLI "dropship_tripoli"
-#define DROPSHIP_CHEROKEE "dropship_cherokee"
 
 #define ALMAYER_DROPSHIP_LZ1 "almayer-hangar-lz1"
 #define ALMAYER_DROPSHIP_LZ2 "almayer-hangar-lz2"

code/game/area/Sulaco.dm

@@ -189,19 +189,6 @@
 		return FALSE
 	return TRUE
 
-/area/shuttle/cherokee
-	name = "dropship Cherokee"
-	icon_state = "shuttlered"
-	base_muffle = MUFFLE_HIGH
-	soundscape_interval = 30
-	is_landing_zone = TRUE
-	ceiling = CEILING_REINFORCED_METAL
-
-/area/shuttle/cherokee/Enter(atom/movable/O, atom/oldloc)
-	if(istype(O, /obj/structure/barricade))
-		return FALSE
-	return TRUE
-
 
 
 //DISTRESS SHUTTLES

code/game/machinery/camera/presets.dm

@@ -132,9 +132,6 @@
 /obj/structure/machinery/camera/autoname/golden_arrow/tripoli
 	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_TRIPOLI)
 
-/obj/structure/machinery/camera/autoname/golden_arrow/cherokee
-	network = list(CAMERA_NET_GOLDEN_ARROW, CAMERA_NET_CHEROKEE)
-
 //used by the landing camera dropship equipment. Do not place them right under where the dropship lands.
 //Should place them near each corner of your LZs.
 /obj/structure/machinery/camera/autoname/lz_camera

code/game/machinery/computer/camera_console.dm

@@ -397,8 +397,4 @@
 	name = "\improper 'Tripoli' camera controls"
 	network = list(CAMERA_NET_TRIPOLI, CAMERA_NET_LASER_TARGETS)
 
-/obj/structure/machinery/computer/cameras/dropship/cherokee
-	name = "\improper 'Cherokee' camera controls"
-	network = list(CAMERA_NET_CHEROKEE, CAMERA_NET_LASER_TARGETS)
-
 #undef DEFAULT_MAP_SIZE

code/game/machinery/computer/dropship_weapons.dm

@@ -729,25 +729,41 @@
 	name = "\improper 'Midway' weapons controls"
 	shuttle_tag = DROPSHIP_MIDWAY
 
+/obj/structure/machinery/computer/dropship_weapons/midway/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+
 /obj/structure/machinery/computer/dropship_weapons/cyclone
 	name = "\improper 'Cyclone' weapons controls"
 	shuttle_tag = DROPSHIP_CYCLONE
 
+/obj/structure/machinery/computer/dropship_weapons/cyclone/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+
 /obj/structure/machinery/computer/dropship_weapons/tornado
 	name = "\improper 'Tornado' weapons controls"
 	shuttle_tag = DROPSHIP_TORNADO
 
+/obj/structure/machinery/computer/dropship_weapons/tornado/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+
 /obj/structure/machinery/computer/dropship_weapons/typhoon
 	name = "\improper 'Typhoon' weapons controls"
 	shuttle_tag = DROPSHIP_TYPHOON
 
+/obj/structure/machinery/computer/dropship_weapons/typhoon/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
+
 /obj/structure/machinery/computer/dropship_weapons/tripoli
 	name = "\improper 'Tripoli' weapons controls"
 	shuttle_tag = DROPSHIP_TRIPOLI
 
-/obj/structure/machinery/computer/dropship_weapons/cherokee
-	name = "\improper 'Cherokee' weapons controls"
-	shuttle_tag = DROPSHIP_CHEROKEE
+/obj/structure/machinery/computer/dropship_weapons/tripoli/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras"
 
 /obj/structure/machinery/computer/dropship_weapons/dropship1
 	name = "\improper 'Alamo' weapons controls"

code/game/turfs/closed.dm

@@ -299,14 +299,6 @@
 /turf/closed/shuttle/tripoli/transparent
 	opacity = FALSE
 
-/turf/closed/shuttle/cherokee
-	name = "\improper Cherokee"
-	icon = 'icons/turf/dropship.dmi'
-	icon_state = "1"
-
-/turf/closed/shuttle/cherokee/transparent
-	opacity = FALSE
-
 /turf/closed/shuttle/twe_dropship
 	name = "\improper UD4-UK"
 	icon = 'icons/turf/twedropship.dmi'

code/modules/dropships/attach_points/templates.dm

@@ -292,48 +292,6 @@
 	transverse  =  3
 	long    =  0
 
-// CHEROKEE
-/obj/effect/attach_point/weapon/cherokee
-	ship_tag = DROPSHIP_CHEROKEE
-
-/obj/effect/attach_point/weapon/cherokee/left_wing
-	name = "port wing weapon attach point"
-	icon_state = "equip_base_l_wing"
-	attach_id = 1
-	dir = WEST
-	firing_arc_min = -3
-	firing_arc_max =  3
-	transverse  = -3
-	long    =  0
-
-/obj/effect/attach_point/weapon/cherokee/left_fore
-	name = "port fore weapon attach point"
-	attach_id = 2
-	dir = NORTH
-	firing_arc_min = -6
-	firing_arc_max =  0
-	transverse  =  0
-	long    =  0
-
-/obj/effect/attach_point/weapon/cherokee/right_fore
-	name = "starboard fore weapon attach point"
-	attach_id = 3
-	dir = NORTH
-	firing_arc_min =  0
-	firing_arc_max =  6
-	transverse  =  0
-	long    =  0
-
-/obj/effect/attach_point/weapon/cherokee/right_wing
-	name = "starboard wing weapon attach point"
-	icon_state = "equip_base_r_wing";
-	attach_id = 4
-	dir = EAST
-	firing_arc_min = -3
-	firing_arc_max =  3
-	transverse  =  3
-	long    =  0
-
 //attach points
 
 /obj/effect/attach_point/crew_weapon
@@ -361,9 +319,6 @@
 /obj/effect/attach_point/crew_weapon/tripoli
 	ship_tag = DROPSHIP_TRIPOLI
 
-/obj/effect/attach_point/crew_weapon/cherokee
-	ship_tag = DROPSHIP_CHEROKEE
-
 /obj/effect/attach_point/electronics
 	name = "electronic system attach point"
 	base_category = DROPSHIP_ELECTRONICS
@@ -390,10 +345,6 @@
 
 /obj/effect/attach_point/electronics/tripoli
 	ship_tag = DROPSHIP_TRIPOLI
-
-/obj/effect/attach_point/electronics/cherokee
-	ship_tag = DROPSHIP_CHEROKEE
-
 /obj/effect/attach_point/fuel
 	name = "engine system attach point"
 	icon = 'icons/obj/structures/props/almayer_props64.dmi'
@@ -421,9 +372,6 @@
 /obj/effect/attach_point/fuel/tripoli
 	ship_tag = DROPSHIP_TRIPOLI
 
-/obj/effect/attach_point/fuel/cherokee
-	ship_tag = DROPSHIP_CHEROKEE
-
 /obj/effect/attach_point/computer
 	base_category = DROPSHIP_COMPUTER
 
@@ -447,6 +395,3 @@
 
 /obj/effect/attach_point/computer/tripoli
 	ship_tag = DROPSHIP_TYPHOON
-
-/obj/effect/attach_point/computer/cherokee
-	ship_tag = DROPSHIP_CHEROKEE

code/modules/shuttle/computers/dropship_computer.dm

@@ -508,3 +508,8 @@
 	icon_state = "toc_shuttle"
 	shuttleId = DROPSHIP_MIDWAY
 	is_remote = TRUE
+
+/obj/structure/machinery/computer/shuttle/dropship/flight/small
+	icon = 'icons/obj/structures/machinery/computer.dmi'
+	icon_state = "cameras_old"
+

code/modules/shuttle/dropship.dm

@@ -241,12 +241,3 @@
 
 /obj/structure/shuttle/part/tripoli/transparent
 	opacity = FALSE
-
-/obj/structure/shuttle/part/cherokee
-	name = "\improper Cherokee"
-	icon = 'icons/turf/dropship2.dmi'
-	icon_state = "1"
-	opacity = TRUE
-
-/obj/structure/shuttle/part/cherokee/transparent
-	opacity = FALSE

code/modules/shuttle/shuttles/dropship.dm

@@ -163,15 +163,6 @@
 	dwidth = 4
 	dheight = 8
 
-/obj/docking_port/mobile/marine_dropship/cherokee
-	name = "Cherokee"
-	id = DROPSHIP_CHEROKEE
-	width = 9
-	height = 18
-
-	dwidth = 4
-	dheight = 8
-
 /obj/docking_port/mobile/marine_dropship/alamo
 	name = "Alamo"
 	id = DROPSHIP_ALAMO
@@ -390,7 +381,3 @@
 /datum/map_template/shuttle/tripoli
 	name = "Tripoli"
 	shuttle_id = DROPSHIP_TRIPOLI
-
-/datum/map_template/shuttle/cherokee
-	name = "Cherokee"
-	shuttle_id = DROPSHIP_CHEROKEE