From 9324a1bdfb80796a9788e4466d58b60f88809233 Mon Sep 17 00:00:00 2001 From: FelixRuin Date: Sun, 12 Jan 2025 22:33:56 +0300 Subject: [PATCH 1/3] Update weaponry.dm --- code/game/objects/items/weaponry.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 35f768d8724a..9281763bb44c 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -943,6 +943,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 var/throwforce_off // Damage when off var/weight_class_on // What is the new size class when turned on +/* BLUEMOON DELETE добавить когда спрайт от него найдётся ;P /obj/item/melee/baseball_bat/Initialize(mapload) . = ..() if(prob(1)) @@ -950,6 +951,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 desc = "You've got red on you." icon_state = "baseball_bat_brit" item_state = "baseball_bat_brit" +*/ /obj/item/melee/baseball_bat/chaplain name = "blessed baseball bat" From c2d86247a2fd77628a4471210af79a5aa7142c5b Mon Sep 17 00:00:00 2001 From: FelixRuin Date: Sun, 12 Jan 2025 22:48:39 +0300 Subject: [PATCH 2/3] Update 4NaL_Station.dmm --- _maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm index 81901f26836b..19a632535ad7 100644 --- a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm +++ b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm @@ -16290,10 +16290,6 @@ icon_state = "wood_tile" }, /area/maintenance/space_hut/cabin) -"faj" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/openspace, -/area/space/nearstation) "fam" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, @@ -230896,7 +230892,7 @@ bAb djY djY djY -faj +qbe qbe qbe rOv From 024603d20e570cc3269ff69e9f76ca7fff3a9a9d Mon Sep 17 00:00:00 2001 From: FelixRuin Date: Sun, 5 Jan 2025 12:00:00 +0100 Subject: [PATCH 3/3] Update 4NaL_Station.dmm --- _maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm index 81901f26836b..19a632535ad7 100644 --- a/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm +++ b/_maps/splurt_maps/map_files/4Nalstation/4NaL_Station.dmm @@ -16290,10 +16290,6 @@ icon_state = "wood_tile" }, /area/maintenance/space_hut/cabin) -"faj" = ( -/obj/effect/spawner/lootdrop/maintenance, -/turf/open/openspace, -/area/space/nearstation) "fam" = ( /obj/machinery/airalarm/directional/west, /turf/open/floor/wood, @@ -230896,7 +230892,7 @@ bAb djY djY djY -faj +qbe qbe qbe rOv