diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index f743ab87f2..9d5b1eb399 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -396,4 +396,20 @@ GLOBAL_LIST_BOILERPLATE(all_pai_cards, /obj/item/device/paicard)
 		name = initial(src.name)
 		to_chat(AI, span_notice("You feel a tad claustrophobic as your mind closes back into your card, ejecting from \the [initial(src.name)]."))
 		if(user)
-			to_chat(user, span_notice("You eject the card from \the [initial(src.name)]."))
\ No newline at end of file
+<<<<<<< HEAD
+			to_chat(user, span_notice("You eject the card from \the [initial(src.name)]."))
+=======
+			to_chat(user, span_notice("You eject the card from \the [initial(src.name)]."))
+
+/obj/item/device/paicard/typeb
+	name = "personal AI device"
+	icon = 'icons/obj/paicard.dmi'
+
+/obj/random/paicard
+	name = "personal AI device spawner"
+	icon = 'icons/obj/paicard.dmi'
+	icon_state = "pai"
+
+/obj/random/paicard/item_to_spawn()
+	return pick(/obj/item/device/paicard ,/obj/item/device/paicard/typeb)
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
diff --git a/code/modules/client/preference_setup/loadout/loadout_utility.dm b/code/modules/client/preference_setup/loadout/loadout_utility.dm
index ea12b86778..ca2bd1e08d 100644
--- a/code/modules/client/preference_setup/loadout/loadout_utility.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_utility.dm
@@ -72,9 +72,13 @@
 	path = /obj/item/weapon/folder/yellow
 
 /datum/gear/utility/paicard
-	display_name = "personal AI device"
+	display_name = "personal AI device (classic)"
 	path = /obj/item/device/paicard
 
+/datum/gear/utility/paicard_b
+	display_name = "personal AI device (new)"
+	path = /obj/item/device/paicard/typeb
+
 /datum/gear/utility/securecase
 	display_name = "secure briefcase"
 	path =/obj/item/weapon/storage/secure/briefcase
diff --git a/code/modules/emotes/definitions/audible_furry_vr.dm b/code/modules/emotes/definitions/audible_furry_vr.dm
index 61d980ad27..7a98f53a23 100644
--- a/code/modules/emotes/definitions/audible_furry_vr.dm
+++ b/code/modules/emotes/definitions/audible_furry_vr.dm
@@ -155,6 +155,12 @@
             emote_sound = pick(smolsound)
         else
             emote_sound = pick(bigsound)
+    else if(istype(user, /mob/living/silicon/pai))
+        var/mob/living/silicon/pai/me = user
+        if(me.chassis == "teppi")
+            emote_sound = pick(bigsound)
+        else
+            emote_sound = pick(smolsound)
     else if(user.size_multiplier >= 1.5)
         emote_sound = pick(bigsound)
     else
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index bcdeb751a4..13b6e32763 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -48,6 +48,11 @@
 		"Duffel" = "pai-duffel",
 		"Rat" = "rat",
 		"Panther" = "panther",
+<<<<<<< HEAD
+=======
+		"Cyber Elf" = "cyberelf",
+		"Teppi" = "teppi"
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 		//VOREStation Addition End
 		)
 
diff --git a/code/modules/mob/living/silicon/pai/pai_vr.dm b/code/modules/mob/living/silicon/pai/pai_vr.dm
index d5f989b67e..f4de9bda15 100644
--- a/code/modules/mob/living/silicon/pai/pai_vr.dm
+++ b/code/modules/mob/living/silicon/pai/pai_vr.dm
@@ -3,8 +3,47 @@
 	icon = 'icons/mob/pai_vr.dmi'
 	var/global/list/wide_chassis = list(
 		"rat",
-		"panther"
+		"panther",
+		"teppi"
 		)
+<<<<<<< HEAD
+=======
+	var/global/list/flying_chassis = list(
+		"pai-parrot",
+		"pai-bat",
+		"pai-butterfly",
+		"pai-hawk",
+		"cyberelf"
+		)
+
+	//Sure I could spend all day making wacky overlays for all of the different forms
+	//but quite simply most of these sprites aren't made for that, and I'd rather just make new ones
+	//the birds especially! Just naw. If someone else wants to mess with 12x4 frames of animation where
+	//most of the pixels are different kinds of green and tastefully translate that to whitescale
+	//they can have fun with that! I not doing it!
+	var/global/list/allows_eye_color = list(
+		"pai-repairbot",
+		"pai-typezero",
+		"pai-bat",
+		"pai-butterfly",
+		"pai-mouse",
+		"pai-monkey",
+		"pai-raccoon",
+		"pai-cat",
+		"rat",
+		"panther",
+		"pai-bear",
+		"pai-fen",
+		"cyberelf",
+		"teppi"
+		)
+
+/mob/living/silicon/pai/Initialize()
+	. = ..()
+	
+	verbs |= /mob/living/proc/hide
+	verbs |= /mob/living/proc/vertical_nom
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 
 /mob/living/silicon/pai/proc/pai_nom(var/mob/living/T in oview(1))
 	set name = "pAI Nom"
