New ICCG-ship & related content (missiles, sensors tweaks)

baystation12.dme

@@ -1203,6 +1203,7 @@
 #include "code\game\objects\structures\charge_pylon.dm"
 #include "code\game\objects\structures\coathanger.dm"
 #include "code\game\objects\structures\curtains.dm"
+#include "code\game\objects\structures\decorative.dm"
 #include "code\game\objects\structures\displaycase.dm"
 #include "code\game\objects\structures\dogbed.dm"
 #include "code\game\objects\structures\door_assembly.dm"
@@ -1250,6 +1251,7 @@
 #include "code\game\objects\structures\crates_lockers\crates.dm"
 #include "code\game\objects\structures\crates_lockers\largecrate.dm"
 #include "code\game\objects\structures\crates_lockers\med_crate.dm"
+#include "code\game\objects\structures\crates_lockers\munitions_crate.dm"
 #include "code\game\objects\structures\crates_lockers\closets\__closet.dm"
 #include "code\game\objects\structures\crates_lockers\closets\_closet_appearance_definitions.dm"
 #include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
@@ -2650,8 +2652,12 @@
 #include "code\modules\overmap\_defines.dm"
 #include "code\modules\overmap\overmap_object.dm"
 #include "code\modules\overmap\overmap_shuttle.dm"
+#include "code\modules\overmap\radio_beacon.dm"
 #include "code\modules\overmap\sectors.dm"
 #include "code\modules\overmap\spacetravel.dm"
+#include "code\modules\overmap\contacts\_contact.dm"
+#include "code\modules\overmap\contacts\contact_class.dm"
+#include "code\modules\overmap\contacts\contact_sensors.dm"
 #include "code\modules\overmap\disperser\disperser.dm"
 #include "code\modules\overmap\disperser\disperser_charge.dm"
 #include "code\modules\overmap\disperser\disperser_circuit.dm"
@@ -2678,13 +2684,34 @@
 #include "code\modules\overmap\exoplanets\planet_types\shrouded.dm"
 #include "code\modules\overmap\exoplanets\planet_types\snow.dm"
 #include "code\modules\overmap\exoplanets\planet_types\volcanic.dm"
+#include "code\modules\overmap\projectiles\projectile.dm"
+#include "code\modules\overmap\projectiles\missiles\missile.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\missile_equipment.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\antimissile.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\diffuser.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\emp.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\explosive.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\nuclear.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\payload.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\payload\void.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\utility\armer.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\utility\passenger.dm"
+#include "code\modules\overmap\projectiles\missiles\equipment\utility\thruster.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\antispace.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\diffusive.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\explosive.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\impact.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\nuclear.dm"
+#include "code\modules\overmap\projectiles\missiles\presets\void.dm"
 #include "code\modules\overmap\ships\landable.dm"
+#include "code\modules\overmap\ships\panicbutton.dm"
 #include "code\modules\overmap\ships\ship.dm"
 #include "code\modules\overmap\ships\computers\engine_control.dm"
 #include "code\modules\overmap\ships\computers\helm.dm"
 #include "code\modules\overmap\ships\computers\sensors.dm"
 #include "code\modules\overmap\ships\computers\ship.dm"
 #include "code\modules\overmap\ships\computers\shuttle.dm"
+#include "code\modules\overmap\ships\computers\target_control.dm"
 #include "code\modules\overmap\ships\engines\electric.dm"
 #include "code\modules\overmap\ships\engines\engine.dm"
 #include "code\modules\overmap\ships\engines\gas_thruster.dm"
@@ -4004,5 +4031,6 @@
 #include "maps\~mapsystem\maps_jobs.dm"
 #include "maps\~mapsystem\maps_unit_testing.dm"
 #include "maps\~unit_tests\unit_testing.dm"
+#include "packs\faction_iccgn\_pack.dm"
 #include "~code\global_init.dm"
 // END_INCLUDE

code/__defines/colors.dm

@@ -115,6 +115,7 @@
 #define COMMS_COLOR_BEARCAT    "#590e2d"
 #define COMMS_COLOR_COLONY     "#ceaf3e"
 #define COMMS_COLOR_VERNE      "#738465"
