diff --git a/code/modules/vore/fluffstuff/custom_guns_vr.dm b/code/modules/vore/fluffstuff/custom_guns_vr.dm index cbab3a33a3..bbced6f919 100644 --- a/code/modules/vore/fluffstuff/custom_guns_vr.dm +++ b/code/modules/vore/fluffstuff/custom_guns_vr.dm @@ -824,12 +824,12 @@ return ..() -/obj/item/weapon/gun/energy/frontier/emp_act() - return - -/obj/item/weapon/gun/energy/frontier/ex_act(severity) //|rugged| +/obj/item/weapon/gun/energy/frontier/emp_act(severity) return ..(severity+2) +/obj/item/weapon/gun/energy/frontier/ex_act() //|rugged| + return + /obj/item/weapon/gun/energy/frontier/locked desc = "An extraordinarily rugged laser weapon, built to last and requiring effectively no maintenance. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." req_access = list(access_armory) //for toggling safety diff --git a/maps/tether/tether-05-station1.dmm b/maps/tether/tether-05-station1.dmm index e04694ea71..072f8142da 100644 --- a/maps/tether/tether-05-station1.dmm +++ b/maps/tether/tether-05-station1.dmm @@ -21595,6 +21595,20 @@ }, /turf/simulated/shuttle/wall/voidcraft, /area/shuttle/excursion/tether) +"RIb" = ( +/obj/effect/floor_decal/steeldecal/steel_decals9, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 4 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 8 + }, +/obj/effect/floor_decal/steeldecal/steel_decals9{ + dir = 1 + }, +/obj/structure/closet/secure_closet/guncabinet/excursion, +/turf/simulated/floor/tiled/monotile, +/area/tether/station/explorer_prep) "Vrx" = ( /obj/machinery/camera/network/northern_star, /turf/simulated/floor/tiled, @@ -32375,7 +32389,7 @@ aiv bQJ bQT bQJ -aiv +bQJ aiv aac aac @@ -32497,6 +32511,7 @@ aiv bQK bQK bQK +RIb aiv aac aac @@ -32504,7 +32519,6 @@ aac aac aac aac -aac alA amg amg @@ -32620,7 +32634,7 @@ aiv aiv aiv aiv -aac +aiv aac aac aac diff --git a/maps/tether/tether_things.dm b/maps/tether/tether_things.dm index e5110f0520..16c7c219ed 100644 --- a/maps/tether/tether_things.dm +++ b/maps/tether/tether_things.dm @@ -362,6 +362,15 @@ var/global/list/latejoin_tram = list() return ..(user) +/obj/structure/closet/secure_closet/guncabinet/excursion + name = "expedition weaponry cabinet" + req_one_access = list(access_explorer,access_brig) + +/obj/structure/closet/secure_closet/guncabinet/excursion/New() + ..() + for(var/i = 1 to 4) + new /obj/item/weapon/gun/energy/frontier/locked(src) + // // ### Wall Machines On Full Windows ### // To make sure wall-mounted machines placed on full-tile windows are clickable they must be above the window