Baylike Walls and Windows

citadel.dme

@@ -291,6 +291,7 @@
 #include "code\__HELPERS\animations.dm"
 #include "code\__HELPERS\areas.dm"
 #include "code\__HELPERS\atom_movables.dm"
+#include "code\__HELPERS\bitflag.dm"
 #include "code\__HELPERS\chat.dm"
 #include "code\__HELPERS\datum.dm"
 #include "code\__HELPERS\debugging.dm"
@@ -1243,6 +1244,7 @@
 #include "code\game\machinery\doors\airlock.dm"
 #include "code\game\machinery\doors\airlock_control.dm"
 #include "code\game\machinery\doors\airlock_electronics.dm"
+#include "code\game\machinery\doors\airlock_subtypes.dm"
 #include "code\game\machinery\doors\airlock_vr.dm"
 #include "code\game\machinery\doors\alarmlock.dm"
 #include "code\game\machinery\doors\blast_door.dm"
@@ -1757,6 +1759,7 @@
 #include "code\game\objects\structures\ledges.dm"
 #include "code\game\objects\structures\lightpost.dm"
 #include "code\game\objects\structures\loot_piles.dm"
+#include "code\game\objects\structures\low_wall.dm"
 #include "code\game\objects\structures\map_blocker.dm"
 #include "code\game\objects\structures\medical_stand_vr.dm"
 #include "code\game\objects\structures\mineral_bath.dm"
@@ -1783,7 +1786,8 @@
 #include "code\game\objects\structures\windoor_assembly.dm"
 #include "code\game\objects\structures\window.dm"
 #include "code\game\objects\structures\window_spawner.dm"
-#include "code\game\objects\structures\crates_lockers\closets.dm"
+#include "code\game\objects\structures\crates_lockers\__closet.dm"
+#include "code\game\objects\structures\crates_lockers\_closet_appearance_definitions.dm"
 #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\vehiclecage.dm"
@@ -2895,6 +2899,7 @@
 #include "code\modules\mapping\map_template.dm"
 #include "code\modules\mapping\minimaps.dm"
 #include "code\modules\mapping\multiz_helpers.dm"
+#include "code\modules\mapping\paint.dm"
 #include "code\modules\mapping\shuttle.dm"
 #include "code\modules\mapping\submap.dm"
 #include "code\modules\mapping\submaps_legacy.dm"

code/__DEFINES/_planes+layers.dm

@@ -173,6 +173,7 @@
 #define OBJ_PLANE -35
 #define OBJ_PLANE_RENDER_TARGET "OBJ_PLANE"
 
+#define WALL_LAYER         (TURF_LAYER+0.3) //! For walls.
 #define DEBRIS_LAYER       (TURF_LAYER+0.4) /// Cleanable debris.
 #define STAIRS_LAYER       (TURF_LAYER+0.5) /// Layer for stairs.
 #define DOOR_OPEN_LAYER    (TURF_LAYER+0.7) /// Under all objects if opened. 2.7 due to tables being at 2.6.
@@ -184,6 +185,8 @@
 
 #define ABOVE_JUNK_LAYER   (OBJ_LAYER+0.1) /// Things that want to be slightly above common objects.
 #define DOOR_CLOSED_LAYER  (OBJ_LAYER+0.1) /// Doors when closed.
+#define LOW_WALL_LAYER     (OBJ_LAYER+0.11)
+#define GRILLE_LAYER       (OBJ_LAYER+0.12)
 #define WINDOW_LAYER       (OBJ_LAYER+0.2) /// Windows.
 #define ON_WINDOW_LAYER    (OBJ_LAYER+0.3) /// Ontop of a window.
 #define ABOVE_WINDOW_LAYER (OBJ_LAYER+0.4) /// Above full tile windows so wall items are clickable.

code/__DEFINES/bitflags.dm

@@ -0,0 +1,3 @@
+#define BITSHIFT_LEFT(X, N) (X << (N))
+#define BITSHIFT_RIGHT(X, N) (X >> (N))
+#define BITFLAG(X) BITSHIFT_LEFT(1, X)

