TaleStation Hard Forkening: Integrating the aesthetic folder into mai…

…n code/dmis (TaleStation#9798)

Able to clean up this slop heap. Still have lingering code stuff I want
to touch later, since this is just integrating `dmis` and any associated
code.

code/game/machinery/computer/_computer.dm

@@ -19,6 +19,8 @@
 	var/time_to_unscrew = 2 SECONDS
 	/// Are we authenticated to use this? Used by things like comms console, security and medical data, and apc controller.
 	var/authenticated = FALSE
+	///Determines if the computer can connect to other computers (no arcades, etc.)
+	var/connectable = TRUE
 
 /datum/armor/machinery_computer
 	fire = 40
@@ -28,6 +30,9 @@
 	. = ..()
 	power_change()
 
+	if(connectable)
+		AddComponent(/datum/component/connectable_computer)
+
 /obj/machinery/computer/process()
 	if(machine_stat & (NOPOWER|BROKEN))
 		return FALSE

code/game/machinery/computer/arcade/arcade.dm

@@ -78,6 +78,7 @@ GLOBAL_LIST_INIT(arcade_prize_pool, list(
 	icon_screen = "invaders"
 	light_color = LIGHT_COLOR_GREEN
 	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON
+	connectable = FALSE
 	var/list/prize_override
 
 /obj/machinery/computer/arcade/proc/Reset()

code/game/machinery/computer/camera.dm

@@ -189,6 +189,7 @@
 	icon_keyboard = null
 	icon_screen = "detective_tv"
 	pass_flags = PASSTABLE
+	connectable = FALSE
 
 /obj/machinery/computer/security/mining
 	name = "outpost camera console"

code/game/machinery/computer/pod.dm

@@ -136,6 +136,7 @@
 	icon_state = "oldcomp"
 	icon_screen = "library"
 	icon_keyboard = null
+	connectable = FALSE
 
 /obj/machinery/computer/pod/old/mass_driver_controller
 	name = "\improper Mass Driver Controller"

code/game/machinery/computer/records/medical.dm

@@ -18,6 +18,7 @@
 	icon_screen = "medlaptop"
 	icon_keyboard = "laptop_key"
 	pass_flags = PASSTABLE
+	connectable = FALSE
 
 /obj/machinery/computer/records/medical/attacked_by(obj/item/attacking_item, mob/living/user)
 	. = ..()

code/game/machinery/computer/records/security.dm

@@ -27,6 +27,7 @@
 	icon_screen = "seclaptop"
 	icon_keyboard = "laptop_key"
 	pass_flags = PASSTABLE
+	connectable = FALSE
 
 /obj/machinery/computer/records/security/laptop/syndie
 	desc = "A cheap, jailbroken security laptop. It functions as a security records console. It's bolted to the table."

code/game/machinery/computer/telescreen.dm

@@ -10,6 +10,7 @@
 	density = FALSE
 	circuit = null
 	light_power = 0
+	connectable = FALSE
 	/// The kind of wallframe that this telescreen drops
 	var/frame_type = /obj/item/wallframe/telescreen
 

code/game/machinery/lightswitch.dm

@@ -73,6 +73,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/light_switch, 26)
 /obj/machinery/light_switch/interact(mob/user)
 	. = ..()
 	set_lights(!area.lightswitch)
+	playsound(src, 'talestation_modules/sound/machines/lights/lightswitch.ogg', 100, 1)
 
 /obj/machinery/light_switch/attackby_secondary(obj/item/weapon, mob/user, params)
 	if(weapon.tool_behaviour == TOOL_SCREWDRIVER)

code/game/machinery/slotmachine.dm

@@ -25,6 +25,7 @@
 	circuit = /obj/item/circuitboard/computer/slot_machine
 	light_color = LIGHT_COLOR_BROWN
 	interaction_flags_machine = INTERACT_MACHINE_ALLOW_SILICON|INTERACT_MACHINE_SET_MACHINE // don't need to be literate to play slots
+	connectable = FALSE
 	var/money = 3000 //How much money it has CONSUMED
 	var/plays = 0
 	var/working = FALSE

code/game/objects/structures/window.dm

@@ -668,7 +668,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
 	obj_flags = CAN_BE_HIT
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
-	canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 	glass_amount = 2
 
 /obj/structure/window/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
@@ -689,7 +689,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
 	obj_flags = CAN_BE_HIT
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
-	canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 	glass_amount = 2
 
 /obj/structure/window/plasma/fulltile/unanchored
@@ -706,7 +706,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
 	obj_flags = CAN_BE_HIT
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
-	canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 	glass_amount = 2
 
 /obj/structure/window/reinforced/plasma/fulltile/unanchored
@@ -726,7 +726,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
 	state = RWINDOW_SECURE
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
-	canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 	glass_amount = 2
 
 /obj/structure/window/reinforced/fulltile/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
@@ -747,7 +747,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/window/reinforced/tinted/frosted/spaw
 	obj_flags = CAN_BE_HIT
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WINDOW_FULLTILE
-	canSmoothWith = SMOOTH_GROUP_WINDOW_FULLTILE
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 	glass_amount = 2
 	// Not on the parent because directional opacity does NOT WORK
 	opacity = TRUE

code/game/turfs/closed/wall/misc_walls.dm

@@ -51,6 +51,11 @@
 	. = ..()
 	AddElement(/datum/element/rust)
 
+/turf/closed/wall/rust/New(loc, ...)
+	. = ..()
+	var/mutable_appearance/rust = mutable_appearance(icon, "rust")
+	add_overlay(rust)
+
 /turf/closed/wall/r_wall/rust
 	//SDMM supports colors, this is simply for easier mapping
 	//and should be removed on initialize
@@ -61,6 +66,11 @@
 	. = ..()
 	AddElement(/datum/element/rust)
 
+/turf/closed/wall/r_wall/rust/New(loc, ...)
+	. = ..()
+	var/mutable_appearance/rust = mutable_appearance(icon, "rust")
+	add_overlay(rust)
+
 /turf/closed/wall/mineral/bronze
 	name = "clockwork wall"
 	desc = "A huge chunk of bronze, decorated like gears and cogs."

code/game/turfs/closed/walls.dm

@@ -17,7 +17,7 @@
 
 	smoothing_flags = SMOOTH_BITMASK
 	smoothing_groups = SMOOTH_GROUP_WALLS + SMOOTH_GROUP_CLOSED_TURFS
-	canSmoothWith = SMOOTH_GROUP_WALLS
+	canSmoothWith = SMOOTH_GROUP_AIRLOCK + SMOOTH_GROUP_WINDOW_FULLTILE + SMOOTH_GROUP_WALLS
 
 	rcd_memory = RCD_MEMORY_WALL
 	///bool on whether this wall can be chiselled into

code/modules/antagonists/abductor/machinery/camera.dm

@@ -13,6 +13,7 @@
 	icon_keyboard = null
 	icon_screen = null
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+	connectable = FALSE
 
 /obj/machinery/computer/camera_advanced/abductor/Destroy()
 	if(console)

code/modules/atmospherics/machinery/air_alarm/air_alarm_interact.dm

@@ -183,4 +183,4 @@
 	icon = 'icons/obj/machines/wallmounts.dmi'
 	icon_state = "alarm_bitem"
 	result_path = /obj/machinery/airalarm
-	pixel_shift = 27
+	pixel_shift = 24

code/modules/clothing/head/jobs.dm

@@ -687,7 +687,7 @@
 /obj/item/clothing/head/beret/cargo
 	name = "cargo beret"
 	desc = "No need to compensate when you can wear this beret!"
-	greyscale_colors = "#b7723d"
+	greyscale_colors = "#c99840"
 	flags_1 = NONE
 
 //Curator

code/modules/library/lib_machines.dm

@@ -26,6 +26,7 @@ GLOBAL_VAR_INIT(library_table_modified, 0)
 	circuit = /obj/item/circuitboard/computer/libraryconsole
 	desc = "Checked out books MUST be returned on time."
 	anchored_tabletop_offset = 8
+	connectable = FALSE
 	///The current book id we're searching for
 	var/book_id = null
 	///The current title we're searching for

code/modules/mining/aux_base.dm

@@ -21,6 +21,7 @@
 	icon_screen = "pod_on"
 	req_one_access = list(ACCESS_AUX_BASE, ACCESS_COMMAND)
 	circuit = /obj/item/circuitboard/computer/auxiliary_base
+	connectable = FALSE
 	/// Shuttle ID of the base
 	var/shuttleId = "colony_drop"
 	/// If we give warnings before base is launched

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

@@ -45,6 +45,9 @@
 	update_appearance()
 	register_context()
 
+	// Modular consoles all have the same case.
+	AddComponent(/datum/component/connectable_computer)
+
 /obj/machinery/modular_computer/Destroy()
 	QDEL_NULL(cpu)
 	return ..()

code/modules/power/lighting/light.dm

@@ -77,10 +77,101 @@
 	var/fire_power = 0.5
 	///The Light colour to use when working in fire alarm status
 	var/fire_colour = COLOR_FIRE_LIGHT_RED
+	///So we don't have a lot of stress on startup.
+	var/maploaded = FALSE
+	///More stress stuff.
+	var/turning_on = FALSE
+	/// Are we always flickering?
+	var/constant_flickering = FALSE
+	var/flicker_timer = null
+	var/roundstart_flicker = FALSE
+	var/firealarm = FALSE
 
 	///Power usage - W per unit of luminosity
 	var/power_consumption_rate = 20
 
+/obj/machinery/light/proc/turn_on(trigger, play_sound = TRUE)
+	if(QDELETED(src))
+		return
+	turning_on = FALSE
+	if(!on)
+		return
+	var/BR = brightness
+	var/PO = bulb_power
+	var/CO = bulb_colour
+	if(color)
+		CO = color
+	if (firealarm)
+		CO = bulb_emergency_colour
+	else if (nightshift_enabled)
+		BR = nightshift_brightness
+		PO = nightshift_light_power
+		if(!color)
+			CO = nightshift_light_color
+	var/matching = light && BR == light.light_range && PO == light.light_power && CO == light.light_color
+	if(!matching)
+		switchcount++
+		if( prob( min(60, (switchcount**2)*0.01) ) )
+			if(trigger)
+				burn_out()
+		else
+			use_power = ACTIVE_POWER_USE
+			set_light(BR, PO, CO)
+			if(play_sound)
+				playsound(src.loc, 'talestation_modules/sound/machines/lights/light_on.ogg', 65, 1)
+
+/obj/machinery/light/proc/start_flickering()
+	on = FALSE
+	update(FALSE, TRUE, FALSE)
+
+	constant_flickering = TRUE
+
+	flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_on)), rand(5, 10))
+
+/obj/machinery/light/proc/stop_flickering()
+	constant_flickering = FALSE
+
+	if(flicker_timer)
+		deltimer(flicker_timer)
+		flicker_timer = null
+
+	set_on(has_power())
+
+/obj/machinery/light/proc/alter_flicker(enable = TRUE)
+	if(!constant_flickering)
+		return
+	if(has_power())
+		on = enable
+		update(FALSE, TRUE, FALSE)
+
+/obj/machinery/light/proc/flicker_on()
+	alter_flicker(TRUE)
+	flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_off)), rand(5, 10))
+
+/obj/machinery/light/proc/flicker_off()
+	alter_flicker(FALSE)
+	flicker_timer = addtimer(CALLBACK(src, PROC_REF(flicker_on)), rand(5, 50))
+
+/obj/machinery/light/proc/firealarm_on()
+	SIGNAL_HANDLER
+
+	firealarm = TRUE
+	update()
+
+/obj/machinery/light/proc/firealarm_off()
+	SIGNAL_HANDLER
+
+	firealarm = FALSE
+	update()
+
+/obj/machinery/light/Initialize(mapload = TRUE)
+	. = ..()
+	if(on)
+		maploaded = TRUE
+
+	if(roundstart_flicker)
+		start_flickering()
+
 /obj/machinery/light/Move()
 	if(status != LIGHT_BROKEN)
 		break_light_tube(TRUE)

code/modules/reagents/chemistry/machinery/pandemic.dm

@@ -10,6 +10,7 @@
 	base_icon_state = "pandemic"
 	resistance_flags = ACID_PROOF
 	circuit = /obj/item/circuitboard/computer/pandemic
+	connectable = FALSE
 
 	/// Whether the pandemic is ready to make another culture/vaccine
 	var/wait

code/modules/shuttle/emergency.dm

@@ -668,6 +668,7 @@
 	density = FALSE
 	icon_keyboard = null
 	icon_screen = "pod_on"
+	connectable = FALSE
 
 /obj/machinery/computer/shuttle/pod/Initialize(mapload)
 	. = ..()

code/modules/shuttle/syndicate.dm

@@ -40,6 +40,7 @@
 	req_access = list(ACCESS_SYNDICATE)
 	shuttleId = "steel_rain"
 	possible_destinations = null
+	connectable = FALSE
 
 /obj/machinery/computer/shuttle/syndicate/drop_pod/launch_check(mob/user)
 	. = ..()