Adds expedition guns to map

This commit is contained in:
Cyantime
2018-02-06 20:16:55 -05:00
parent 12747725d9
commit be7d0dd8c2
3 changed files with 30 additions and 7 deletions
@@ -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
+17 -3
View File
@@ -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
+9
View File
@@ -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