code/__DEFINES/color/color.dm

@@ -34,6 +34,70 @@
 #define COLOR_PALE_PURPLE_GRAY			"#BDA2BA"
 #define COLOR_PURPLE_GRAY				"#A2819E"
 #define COLOR_DEEP_SKY_BLUE				"#00e1ff"
+#define COLOR_NAVY_BLUE                 "#000080"
+#define COLOR_DARK_GRAY                 "#404040"
+#define COLOR_VIOLET                    "#9933ff"
+#define COLOR_EXPLO_VIOLET              "#410083"
+#define COLOR_BROWN_ORANGE              "#824b28"
+#define COLOR_GRAY40                    "#666666"
+#define COLOR_GRAY20                    "#333333"
+#define COLOR_GRAY15                    "#151515"
+#define COLOR_SEDONA                    "#cc6600"
+#define COLOR_DARK_RED                  "#aa0000"
+#define COLOR_PALE_PINK                 "#bf89ba"
+#define COLOR_YELLOW_GRAY               "#c9a344"
+#define COLOR_PALE_YELLOW               "#c1bb7a"
+#define COLOR_WARM_YELLOW               "#b3863c"
+#define COLOR_DARK_GREEN_GRAY           "#54654c"
+#define COLOR_DARK_BLUE_GRAY            "#3e4855"
+#define COLOR_SURGERY_BLUE              "#e0f2f6"
+#define COLOR_SUN                       "#ec8b2f"
+#define COLOR_BLUE_LIGHT                "#33ccff"
+#define COLOR_BABY_BLUE                 "#89cff0"
+#define COLOR_ACID_CYAN                 "#00ffc8"
+#define COLOR_GRAY80                    "#cccccc"
+#define COLOR_OFF_WHITE                 "#eeeeee"
+#define COLOR_EGGSHELL                  "#e4e0d2"
+#define COLOR_CLOSET_GOLD               "#6d6133"
+#define COLOR_NT_RED                    "#9d2300"
+#define COLOR_BOTTLE_GREEN              "#1f6b4f"
+#define COLOR_PALE_BTL_GREEN            "#57967f"
+#define COLOR_GUNMETAL                  "#545c68"
+#define COLOR_WALL_GUNMETAL             "#353a42"
+#define COLOR_STEEL                     "#a8b0b2"
+#define COLOR_MUZZLE_FLASH              "#ffffb2"
+#define COLOR_CHESTNUT                  "#996633"
+#define COLOR_COPPER                    "#b87333"
+#define COLOR_BEASTY_BROWN              "#663300"
+#define COLOR_WHEAT                     "#ffff99"
+#define COLOR_CYAN_BLUE                 "#3366cc"
+#define COLOR_CYAN_DARK                 "#006999"
+#define COLOR_LIGHT_CYAN                "#66ccff"
+#define COLOR_PAKISTAN_GREEN            "#006600"
+#define COLOR_HULL                      "#436b8e"
+#define COLOR_AMBER                     "#ffbf00"
+#define COLOR_COMMAND_BLUE              "#46698c"
+#define COLOR_SKY_BLUE                  "#5ca1cc"
+#define COLOR_PALE_ORANGE               "#b88a3b"
+#define COLOR_CIVIE_GREEN               "#b7f27d"
+#define COLOR_TITANIUM                  "#d1e6e3"
+#define COLOR_DARK_GUNMETAL             "#4c535b"
+#define COLOR_BRONZE                    "#8c7853"
+#define COLOR_TAN			            "#a39682"
+#define COLOR_BRASS                     "#b99d71"
+#define COLOR_POLISHED_BRASS            "#fdef6e"
+#define COLOR_INDIGO                    "#4b0082"
+#define COLOR_ALUMINIUM                 "#bbbbbb"
+#define COLOR_CRYSTAL                   "#00c8a5"
+#define COLOR_DIAMOND                   "#d8d4ea"
+
+#define WOOD_COLOR_GENERIC     "#d5a66e"
+#define WOOD_COLOR_RICH        "#792f27"
+#define WOOD_COLOR_PALE        "#d2bc9d"
+#define WOOD_COLOR_PALE2       "#e6d2ba"
+#define WOOD_COLOR_BLACK       "#332521"
+#define WOOD_COLOR_CHOCOLATE   "#543c30"
+#define WOOD_COLOR_YELLOW      "#e3994e"
 
 // Color defines used by the assembly detailer.
 #define COLOR_ASSEMBLY_BLACK			"#545454"