@@ -42,6 +81,7 @@
 			icon_state = "[chassis]_rest_full"
 		else
 			icon_state = "[chassis]_rest"
+<<<<<<< HEAD
 
 	if(chassis in wide_chassis)
 		icon = 'icons/mob/pai_vr64x64.dmi'
@@ -51,6 +91,15 @@
 		icon = 'icons/mob/pai_vr.dmi'
 		pixel_x = 0
 		vis_height = 32
+=======
+	if(chassis in wide_chassis)
+		pixel_x = -16
+		default_pixel_x = -16
+	else
+		pixel_x = 0
+		default_pixel_x = 0
+	add_eyes()
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 
 /mob/living/silicon/pai/update_icons() //And other functions cause this to occur, such as digesting someone.
 	..()
@@ -63,6 +112,16 @@
 		icon_state = "[chassis]_full"
 	else if(people_eaten && resting)
 		icon_state = "[chassis]_rest_full"
+<<<<<<< HEAD
+=======
+	if(chassis in wide_chassis)
+		pixel_x = -16
+		default_pixel_x = -16
+	else
+		pixel_x = 0
+		default_pixel_x = 0
+	add_eyes()
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 
 	if(chassis in wide_chassis)
 		icon = 'icons/mob/pai_vr64x64.dmi'
@@ -79,7 +138,48 @@
 	choice = tgui_input_list(usr, "What would you like to use for your mobile chassis icon?", "Chassis Choice", possible_chassis)
 	if(!choice) return
 	chassis = possible_chassis[choice]
+<<<<<<< HEAD
 	verbs |= /mob/living/proc/hide
+=======
+	if(chassis in wide_chassis)
+		icon = 'icons/mob/pai_vr64x64.dmi'
+		vis_height = 64
+	else
+		icon = 'icons/mob/pai_vr.dmi'
+		vis_height = 32
+
+	if(chassis in flying_chassis)
+		hovering = TRUE
+	else
+		hovering = FALSE
+		if(isopenspace(loc))
+			fall()
+
+	update_icon()
+
+/mob/living/silicon/pai/verb/toggle_eyeglow()
+	set category = "pAI Commands"
+	set name = "Toggle Eye Glow"
+	if(chassis in allows_eye_color)
+		if(eye_glow)
+			eye_glow = FALSE
+		else
+			eye_glow = TRUE
+		update_icon()
+	else
+		to_chat(src, "Your selected chassis cannot modify its eye glow!")
+		return
+
+
+/mob/living/silicon/pai/verb/pick_eye_color()
+	set category = "pAI Commands"
+	set name = "Pick Eye Color"
+	if(chassis in allows_eye_color)
+	else
+		to_chat(src, "<span class='warning'>Your selected chassis eye color can not be modified. The color you pick will only apply to supporting chassis and your card screen.</span>")
+
+	eye_color = input(src, "Choose your character's eye color:", "Eye Color") as color|null
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 	update_icon()
 // Release belly contents before being gc'd!
 /mob/living/silicon/pai/Destroy()
diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm
index 13a6d04536..8a44ae02c3 100644
--- a/maps/groundbase/gb-z1.dmm
+++ b/maps/groundbase/gb-z1.dmm
@@ -921,7 +921,7 @@ lel
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/random/tech_supply,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/tiled,
 /area/groundbase/civilian/toolstorage)
 "cr" = (
@@ -5650,7 +5650,7 @@ lel
 /area/groundbase/security/lobby)
 "nU" = (
 /obj/structure/table/reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/machinery/recharger{
 	pixel_y = 5
 	},
@@ -7505,6 +7505,20 @@ lel
 	},
 /turf/simulated/floor/tiled/dark,
 /area/groundbase/security/lobby)
