ready

ss220club · Jun 26, 2023 · e84bed3 · e84bed3
1 parent d7c422b
commit e84bed3
Show file tree

Hide file tree

Showing 9 changed files with 712 additions and 926 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
@@ -663,6 +663,7 @@
 	smooth = SMOOTH_TRUE
 	cancolor = TRUE
 	canSmoothWith = list(
+		/obj/machinery/door/airlock,
 		/obj/structure/window/full/basic,
 		/obj/structure/window/full/reinforced,
 		/obj/structure/window/full/reinforced/tinted,
@@ -692,6 +693,7 @@
 	max_integrity = 300
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(
+		/obj/machinery/door/airlock,
 		/obj/structure/window/full/basic,
 		/obj/structure/window/full/reinforced,
 		/obj/structure/window/full/reinforced/tinted,
@@ -731,6 +733,7 @@
 	glass_type = /obj/item/stack/sheet/plasmarglass
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(
+		/obj/machinery/door/airlock,
 		/obj/structure/window/full/basic,
 		/obj/structure/window/full/reinforced,
 		/obj/structure/window/full/reinforced/tinted,
@@ -762,6 +765,7 @@
 	icon_state = "r_window"
 	smooth = SMOOTH_TRUE
 	canSmoothWith = list(
+		/obj/machinery/door/airlock,
 		/obj/structure/window/full/basic,
 		/obj/structure/window/full/reinforced,
 		/obj/structure/window/full/reinforced/tinted,

diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
@@ -36,6 +36,7 @@
 	var/girder_type = /obj/structure/girder
 
 	canSmoothWith = list(
+	/obj/machinery/door/airlock,
 	/obj/structure/window/full/basic,
 	/obj/structure/window/full/reinforced,
 	/obj/structure/window/full/reinforced/tinted,

diff --git a/code/modules/hydroponics/gene_modder.dm b/code/modules/hydroponics/gene_modder.dm
@@ -91,6 +91,7 @@
 		icon_state = "dnamod"
 	if(seed)
 		overlays += "dnamod-dna"
+		overlays += "dnamod-disk"
 	if(panel_open)
 		overlays += "dnamod-open"
 

diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
diff --git a/icons/obj/machines/arcade.dmi b/icons/obj/machines/arcade.dmi
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
diff --git a/icons/obj/pda.dmi b/icons/obj/pda.dmi