@@ -63,3 +127,8 @@
 #define COLOR_DARKMODE_BACKGROUND		"#202020"
 #define COLOR_DARKMODE_DARKBACKGROUND	"#171717"
 #define COLOR_DARKMODE_TEXT				"#a4bad6"
+
+#define GLASS_COLOR            "#AACCFF"
+#define GLASS_COLOR_SILICATE   "#7C3A9A"
+#define GLASS_COLOR_TINTED     "#222222"
+#define GLASS_COLOR_FROSTED    "#EEEEEE"

code/__HELPERS/bitflag.dm

@@ -0,0 +1,3 @@
+#define BITSHIFT_LEFT(X, N) (X << (N))
+#define BITSHIFT_RIGHT(X, N) (X >> (N))
+#define BITFLAG(X) BITSHIFT_LEFT(1, X)

code/game/gamemodes/events.dm

@@ -91,7 +91,7 @@ var/hadevent    = 0
 			for (var/obj/machinery/door/airlock/security/temp_airlock in A)
 				spawn(0) temp_airlock.prison_open()
 
-			for (var/obj/machinery/door/airlock/glass_security/temp_glassairlock in A)
+			for (var/obj/machinery/door/airlock/glass/security/temp_glassairlock in A)
 				spawn(0) temp_glassairlock.prison_open()
 
 			for (var/obj/machinery/door_timer/temp_timer in A)

code/game/machinery/air_alarm.dm

@@ -328,6 +328,19 @@ GLOBAL_LIST_EMPTY(air_alarms)
 /obj/machinery/alarm/update_icon()
 	cut_overlays()
 
+	pixel_x = 0
+	pixel_y = 0
+	var/turf/T = get_step(get_turf(src), turn(dir, 180))
+	if(istype(T) && T.density)
+		if(dir == NORTH)
+			pixel_y = -21
+		else if(dir == SOUTH)
+			pixel_y = 21
+		else if(dir == WEST)
+			pixel_x = 21
+		else if(dir == EAST)
+			pixel_x = -21
+
 	if(panel_open)
 		icon_state = "alarmx"
 		set_light(0)

code/game/machinery/camera/camera.dm

@@ -1,7 +1,7 @@
 /obj/machinery/camera
 	name = "security camera"
 	desc = "It's used to monitor rooms."
-	icon = 'icons/obj/monitors_vr.dmi'
+	icon = 'icons/obj/monitors.dmi'
 	icon_state = "camera"
 	use_power = USE_POWER_ACTIVE
 	idle_power_usage = 5
@@ -65,6 +65,7 @@
 	if(!c_tag)
 		var/area/A = get_area(src)
 		c_tag = "[A ? A.name : "Unknown"] #[rand(111,999)]"
+	update_icon()
 	return ..()
 
 /obj/machinery/camera/Destroy()
@@ -294,6 +295,18 @@
 	else
 		icon_state = initial(icon_state)
 
+	pixel_x = 0
+	pixel_y = 0
+
+	var/turf/T = get_step(get_turf(src), turn(src.dir, 180))
+	if(istype(T, /turf/simulated/wall))
+		if(dir == SOUTH)
+			pixel_y = 21
+		else if(dir == WEST)
+			pixel_x = 10
+		else if(dir == EAST)
+			pixel_x = -10
+
 /obj/machinery/camera/proc/triggerCameraAlarm(duration = 0)
 	alarm_on = 1
 	camera_alarm.triggerAlarm(loc, src, duration)