+<<<<<<< HEAD
+=======
+"sq" = (
+/obj/structure/table/woodentable,
+/obj/random/paicard,
+/obj/structure/cable/yellow{
+	icon_state = "2-8"
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 6
+	},
+/turf/simulated/floor/carpet/turcarpet,
+/area/groundbase/civilian/gameroom)
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 "sr" = (
 /obj/structure/toilet,
 /obj/machinery/button/remote/airlock{
diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm
index 523fa9fa6d..0efdbb2a7a 100644
--- a/maps/groundbase/gb-z2.dmm
+++ b/maps/groundbase/gb-z2.dmm
@@ -5193,7 +5193,7 @@
 /area/groundbase/command/hop)
 "pA" = (
 /obj/structure/table/hardwoodtable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/structure/cable/yellow{
 	icon_state = "1-2"
 	},
@@ -8757,7 +8757,7 @@
 	pixel_y = 4
 	},
 /obj/item/weapon/circuitboard/teleporter,
-/obj/item/device/paicard{
+/obj/random/paicard{
 	pixel_x = 4
 	},
 /obj/item/device/taperecorder{
diff --git a/maps/offmap_vr/om_ships/abductor.dmm b/maps/offmap_vr/om_ships/abductor.dmm
index cb1da57de2..da419a7d9e 100644
--- a/maps/offmap_vr/om_ships/abductor.dmm
+++ b/maps/offmap_vr/om_ships/abductor.dmm
@@ -105,8 +105,8 @@
 /area/abductor)
 "hj" = (
 /obj/structure/table/alien,
-/obj/item/device/paicard,
-/obj/item/device/paicard,
+/obj/random/paicard,
+/obj/random/paicard,
 /turf/simulated/shuttle/floor/alienplating,
 /area/abductor)
 "hq" = (
diff --git a/maps/offmap_vr/om_ships/itglight.dmm b/maps/offmap_vr/om_ships/itglight.dmm
index 6c8a11d2aa..d4cd850274 100644
--- a/maps/offmap_vr/om_ships/itglight.dmm
+++ b/maps/offmap_vr/om_ships/itglight.dmm
@@ -6379,7 +6379,7 @@
 /area/itglight/common)
 "MF" = (
 /obj/structure/table/wooden_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/glass/reinforced,
 /area/itglight/common)
 "MG" = (
diff --git a/maps/offmap_vr/talon/talon_v2.dmm b/maps/offmap_vr/talon/talon_v2.dmm
index 2268ea9c82..fae0f00c0f 100644
--- a/maps/offmap_vr/talon/talon_v2.dmm
+++ b/maps/offmap_vr/talon/talon_v2.dmm
@@ -190,7 +190,7 @@
 /obj/machinery/light/small{
 	dir = 1
 	},
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/tiled/techfloor,
 /area/talon_v2/workroom)
 "ax" = (
@@ -15515,7 +15515,7 @@
 /area/talon_v2/crew_quarters/eng_room)
 "Xi" = (
 /obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/wood,
 /area/talon_v2/crew_quarters/meditation)
 "Xl" = (
diff --git a/maps/stellardelight/stellar_delight1.dmm b/maps/stellardelight/stellar_delight1.dmm
index d86cdc040e..1b7216ec14 100644
--- a/maps/stellardelight/stellar_delight1.dmm
+++ b/maps/stellardelight/stellar_delight1.dmm
@@ -21694,7 +21694,7 @@
 /area/library)
 "Uj" = (
 /obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
diff --git a/maps/stellardelight/stellar_delight2.dmm b/maps/stellardelight/stellar_delight2.dmm
index 99e06e2a6c..24a6192ea5 100644
--- a/maps/stellardelight/stellar_delight2.dmm
+++ b/maps/stellardelight/stellar_delight2.dmm
@@ -5699,7 +5699,7 @@
 /area/maintenance/stellardelight/deck2/atmos)
 "mJ" = (
 /obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/tiled/eris/steel/brown_platform,
 /area/crew_quarters/bar)
 "mK" = (
@@ -7921,7 +7921,7 @@
 /obj/random/tech_supply,
 /obj/random/tech_supply,
 /obj/random/tech_supply,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/machinery/atmospherics/unary/vent_pump/on,
 /obj/machinery/newscaster{
 	pixel_y = 28
@@ -21786,7 +21786,7 @@
 /area/medical/reception)
 "WR" = (
 /obj/structure/table/wooden_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/tiled/eris/dark/cargo,
 /area/crew_quarters/recreation_area)
 "WS" = (
diff --git a/maps/stellardelight/stellar_delight3.dmm b/maps/stellardelight/stellar_delight3.dmm
index 051c6a353e..3dff8303ce 100644
--- a/maps/stellardelight/stellar_delight3.dmm
+++ b/maps/stellardelight/stellar_delight3.dmm
@@ -1605,7 +1605,7 @@
 /area/maintenance/stellardelight/deck3/foreportroomb)
 "gk" = (
 /obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/floor/wood,
 /area/stellardelight/deck3/cafe)
 "gl" = (
@@ -5050,7 +5050,7 @@
 /area/space)
 "sI" = (
 /obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/machinery/atmospherics/unary/vent_scrubber/on,
 /turf/simulated/floor/bluegrid,
 /area/ai_cyborg_station)
@@ -10231,7 +10231,7 @@
 /turf/simulated/floor,
 /area/maintenance/stellardelight/deck3/starboardaft)
 "Lm" = (
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/structure/table/glass,
 /obj/machinery/camera/network/civilian{
 	dir = 8
@@ -13680,7 +13680,7 @@
 	name = "station intercom (Science)";
 	pixel_y = 24
 	},
-/obj/item/device/paicard{
+/obj/random/paicard{
 	pixel_x = 4
 	},
 /obj/item/weapon/paper_bin{
diff --git a/maps/submaps/admin_use_vr/dojo.dmm b/maps/submaps/admin_use_vr/dojo.dmm
index fd50bcf52f..a2bd85f37f 100644
--- a/maps/submaps/admin_use_vr/dojo.dmm
+++ b/maps/submaps/admin_use_vr/dojo.dmm
@@ -432,7 +432,7 @@
 /area/ninja_dojo/dojo)
 "bc" = (
 /obj/structure/table/steel_reinforced,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /obj/item/device/pda/syndicate,
 /turf/simulated/shuttle/floor/voidcraft/light,
 /area/shuttle/ninja)
diff --git a/maps/submaps/admin_use_vr/skipjack.dmm b/maps/submaps/admin_use_vr/skipjack.dmm
index 2c252f6ad8..2e12a90bc4 100644
--- a/maps/submaps/admin_use_vr/skipjack.dmm
+++ b/maps/submaps/admin_use_vr/skipjack.dmm
@@ -14,7 +14,7 @@
 /area/skipjack_station)
 "ad" = (
 /obj/structure/table/standard,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/unsimulated/floor{
 	icon_state = "steel"
 	},
diff --git a/maps/submaps/admin_use_vr/wizard.dmm b/maps/submaps/admin_use_vr/wizard.dmm
index b85af43205..aa97a3f082 100644
--- a/maps/submaps/admin_use_vr/wizard.dmm
+++ b/maps/submaps/admin_use_vr/wizard.dmm
@@ -240,7 +240,7 @@
 /area/wizard_station)
 "aB" = (
 /obj/structure/table/woodentable,
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/unsimulated/floor{
 	dir = 8;
 	icon_state = "wood"
diff --git a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
index c641f359b8..5e8cc12496 100644
--- a/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
+++ b/maps/submaps/surface_submaps/mountains/quarantineshuttle.dmm
@@ -344,7 +344,7 @@
 	},
 /area/submap/cave/qShuttle)
 "aX" = (
-/obj/item/device/paicard,
+/obj/random/paicard,
 /turf/simulated/shuttle/floor{
 	icon_state = "floor_yellow"
 	},
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 4c7792436a..1efc840213 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -7795,6 +7795,10 @@
 	pixel_x = 32
 	},
 /obj/structure/table/standard,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/tiled,
 /area/storage/primary)
 "amW" = (
@@ -29178,6 +29182,10 @@
 	dir = 8
 	},
 /obj/structure/table/standard,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/tiled,
 /area/crew_quarters/visitor_laundry)
 "aWW" = (
@@ -34030,6 +34038,21 @@
 	},
 /turf/simulated/floor/plating,
 /area/maintenance/lower/mining_eva)
