From 59748b443bcbd5d9d59649dc3214c9e482bfc0fc Mon Sep 17 00:00:00 2001 From: tacoguy7765093 Date: Mon, 8 Jan 2024 17:43:29 -0400 Subject: [PATCH] Removes the pulse rifle from explo loot spawns (Plus dark fix) (#7526) --- code/game/objects/random/mob_vr.dm | 2 +- maps/southern_cross/southern_cross-8.dmm | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/code/game/objects/random/mob_vr.dm b/code/game/objects/random/mob_vr.dm index ecce8214bc..453c3c05fc 100644 --- a/code/game/objects/random/mob_vr.dm +++ b/code/game/objects/random/mob_vr.dm @@ -65,7 +65,7 @@ prob(3);/obj/item/weapon/gun/energy/lasercannon,\ prob(3);/obj/item/weapon/gun/projectile/shotgun/pump/rifle/lever,\ prob(3);/obj/item/weapon/gun/projectile/automatic/bullpup,\ - prob(2);/obj/item/weapon/gun/energy/pulse_rifle,\ + /*prob(2);/obj/item/weapon/gun/energy/pulse_rifle,\ */ //CHOMPEDIT Players should absolutely not have this prob(2);/obj/item/weapon/gun/energy/gun/nuclear,\ prob(2);/obj/item/weapon/gun/projectile/automatic/l6_saw,\ prob(2);/obj/item/weapon/gun/energy/gun/burst,\ diff --git a/maps/southern_cross/southern_cross-8.dmm b/maps/southern_cross/southern_cross-8.dmm index 72c5c46f0c..6db385d8a9 100644 --- a/maps/southern_cross/southern_cross-8.dmm +++ b/maps/southern_cross/southern_cross-8.dmm @@ -1795,7 +1795,8 @@ /area/centcom/bar) "bfZ" = ( /obj/machinery/vending/boozeomat{ - pixel_y = 16 + pixel_y = 16; + req_log_access = null }, /obj/effect/floor_decal/milspec/color/silver, /turf/simulated/floor/tiled/techmaint, @@ -2413,9 +2414,7 @@ /turf/unsimulated/beach/sand, /area/beach) "bIF" = ( -/obj/machinery/vending/cart{ - req_access = null - }, +/obj/machinery/vending/hydroseeds, /obj/effect/floor_decal/techfloor/orange{ dir = 8 }, @@ -12599,6 +12598,7 @@ /obj/random/miniature, /obj/random/miniature, /obj/random/miniature, +/obj/item/device/pda, /turf/simulated/floor/tiled/techmaint, /area/shadekin) "kSi" = ( @@ -17367,6 +17367,7 @@ /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, /obj/random/maintenance/cargo, +/obj/item/device/pda, /turf/simulated/floor/tiled/techmaint, /area/shadekin) "pMy" = ( @@ -23202,6 +23203,7 @@ /obj/effect/floor_decal/milspec/cargo, /obj/random/tetheraid, /obj/random/tetheraid, +/obj/item/device/pda, /turf/simulated/floor/tiled/techmaint, /area/shadekin) "vpZ" = (