+#define COMMS_COLOR_ICCG       "#790000"
 
 #define WOOD_COLOR_GENERIC     "#d5a66e"
 #define WOOD_COLOR_RICH        "#792f27"

code/__defines/flags.dm

@@ -64,3 +64,10 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define TANK_FLAG_FORCED      0x000002
 #define TANK_FLAG_LEAKING     0x000004
 #define TANK_FLAG_WIRED       0x000008
+
+
+// Sector Flags.
+#define OVERMAP_SECTOR_BASE              0x0001 // Whether or not this sector is a starting sector. Z levels contained in this sector are added to station_levels
+#define OVERMAP_SECTOR_KNOWN             0x0002 // Makes the sector show up on nav computers
+#define OVERMAP_SECTOR_IN_SPACE          0x0004 // If the sector can be accessed by drifting off the map edge
+#define OVERMAP_SECTOR_UNTARGETABLE      0x0008 // If the sector is untargetable by missiles

code/__defines/guns.dm

@@ -2,7 +2,7 @@
 #define CALIBER_PISTOL 				"10mmP" // INF, было #define CALIBER_PISTOL 			"10mm"
 #define CALIBER_PISTOL_FAST     	"5.7mmP" // INF
 #define CALIBER_PISTOL_SMALL 	    "9mmP" // INF, было #define CALIBER_PISTOL_SMALL 	"7mm"
-#define CALIBER_PISTOL_SMALL_MAGNUM "9mmR" 
+#define CALIBER_PISTOL_SMALL_MAGNUM "9mmR"
 #define CALIBER_PISTOL_MAGNUM 		"12.7mmP" // INF, было #define CALIBER_PISTOL_MAGNUM 	"15mm"
 #define CALIBER_PISTOL_FLECHETTE 	"4mmP" // INF, было #define CALIBER_PISTOL_FLECHETTE "4mm"
 #define CALIBER_PISTOL_BIG		    "11.4mmP"
@@ -20,6 +20,8 @@
 #define CALIBER_CAPS				"caps"
 #define CALIBER_DART				"darts"
 
+#define CALIBER_ROCKET	"rocket"
+
 #define HOLD_CASINGS	0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour
 #define CLEAR_CASINGS	1 //clear chambered so that the next round will be automatically loaded and fired, but don't drop anything on the floor
 #define EJECT_CASINGS	2 //drop spent casings on the ground after firing

code/__defines/overmap.dm

@@ -11,4 +11,11 @@
 #define OVERMAP_WEAKNESS_EMP 2
 #define OVERMAP_WEAKNESS_MINING 4
 #define OVERMAP_WEAKNESS_EXPLOSIVE 8
-#define OVERMAP_WEAKNESS_DROPPOD 16
+#define OVERMAP_WEAKNESS_DROPPOD 16
+#define OVERMAP_WEAKNESS_ODST 32
+
+#define TARGET_SHIP 0
+#define TARGET_MISSILE 1
+#define TARGET_PLANET 2
+#define TARGET_PLANETCOORD 4
+#define TARGET_POINT 8

code/_helpers/unsorted.dm

@@ -1174,3 +1174,6 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 
 /proc/REF(input)
 	return "\ref[input]"
+
+/proc/random_dir()
+	return pick(list(NORTH, EAST, SOUTH, WEST, NORTH|EAST, NORTH|WEST, SOUTH|EAST, SOUTH|WEST))

code/controllers/communications.dm

@@ -107,6 +107,7 @@ var/const/RADIO_HIGH_FREQ	= 1600
 var/const/BOT_FREQ	= 1447
 var/const/SKRELL_FREQ = 1598
 //[INF]
+var/const/ICCG_FREQ	= 1597
 var/const/SCG_FREQ	= 1599
 var/const/TAJSCISHIP_FREQ = 1377
 //[/INF]
@@ -117,6 +118,7 @@ var/const/DTH_FREQ	= 1341
 var/const/SYND_FREQ = 1213
 var/const/RAID_FREQ	= 1277
 var/const/ENT_FREQ	= 1461 //entertainment frequency. This is not a diona exclusive frequency.
+var/const/ICCGN_FREQ = 1344
 
 // department channels
 var/const/PUB_FREQ = 1459