+<<<<<<< HEAD
+=======
+"hTk" = (
+/obj/structure/table/standard{
+	name = "plastic table frame"
+	},
+/obj/structure/cable/orange{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/obj/random/paicard,
+/turf/simulated/floor/tiled,
+/area/crew_quarters/locker)
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 "hTw" = (
 /obj/structure/cable/green{
 	d1 = 1;
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 056240b0c3..ce58f4be52 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -13229,6 +13229,10 @@
 /obj/machinery/recharger,
 /obj/item/weapon/storage/toolbox/mechanical,
 /obj/random/drinkbottle,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/tiled/techfloor,
 /area/maintenance/lower/bar)
 "avg" = (
@@ -22139,7 +22143,7 @@
 /obj/item/device/taperecorder{
 	pixel_x = -3
 	},
-/obj/item/device/paicard{
+/obj/random/paicard{
 	pixel_x = 4
 	},
 /obj/item/weapon/circuitboard/teleporter,
@@ -31006,6 +31010,13 @@
 /obj/machinery/atmospherics/unary/vent_scrubber/on{
 	dir = 4
 	},
+<<<<<<< HEAD
+=======
+/obj/structure/sign/painting/public{
+	pixel_x = -30
+	},
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/wood,
 /area/tether/surfacebase/reading_room)
 "biK" = (
@@ -31859,6 +31870,10 @@
 	pixel_x = -23
 	},
 /obj/random/junk,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/plating,
 /area/maintenance/lower/atmos)
 "bkE" = (
diff --git a/maps/tether/tether-03-surface3.dmm b/maps/tether/tether-03-surface3.dmm
index 0a30f5c276..d624ce5e1a 100644
--- a/maps/tether/tether-03-surface3.dmm
+++ b/maps/tether/tether-03-surface3.dmm
@@ -8550,6 +8550,10 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 8
 	},
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
 "anb" = (
@@ -9997,6 +10001,10 @@
 /obj/random/maintenance/medical,
 /obj/random/maintenance/clean,
 /obj/random/maintenance/clean,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/plating,
 /area/tether/surfacebase/surface_three_hall)
 "apA" = (
@@ -41183,6 +41191,30 @@
 	},
 /turf/simulated/floor/carpet,
 /area/tether/surfacebase/security/hos)
+<<<<<<< HEAD
+=======
+"lHr" = (
+/obj/structure/table/woodentable,
+/obj/random/paicard,
+/turf/simulated/floor/wood,
+/area/tether/surfacebase/entertainment)
+"lIe" = (
+/obj/effect/floor_decal/borderfloor,
+/obj/effect/floor_decal/corner/lightgrey/border,
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 8
+	},
+/obj/effect/floor_decal/steeldecal/steel_decals7{
+	dir = 1
+	},
+/obj/structure/cable/orange{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8"
+	},
+/turf/simulated/floor/tiled,
+/area/hallway/lower/third_south)
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 "lMj" = (
 /obj/structure/window/reinforced,
 /obj/structure/window/reinforced{
diff --git a/maps/tether/tether-04-transit.dmm b/maps/tether/tether-04-transit.dmm
index 42558a35ec..4bb461fdbb 100644
--- a/maps/tether/tether-04-transit.dmm
+++ b/maps/tether/tether-04-transit.dmm
@@ -1182,7 +1182,20 @@
 	},
 /turf/simulated/floor/tiled/dark,
 /area/tether/midpoint)
