From c065ad055224bcc44d7a3df31faab539fb022023 Mon Sep 17 00:00:00 2001 From: actuallynotajoke <01huh10@gmail.com> Date: Wed, 5 Jul 2023 21:45:53 +0300 Subject: [PATCH] =?UTF-8?q?Revert=20"=D0=BA=D1=80=D0=B8=D1=82=D0=B8=D0=BA?= =?UTF-8?q?=D0=B0=D0=BB=20=D1=81=D1=83=D0=BF=D0=B5=D1=80=D0=B1=D0=B0=D0=B3?= =?UTF-8?q?"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 61d5bee38f7f2b29ee83b18660bf2e57edeea6b4. --- code/modules/client/preference_setup/loadout/lists/misc.dm | 4 ++-- maps/castelnau/cadaab/castelnau-2-cadaab.dmm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/client/preference_setup/loadout/lists/misc.dm b/code/modules/client/preference_setup/loadout/lists/misc.dm index ed6b1aca4785b..321857e6dedb2 100644 --- a/code/modules/client/preference_setup/loadout/lists/misc.dm +++ b/code/modules/client/preference_setup/loadout/lists/misc.dm @@ -19,7 +19,7 @@ melee["hook"] = /obj/item/material/knife/bos/hook gear_tweaks += new/datum/gear_tweak/path(melee) -/*/datum/gear/swords //bos +/datum/gear/swords //bos display_name = "swords selection" description = "A selection of swords" path = /obj/item/material/sword/bos @@ -32,7 +32,7 @@ swords["bastard sword"] = /obj/item/material/sword/bos/bastard swords["zveinhander sword"] = /obj/item/material/sword/bos/zvein gear_tweaks += new/datum/gear_tweak/path(swords) -*/ + /datum/gear/cane display_name = "cane" path = /obj/item/cane diff --git a/maps/castelnau/cadaab/castelnau-2-cadaab.dmm b/maps/castelnau/cadaab/castelnau-2-cadaab.dmm index 5f7c2385db772..e80228491e5c2 100644 --- a/maps/castelnau/cadaab/castelnau-2-cadaab.dmm +++ b/maps/castelnau/cadaab/castelnau-2-cadaab.dmm @@ -2109,7 +2109,7 @@ "nNP" = (/obj/structure/table/standard,/obj/structure/flora/pottedplant/deskfern,/obj/effect/floor_decal/spline/fancy/wood,/turf/simulated/floor/wood/ebony,/area/cadaab/shahtinsk) "nOh" = (/obj/random/trash,/obj/machinery/light/small,/turf/simulated/floor/cadaab_wood,/area/cadaab/shahtinsk/city_like) "nPa" = (/obj/structure/bed,/obj/item/bedsheet,/obj/random/trash,/turf/simulated/floor/steel_dirty,/area/cadaab/shahtinsk/city_like) -"nPn" = (/obj/structure/table/rack,/obj/item/melee/baton/cattleprod,/obj/item/melee/baton/cattleprod,/turf/simulated/floor/exoplanet/cadaab/road,/area/cadaab/desert) +"nPn" = (/obj/structure/table/rack,/obj/item/material/sword/bos/blunted,/obj/item/material/sword/bos/blunted,/turf/simulated/floor/exoplanet/cadaab/road,/area/cadaab/desert) "nPy" = (/obj/machinery/atmospherics/pipe/simple/hidden/black{dir = 4},/obj/effect/paint_stripe/yellow,/turf/simulated/wall/ocp_wall,/area/castelnau/thruster/d2starboard) "nPI" = (/turf/simulated/floor/steel_dirty,/area/cadaab/outpost/storage) "nPT" = (/obj/machinery/firealarm{dir = 1; pixel_y = -26},/turf/simulated/floor/tiled/techfloor,/area/castelnau/security/aux)