Fixes merge conflict with 10X28

cmss13-devs · Aug 24, 2024 · c87d5dd · c87d5dd
1 parent fd285bc
commit c87d5dd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi
diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi
diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi
diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi
diff --git a/maps/map_files/chapaev/chapaev.dmm b/maps/map_files/chapaev/chapaev.dmm
@@ -350,6 +350,11 @@
 /obj/structure/machinery/light/small{
 	dir = 8
 	},
+/obj/structure/bed/chair{
+	dir = 4;
+	pixel_y = 6;
+	pixel_x = 2
+	},
 /turf/open/floor/strata{
 	dir = 4;
 	icon_state = "floor3"
@@ -582,7 +587,7 @@
 "eD" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/structure/machinery/computer/emails{
-	dir = 8;
+	dir = 8
 	},
 /obj/item/device/flashlight/lamp/on{
 	pixel_y = 21;
@@ -1430,6 +1435,7 @@
 "lP" = (
 /obj/structure/surface/table/reinforced/almayer_B,
 /obj/item/ammo_magazine/shotgun/slug/heavy,
+/obj/item/weapon/gun/shotgun/type23,
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -2909,9 +2915,6 @@
 	pixel_y = 10
 	},
 /obj/structure/pipes/vents/pump,
-/obj/structure/machinery/light/small{
-	invisibility = 101
-	},
 /turf/open/floor/strata{
 	dir = 4;
 	icon_state = "floor3"
@@ -4746,6 +4749,7 @@
 	pixel_x = 3
 	},
 /obj/item/ammo_magazine/shotgun/buckshot/heavy,
+/obj/item/weapon/gun/shotgun/type23,
 /turf/open/floor/strata{
 	icon_state = "floor2"
 	},
@@ -15349,7 +15353,7 @@ PJ
 xD
 xD
 cv
-PJ
+xD
 gh
 cT
 tL
@@ -16428,7 +16432,7 @@ uP
 uP
 Bh
 ts
-cQ
+ts
 ts
 cQ
 HI