+<<<<<<< HEAD
 "Y" = (
+=======
+"Ud" = (
+/obj/structure/table/woodentable,
+/obj/random/paicard,
+/turf/simulated/floor/midpoint_glass/reinf,
+/area/tether/midpoint)
+"Ui" = (
+/obj/structure/disposalpipe/segment{
+	dir = 4;
+	icon_state = "pipe-c"
+	},
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /obj/structure/cable{
 	d1 = 4;
 	d2 = 8;
diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm
index db6aa44b69..fb27a3e852 100644
--- a/maps/tether/tether-05-station1.dmm
+++ b/maps/tether/tether-05-station1.dmm
@@ -842,6 +842,38 @@
 "abZ" = (
 /turf/simulated/wall/r_wall,
 /area/engineering/atmos/backup)
+<<<<<<< HEAD
+=======
+"aca" = (
+/obj/machinery/holoposter{
+	pixel_y = -30
+	},
+/obj/structure/table/standard,
+/obj/random/soap,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/turf/simulated/floor/tiled,
+/area/teleporter/departing)
+"acb" = (
+/obj/machinery/firealarm{
+	dir = 1;
+	pixel_y = -24
+	},
+/obj/structure/table/standard,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+	dir = 4
+	},
+/obj/random/paicard,
+/turf/simulated/floor/tiled,
+/area/teleporter/departing)
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 "acc" = (
 /obj/structure/grille,
 /obj/machinery/door/firedoor/glass,
@@ -27147,6 +27179,10 @@
 /obj/random/maintenance/clean,
 /obj/random/maintenance/clean,
 /obj/random/junk,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor,
 /area/maintenance/station/exploration)
 "lVJ" = (
@@ -29076,6 +29112,10 @@
 	layer = 2.9
 	},
 /obj/random/junk,
+<<<<<<< HEAD
+=======
+/obj/random/paicard,
+>>>>>>> 1df6e69b74... Merge pull request #13038 from Very-Soft/teppipai
 /turf/simulated/floor/plating,
 /area/maintenance/station/cargo)
 "nCS" = (