Merge pull request #12739 from GhostActual/late_at_night

Late Night Stuff

code/game/objects/items/weapons/material/knives.dm

@@ -88,7 +88,7 @@
 	name = "combat knife"
 	desc = "If only you had a boot to put it in."
 	icon = 'icons/obj/weapons.dmi'
-	icon_state = "tacknife"
+	icon_state = "tacknife2"
 	item_state = "knife"
 	force_divisor = 0.34 // 20 with hardness 60 (steel)
 	thrown_force_divisor = 1.75 // 20 with weight 20 (steel)
@@ -101,7 +101,7 @@
 	name = "boot knife"
 	desc = "A small fixed-blade knife for putting inside a boot."
 	icon = 'icons/obj/weapons.dmi'
-	icon_state = "tacknife"
+	icon_state = "tacknife3"
 	item_state = "knife"
 	force_divisor = 0.15
 	applies_material_colour = 0
@@ -130,7 +130,7 @@
 
 /obj/item/weapon/material/knife/butch
 	name = "butcher's cleaver"
-	icon_state = "butch"
+	icon_state = "cleaver"
 	desc = "A huge thing used for chopping and chopping up meat. This includes clowns and clown-by-products."
 	force_divisor = 0.25 // 15 when wielded with hardness 60 (steel)
 	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")

code/game/objects/structures/tank_dispenser.dm

@@ -3,7 +3,7 @@
 /obj/structure/dispenser
 	name = "tank storage unit"
 	desc = "A simple yet bulky storage device for gas tanks. Has room for up to ten oxygen tanks, and ten phoron tanks."
-	icon = 'icons/obj/objects.dmi'
+	icon = 'icons/obj/objects_vr.dmi'
 	icon_state = "dispenser"
 	density = TRUE
 	anchored = TRUE

code/modules/economy/vending_machines.dm

@@ -1530,7 +1530,7 @@
 	has_logs = 1
 
 /obj/machinery/vending/wardrobe/lawdrobe
-	name = "lawyer wardrobe vendor"
+	name = "IAA wardrobe vendor"
 	desc = "All the things you need to perform your job! Why didn't you already have them?"
 	product_slogans = "Want to do your job? Sure you do!"
 	icon_state = "lawdrobe"

code/modules/mob/living/bot/farmbot.dm

@@ -330,7 +330,7 @@
 /obj/item/weapon/farmbot_arm_assembly
 	name = "water tank/robot arm assembly"
 	desc = "A water tank with a robot arm permanently grafted to it."
-	icon = 'icons/obj/aibots.dmi'
+	icon = 'icons/obj/chemical_tanks.dmi'
 	icon_state = "water_arm"
 	var/build_step = 0
 	var/created_name = "Farmbot"

maps/tether/tether-03-surface3.dmm

@@ -22194,6 +22194,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/shuttle_pad)
 "aKj" = (
@@ -34476,6 +34479,7 @@
 	dir = 4
 	},
 /obj/effect/floor_decal/techfloor,
+/obj/machinery/light,
 /turf/simulated/floor/tiled/techfloor,
 /area/crew_quarters/sleep/cryo)
 "bhc" = (
@@ -34609,11 +34613,9 @@
 /turf/simulated/floor/tiled/white,
 /area/tether/surfacebase/medical/surgery2)
 "bhp" = (
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
-	dir = 4
-	},
+/obj/structure/disposalpipe/segment,
 /obj/machinery/light{
-	dir = 8
+	dir = 4
 	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/southhall)
@@ -41397,6 +41399,12 @@
 	},
 /turf/simulated/floor/wood,
 /area/crew_quarters/recreation_area)
+"ome" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/simulated/floor/tiled,
+/area/tether/surfacebase/southhall)
 "ooM" = (
 /obj/effect/floor_decal/steeldecal/monofloor{
 	dir = 1
@@ -42132,6 +42140,9 @@
 	icon_state = "1-2"
 	},
 /obj/structure/disposalpipe/segment,
+/obj/machinery/light{
+	dir = 4
+	},
 /turf/simulated/floor/tiled,
 /area/tether/surfacebase/shuttle_pad)
 "qze" = (
@@ -57190,8 +57201,8 @@ qbo
 bhi
 bhm
 fsd
-bhp
-beU
+qbo
+ome
 beU
 gRG
 laB
@@ -57471,7 +57482,7 @@ qvs
 bgm
 aPM
 ely
-hId
+bhp
 jCE
 hId
 bhq