@@ -168,11 +170,13 @@ var/list/radiochannels = list(
 	"AI Private"	= AI_FREQ,
 	"Entertainment" = ENT_FREQ,
 //[INF]
+	"ICCG"			= ICCG_FREQ,
 	"CCA EC"        = TAJSCISHIP_FREQ,
 	"SCG Patrol"	= SCG_FREQ,
 //[/INF]
 	"Medical (I)"	= MED_I_FREQ,
-	"Security (I)"	= SEC_I_FREQ
+	"Security (I)"	= SEC_I_FREQ,
+	"ICGN Ship"   = ICCGN_FREQ
 )
 
 var/list/channel_color_presets = list(

code/game/machinery/computer/computer.dm

@@ -87,6 +87,22 @@
 	icon = initial(icon)
 	icon_state = initial(icon_state)
 
+		// Connecty
+	if(initial(icon_state) == "computer")
+		var/append_string = ""
+		var/left = turn(dir, 90)
+		var/right = turn(dir, -90)
+		var/turf/L = get_step(src, left)
+		var/turf/R = get_step(src, right)
+		var/obj/machinery/computer/LC = locate() in L
+		var/obj/machinery/computer/RC = locate() in R
+		if(LC && LC.dir == dir && initial(LC.icon_state) == "computer")
+			append_string += "_L"
+		if(RC && RC.dir == dir && initial(RC.icon_state) == "computer")
+			append_string += "_R"
+		icon_state = "computer[append_string]"
+
+
 	if(reason_broken & MACHINE_BROKEN_NO_PARTS)
 		set_light(0)
 		icon = 'icons/obj/computer.dmi'
@@ -109,13 +125,14 @@
 
 	if(stat & BROKEN)
 		overlays += image(icon,"[icon_state]_broken", overlay_layer)
+
 	else
 		overlays += get_screen_overlay()
 
 	overlays += get_keyboard_overlay()
 
 /obj/machinery/computer/proc/get_screen_overlay()
-	return image(icon,icon_screen, overlay_layer)
+	return overlay_image(icon,icon_screen, plane = EFFECTS_ABOVE_LIGHTING_PLANE, layer = ABOVE_LIGHTING_LAYER)
 
 /obj/machinery/computer/proc/get_keyboard_overlay()
 	if(icon_keyboard)
@@ -134,4 +151,4 @@
 			new /obj/item/material/shard(loc)
 	else
 		to_chat(user, "<span class='notice'>You disconnect the monitor.</span>")
-	return ..()
+	return ..()

code/game/machinery/cryopod.dm

@@ -240,7 +240,7 @@
 	if(GLOB.using_map.use_overmap)
 		var/obj/effect/overmap/visitable/O = map_sectors["[z]"]
 		for(var/obj/effect/overmap/visitable/OO in range(O,2))
-			if(OO.in_space || istype(OO,/obj/effect/overmap/visitable/sector/exoplanet))
+			if((OO.sector_flags & OVERMAP_SECTOR_IN_SPACE) || istype(OO,/obj/effect/overmap/visitable/sector/exoplanet))
 				possible_locations |= text2num(level)
 
 	var/newz = GLOB.using_map.get_empty_zlevel()

code/game/machinery/doors/airlock.dm

@@ -153,6 +153,9 @@ var/list/airlock_overlays = list()
 /obj/machinery/door/airlock/sol
 	door_color = COLOR_BLUE_GRAY
 
+/obj/machinery/door/airlock/terran
+	door_color = COLOR_DARK_BLUE_GRAY
+
 /obj/machinery/door/airlock/civilian
 	stripe_color = COLOR_CIVIE_GREEN
 
@@ -218,6 +221,10 @@ var/list/airlock_overlays = list()
 	door_color = COLOR_BLUE_GRAY
 	stripe_color = COLOR_AMBER
 
+/obj/machinery/door/airlock/glass/terran
+	door_color = COLOR_DARK_BLUE_GRAY
+	stripe_color = COLOR_NT_RED
+
 /obj/machinery/door/airlock/glass/freezer
 	door_color = COLOR_WHITE
 

code/game/machinery/doors/blast_door.dm

@@ -326,3 +326,83 @@
 	if(stat & BROKEN)
 		qdel(src)
 	..()
+
+// SUBTYPE: Multi-tile
+// Pod doors ported from Paradise
+
+ // Whoever wrote the old code for multi-tile spesspod doors needs to burn in hell. - Unknown
+ // Wise words. - Bxil
+/obj/machinery/door/blast/multi_tile
+	name = "large blast door"
+
+/obj/machinery/door/blast/multi_tile/Initialize(mapload)
+	. = ..()
+	apply_opacity_to_my_turfs(opacity)
+
+/obj/machinery/door/blast/multi_tile/set_opacity()
+	. = ..()
+	apply_opacity_to_my_turfs(opacity)
+
+//Multi-tile poddoors don't turn invisible automatically, so we change the opacity of the turfs below instead one by one.
+/obj/machinery/door/blast/multi_tile/proc/apply_opacity_to_my_turfs(new_opacity)
+	for(var/turf/T in locs)
+		T.set_opacity(new_opacity)
+	update_nearby_tiles()
+
+/obj/machinery/door/blast/multi_tile
+	icon_state_open = "open"
+	icon_state_opening = "opening"
+	icon_state_closed = "closed"
+	icon_state_closing = "closing"
+	icon_state = "closed"
+
+/obj/machinery/door/blast/multi_tile/four_tile_ver
+	icon = 'icons/obj/doors/multi-tile/1x4blast_vert.dmi'
+	bound_height = 128
+	width = 4
+	dir = NORTH
+
+/obj/machinery/door/blast/multi_tile/three_tile_ver
+	icon = 'icons/obj/doors/multi-tile/1x3blast_vert.dmi'
+	bound_height = 96
+	width = 3
+	dir = NORTH
+
+/obj/machinery/door/blast/multi_tile/two_tile_ver
+	icon = 'icons/obj/doors/multi-tile/1x2blast_vert.dmi'
+	bound_height = 64
+	width = 2
+	dir = NORTH
+
+/obj/machinery/door/blast/multi_tile/four_tile_hor
+	icon = 'icons/obj/doors/multi-tile/1x4blast_hor.dmi'
+	bound_width = 128
+	width = 4
+	dir = EAST
+
+/obj/machinery/door/blast/multi_tile/three_tile_hor
+	icon = 'icons/obj/doors/multi-tile/1x3blast_hor.dmi'
+	bound_width = 96
+	width = 3
+	dir = EAST
+
+/obj/machinery/door/blast/multi_tile/two_tile_hor
+	icon = 'icons/obj/doors/multi-tile/1x2blast_hor.dmi'
+	bound_width = 64
+	width = 2
+	dir = EAST
+
+
+/obj/machinery/door/blast/multi_tile/four_tile_ver_sec
+	icon = 'icons/obj/doors/multi-tile/1x4blast_vert_sec.dmi'
+	bound_height = 128
+	width = 4
+	dir = NORTH
+	autoclose = TRUE
+
+/obj/machinery/door/blast/multi_tile/four_tile_hor_sec
+	icon = 'icons/obj/doors/multi-tile/1x4blast_hor_sec.dmi'
+	bound_width = 128
+	width = 4
+	dir = EAST
+	autoclose = TRUE

code/game/machinery/doors/multi_tile.dm

@@ -129,6 +129,10 @@
 /obj/machinery/door/airlock/multi_tile/sol
 	door_color = COLOR_BLUE_GRAY
 
+/obj/machinery/door/airlock/multi_tile/terran
+	door_color = COLOR_DARK_BLUE_GRAY
+	stripe_color = COLOR_NT_RED
+
 /obj/machinery/door/airlock/multi_tile/maintenance
 	name = "Maintenance Access"
 	stripe_color = COLOR_AMBER
@@ -192,6 +196,10 @@
 	door_color = COLOR_BLUE_GRAY
 	stripe_color = COLOR_AMBER
 
+/obj/machinery/door/airlock/multi_tile/glass/terran
+	door_color = COLOR_DARK_BLUE_GRAY
+	stripe_color = COLOR_NT_RED
+
 /obj/machinery/door/airlock/multi_tile/glass/freezer
 	door_color = COLOR_WHITE
 
@@ -200,4 +208,4 @@
 	stripe_color = COLOR_AMBER
 
 /obj/machinery/door/airlock/multi_tile/glass/civilian
-	stripe_color = COLOR_CIVIE_GREEN
+	stripe_color = COLOR_CIVIE_GREEN