Military/Irregular Third Party Ship Improvements (#15064)

This commit is contained in:
TheDanseMacabre
2022-11-13 00:34:46 -03:00
committed by GitHub
parent 75b09902c5
commit e1ea7aa61d
18 changed files with 846 additions and 306 deletions
+84
View File
@@ -1960,3 +1960,87 @@
/obj/random/wizard_dressup/post_spawn(obj/thing)
var/obj/item/clothing/head/wizard/H = pick(typesof(/obj/item/clothing/head/wizard))
new H(loc)
/obj/random/civgun
name = "random civilian handgun"
desc = "This is a random civilian gun."
icon = 'icons/obj/guns/xenoblaster.dmi'
icon_state = "random"
has_postspawn = TRUE
spawnlist = list(
/obj/item/gun/projectile/leyon,
/obj/item/gun/energy/blaster,
/obj/item/gun/energy/pistol,
/obj/item/gun/projectile/revolver/detective,
/obj/item/gun/projectile/sec/lethal,
/obj/item/gun/projectile/colt,
/obj/item/gun/projectile/pistol,
/obj/item/gun/projectile/pistol/detective,
/obj/item/gun/projectile/pistol/adhomai,
/obj/item/gun/projectile/pistol/sol,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/projectile/revolver/lemat,
/obj/item/gun/projectile/tanto,
/obj/item/gun/projectile/automatic/x9,
/obj/item/gun/energy/disruptorpistol,
/obj/item/gun/energy/retro,
)
/obj/random/civgun/post_spawn(var/obj/item/gun/projectile/spawned)
if(istype(spawned, /obj/item/gun/energy))
return
else if(istype(spawned, /obj/item/gun/projectile))
if(spawned.magazine_type)
var/obj/item/ammo_magazine/am = spawned.magazine_type
new am(spawned.loc)
new am(spawned.loc)
else if(istype(spawned, /obj/item/gun/projectile/shotgun) && spawned.caliber == "shotgun")
if(istype(spawned.loc, /obj/item/storage/box))
spawned.loc.icon_state = "largebox"
var/obj/item/storage/box/b = new /obj/item/storage/box(spawned.loc)
for(var/i = 0; i < 8; i++)
new spawned.ammo_type(b)
else if(spawned.ammo_type)
var/list/provided_ammo = list()
for(var/i = 0; i < (spawned.max_shells * 2); i++)
provided_ammo += new spawned.ammo_type(spawned.loc)
if(provided_ammo.len)
new /obj/item/ammo_pile(spawned.loc, provided_ammo)
/obj/random/civgun/rifle
name = "random civilian longarm"
desc = "This is a random civilian long gun."
icon = 'icons/obj/guns/xenoblaster.dmi'
icon_state = "random"
has_postspawn = TRUE
spawnlist = list(
/obj/item/gun/projectile/automatic/mini_uzi,
/obj/item/gun/projectile/automatic/c20r,
/obj/item/gun/projectile/automatic/wt550/lethal,
/obj/item/gun/projectile/automatic/rifle/carbine,
/obj/item/gun/projectile/automatic/rifle/carbine/civcarbine,
/obj/item/gun/projectile/automatic/tommygun,
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/gun/projectile/shotgun/pump/rifle/pipegun,
/obj/item/gun/projectile/shotgun/pump/rifle/obrez,
/obj/item/gun/projectile/contender,
/obj/item/gun/projectile/shotgun/pump/rifle/vintage,
/obj/item/gun/projectile/gauss,
/obj/item/gun/projectile/gauss/carbine,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/gun/projectile/shotgun/doublebarrel/sawn,
/obj/item/gun/projectile/shotgun/foldable,
/obj/item/gun/projectile/revolver,
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/laser/shotgun,
/obj/item/gun/energy/rifle,
/obj/item/gun/energy/rifle/laser,
/obj/item/gun/energy/gun,
/obj/item/gun/custom_ka/frame04/illegal,
/obj/item/gun/projectile/automatic/lebman,
/obj/item/gun/projectile/pistol/super_heavy,
/obj/item/gun/projectile/deagle,
/obj/item/gun/custom_ka/frame01/illegal
)
@@ -306,7 +306,7 @@
desc = "A compact NanoTrasen designed sidearm, popular with law enforcement personnel for concealed carry purposes. It has a faux wooden grip. Uses 9mm rounds."
desc_fluff = "The NT Mk21 Blackjack is a ballistic sidearm developed and produced by NanoTrasen. Unlike the related Mk58, the Blackjack is a rather high quality piece - typically issued to higher ranking law enforcement personnel, the Mk21 is compact and chambered in 9mm caliber. With all the bells and whistles of a modern, quality police pistol, the Blackjack's main drawback is the notoriously nippy recoil - 9mm in such a small package can be unpleasant for the average shooter."
name = "compact 9mm pistol"
magazine_type = /obj/item/ammo_magazine/mc9mm/flash
magazine_type = /obj/item/ammo_magazine/mc9mm
icon = 'icons/obj/guns/detgun.dmi'
icon_state = "detgun"
item_state = "detgun"
@@ -0,0 +1,44 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: TheDanseMacabre
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- maptweak: "Survivability of military third party ships has been improved. They now have backup controls, portable air pumps, backup weapons, and more."
- tweak: "Third party ships have a more consistent naming scheme."
- tweak: "Certain third party ships can now spawn in the Badlands."
- rscadd: "The militia ship, freighter, and Skrell smugglers now have randomized guns in lieu of pre-selected weapons, for greater variety. Skrell and OX ships now have armor that they were missing."
+3 -3
View File
@@ -1,6 +1,6 @@
/datum/map_template/ruin/away_site/elyran_strike_craft
name = "Elyran Naval Strike Craft"
description = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively. This one's transponder identifies it as an Elyran Naval Infantry interdiction vessel."
description = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively."
suffix = "ships/elyra/elyran_strike_craft.dmm"
sectors = list(SECTOR_VALLEY_HALE, SECTOR_BADLANDS, SECTOR_NEW_ANKARA, SECTOR_AEMAQ)
spawn_weight = 1
@@ -10,7 +10,7 @@
/decl/submap_archetype/elyran_strike_craft
map = "Elyran Naval Strike Craft"
descriptor = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively. This one's transponder identifies it as an Elyran Naval Infantry interdiction vessel."
descriptor = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively."
//areas
/area/ship/elyran_strike_craft
@@ -25,7 +25,7 @@
/obj/effect/overmap/visitable/ship/elyran_strike_craft
name = "Elyran Naval Strike Craft"
class = "ENV"
desc = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively. This one's transponder identifies it as an Elyran Naval Infantry interdiction vessel."
desc = "The Aslan-class Strike Craft is among the oldest designs in the Elyran naval arsenal, and is one of the ship classes slated to be retired in the ongoing Elyran military modernization plan. Not an independent vessel in of itself, it is instead an oversized attack craft designed to be launched from the General Abd Al-Hamid-class Carrier, a type of Elyran capital ship, named after the Republic's foremost national hero. As such, it has limited crew facilities and life support capabilities, and is instead reliant on its mothership for long-term operation. This ship is an interdiction variant, with its torpedo bay and railgun hardpoint replaced by a hangar and a boarding pod launch room, respectively."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
+201 -63
View File
@@ -1,7 +1,7 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"aaa" = (
/obj/machinery/door/airlock/hatch{
name = "Thruster Bay";
name = "Thruster Bay/Backup Controls";
req_access = list(207)
},
/turf/simulated/floor,
@@ -34,6 +34,13 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"aaE" = (
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"aaI" = (
/obj/structure/closet/walllocker/medical/secure{
name = "O- Blood Locker";
@@ -136,6 +143,9 @@
name = "SUPB lauching panel"
},
/obj/structure/railing/mapped,
/obj/structure/sign/fire{
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"auY" = (
@@ -241,6 +251,11 @@
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/structure/table/steel,
/obj/item/tank/phoron/shuttle,
/obj/item/tank/phoron/shuttle{
pixel_y = 5
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"aLo" = (
@@ -390,6 +405,13 @@
/obj/item/folder/yellow,
/turf/simulated/floor/holofloor/carpet/rubber,
/area/ship/elyran_strike_craft)
"cdF" = (
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"clm" = (
/obj/machinery/vending/wallmed1{
name = "Medical Supplies";
@@ -423,10 +445,12 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/machinery/portable_atmospherics/canister/phoron_scarce,
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/machinery/computer/ship/sensors{
dir = 4
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"czF" = (
@@ -448,7 +472,7 @@
/area/ship/elyran_strike_craft)
"cGq" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/train/cargo/engine,
/obj/structure/closet/crate/loot,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"cQc" = (
@@ -510,6 +534,11 @@
/obj/item/ammo_magazine/plasma/light,
/turf/simulated/floor/carpet,
/area/ship/elyran_strike_craft)
"dqM" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"dBa" = (
/obj/structure/railing/mapped,
/obj/effect/floor_decal/spline/plain,
@@ -522,7 +551,7 @@
"dIZ" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/ship_weapon_dummy,
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"dJo" = (
/obj/machinery/access_button{
@@ -584,6 +613,7 @@
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/machinery/portable_atmospherics/powered/scrubber/huge,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"etL" = (
@@ -654,7 +684,7 @@
/obj/structure/window/reinforced{
dir = 1
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"eNl" = (
/obj/effect/floor_decal/corner/beige{
@@ -677,14 +707,10 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
},
/obj/structure/table/steel,
/obj/item/tank/phoron/shuttle,
/obj/item/tank/phoron/shuttle{
pixel_y = 5
},
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/structure/closet/firecloset/full,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"eXC" = (
@@ -841,6 +867,12 @@
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"grH" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -25
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"gxW" = (
/obj/structure/extinguisher_cabinet{
pixel_x = -25
@@ -850,6 +882,12 @@
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/elyran_shuttle)
"gye" = (
/obj/machinery/computer/ship/targeting{
dir = 1
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"gzu" = (
/obj/effect/shuttle_landmark/elyran_strike_craft/nav1,
/turf/template_noop,
@@ -944,11 +982,10 @@
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"iqt" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/machinery/light/small/emergency{
dir = 4
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"iuw" = (
/obj/machinery/light/small/emergency{
@@ -1041,7 +1078,7 @@
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"jCO" = (
/obj/structure/closet/crate/loot,
/obj/machinery/portable_atmospherics/canister/phoron_scarce,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"jFf" = (
@@ -1137,6 +1174,11 @@
temperature = 278
},
/area/ship/elyran_strike_craft)
"kTB" = (
/obj/machinery/atmospherics/pipe/manifold/hidden,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"kVo" = (
/obj/structure/bed/stool/chair,
/obj/effect/floor_decal/spline/plain{
@@ -1233,6 +1275,10 @@
},
/turf/simulated/floor/holofloor/carpet/rubber,
/area/ship/elyran_strike_craft)
"lLP" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"lMU" = (
/obj/machinery/atmospherics/unary/engine{
dir = 1
@@ -1421,9 +1467,8 @@
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"ofY" = (
/obj/machinery/portable_atmospherics/canister/carbon_dioxide,
/obj/machinery/light/small/emergency{
dir = 8
/obj/machinery/computer/ship/engines{
dir = 4
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
@@ -1503,6 +1548,15 @@
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"pkE" = (
/obj/machinery/ship_weapon/francisca{
pixel_x = -64;
pixel_y = -162;
weapon_id = "Elyran Francisca Rotary Gun"
},
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
/area/ship/elyran_strike_craft)
"pue" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor,
@@ -1543,6 +1597,12 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/elyran_strike_craft)
"pFg" = (
/obj/machinery/ammunition_loader/francisca{
weapon_id = "Elyran Francisca Rotary Gun"
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"pRf" = (
/obj/effect/step_trigger/teleporter,
/turf/template_noop,
@@ -1618,7 +1678,7 @@
weapon_id = "Elyran Grauwolf Flak Battery"
},
/obj/effect/floor_decal/corner/beige/diagonal,
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"qvs" = (
/obj/structure/sink{
@@ -1679,6 +1739,10 @@
/obj/structure/grille,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"rau" = (
/obj/structure/closet/crate/loot,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"rbA" = (
/obj/machinery/computer/ship/helm{
req_access = null
@@ -1693,8 +1757,9 @@
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"rmm" = (
/obj/machinery/computer/ship/engines{
dir = 4
/obj/machinery/computer/ship/helm{
dir = 1;
req_access = null
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
@@ -1709,6 +1774,18 @@
},
/turf/simulated/wall/shuttle/space_ship,
/area/ship/elyran_strike_craft)
"ryr" = (
/obj/structure/table/rack,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/clothing/shoes/magboots/rig,
/obj/item/tank/oxygen,
/obj/item/clothing/suit/space/void/valkyrie,
/obj/item/clothing/head/helmet/space/void/valkyrie,
/obj/structure/sign/securearea{
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"rBF" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/effect/floor_decal/spline/plain/corner{
@@ -1735,6 +1812,34 @@
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"rMJ" = (
/obj/structure/table/rack,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"rWk" = (
/obj/effect/floor_decal/corner/beige/full{
dir = 4
@@ -1801,9 +1906,14 @@
/obj/effect/floor_decal/corner_wide/lime/diagonal,
/turf/simulated/floor/tiled/white,
/area/ship/elyran_strike_craft)
"tbG" = (
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"tcC" = (
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/stool/chair/office/bridge/pilot,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"tjN" = (
@@ -1830,14 +1940,14 @@
},
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/ship_weapon_dummy,
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"txR" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/machinery/computer/ship/targeting{
dir = 4
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"tAW" = (
/obj/effect/floor_decal/corner/beige{
@@ -1852,9 +1962,16 @@
/area/ship/elyran_strike_craft)
"tGD" = (
/obj/effect/decal/cleanable/dirt,
/obj/vehicle/train/cargo/trolley,
/obj/structure/closet/crate/loot,
/turf/simulated/floor,
/area/ship/elyran_strike_craft)
"tKK" = (
/obj/effect/floor_decal/industrial/outline/firefighting_closet,
/obj/effect/floor_decal/industrial/warning{
dir = 1
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"tLt" = (
/obj/structure/curtain/open/shower,
/turf/simulated/floor/tiled/white,
@@ -1889,7 +2006,7 @@
dir = 8
},
/obj/structure/ship_weapon_dummy,
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"tWS" = (
/obj/machinery/door/airlock/security{
@@ -1897,7 +2014,7 @@
req_access = list(207)
},
/obj/effect/floor_decal/corner/beige/diagonal,
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"uih" = (
/obj/effect/landmark/entry_point/starboard{
@@ -1936,6 +2053,12 @@
/obj/effect/shuttle_landmark/elyran_strike_craft/transit,
/turf/space/transit/north,
/area/space)
"uHF" = (
/obj/structure/extinguisher_cabinet{
pixel_y = -32
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"uNI" = (
/obj/effect/landmark/entry_point/starboard{
name = "starboard, office"
@@ -2011,6 +2134,9 @@
/obj/effect/floor_decal/corner_wide/lime{
dir = 5
},
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
/turf/simulated/floor/tiled/white,
/area/ship/elyran_strike_craft)
"vNs" = (
@@ -2055,7 +2181,7 @@
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/stack/material/steel/full,
/obj/item/melee/telebaton,
/obj/machinery/light{
icon_state = "tube1";
@@ -2085,6 +2211,9 @@
},
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"wnX" = (
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"woT" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/machinery/light/small/emergency{
@@ -2092,14 +2221,17 @@
},
/obj/structure/table/steel,
/obj/item/clothing/ears/earmuffs,
/turf/simulated/floor/tiled,
/obj/structure/extinguisher_cabinet{
pixel_x = -25
},
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"wqn" = (
/obj/effect/floor_decal/corner/beige/diagonal,
/obj/structure/bed/stool/chair/office/bridge/pilot{
dir = 8
},
/turf/simulated/floor/tiled,
/turf/simulated/floor/holofloor/tiled/dark,
/area/ship/elyran_strike_craft)
"wrJ" = (
/obj/effect/shuttle_landmark/elyran_shuttle/transit,
@@ -2203,6 +2335,12 @@
/obj/item/reagent_containers/food/snacks/yellowcurry,
/turf/simulated/floor/tiled,
/area/ship/elyran_strike_craft)
"xlK" = (
/obj/structure/ship_weapon_dummy{
is_barrel = 1
},
/turf/template_noop,
/area/ship/elyran_strike_craft)
"xpv" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/atmospherics/pipe/manifold/visible{
@@ -32216,9 +32354,9 @@ xRX
xRX
rtf
czo
rmm
gjP
ofY
gjP
aaE
vOv
vFY
sTj
@@ -32732,7 +32870,7 @@ rtf
efi
pcX
tcC
dQs
rmm
vOv
aaI
sTj
@@ -32987,9 +33125,9 @@ xRX
xRX
rtf
eWN
dQs
pcX
dQs
pcX
gye
vOv
afz
aoJ
@@ -33521,11 +33659,11 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
qEp
qEp
qEp
qEp
xlK
xRX
xRX
xRX
@@ -33778,8 +33916,8 @@ xRX
xRX
xRX
xRX
xRX
xRX
pkE
qEp
xRX
xRX
xRX
@@ -34035,7 +34173,7 @@ lxP
lxP
lxP
lxP
lxP
pFg
lxP
lxP
xRX
@@ -34278,7 +34416,7 @@ jCz
xdP
atj
vOv
pcX
grH
pcX
pes
ipy
@@ -34792,7 +34930,7 @@ eLi
atj
rEs
vOv
pcX
tbG
aTV
uYO
mXz
@@ -35049,7 +35187,7 @@ atj
atj
lpY
vOv
pcX
tbG
aTV
pcX
hvT
@@ -36077,7 +36215,7 @@ pZC
atj
aHa
vOv
pcX
rMJ
geX
spD
dVy
@@ -36332,24 +36470,24 @@ moG
vOv
xrq
atj
atj
uHF
vOv
pcX
pcX
jZJ
kbf
pcX
rau
tGD
tGD
cGq
pcX
pue
pcX
jCO
jCO
jCO
pue
pcX
kbf
dQs
dQs
dqM
dQs
cdF
lxP
xRX
xRX
@@ -38126,7 +38264,7 @@ xRX
xRX
xRX
grj
efi
kTB
eys
vOv
evN
@@ -38408,7 +38546,7 @@ dBa
lxP
woT
txR
aAY
lLP
tVw
qEp
aPk
@@ -38663,7 +38801,7 @@ mOy
fLL
ajL
lxP
aAY
lLP
wqn
tsx
dIZ
@@ -38920,8 +39058,8 @@ jPG
aBb
atP
lxP
aAY
aAY
lLP
lLP
dIZ
dIZ
pwt
@@ -39177,10 +39315,10 @@ aOo
jab
aOo
tWS
aAY
aAY
lLP
lLP
qve
aAY
wnX
eXC
xRX
xRX
@@ -39432,11 +39570,11 @@ cQX
mgE
cQX
mgE
cQX
ryr
lxP
eNh
aAY
aAY
lLP
tKK
iqt
lxP
xRX
+4 -4
View File
@@ -1,8 +1,8 @@
/datum/map_template/ruin/away_site/orion_express_ship
name = "Orion Express Mobile Station"
description = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it. This one's transponder identifies it as an Orion Express refueling station."
description = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it."
suffix = "ships/orion/orion_express_ship.dmm"
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS)
spawn_weight = 1
spawn_cost = 1
id = "orion_express_ship"
@@ -10,7 +10,7 @@
/decl/submap_archetype/orion_express_ship
map = "Orion Express Mobile Station"
descriptor = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it. This one's transponder identifies it as an Orion Express refueling station."
descriptor = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it."
//areas
/area/ship/orion_express_ship
@@ -25,7 +25,7 @@
/obj/effect/overmap/visitable/ship/orion_express_ship
name = "Orion Express Mobile Station"
class = "OEV"
desc = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it. This one's transponder identifies it as an Orion Express refueling station."
desc = "The Traveler-class mobile station is a relatively old design, but nonetheless venerable and one of the building blocks of interstellar commerce. While relatively small, is a treasured asset in the Orion Express corporation's fleet, and has been referred to as “the gas station of the stars”, offering food, supplies, and fuel to anyone who may need it."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -3049,6 +3049,14 @@
/obj/item/gun/energy/gun,
/obj/item/gun/energy/gun,
/obj/item/gun/energy/rifle,
/obj/item/clothing/suit/armor/carrier/heavy/sec,
/obj/item/clothing/suit/armor/carrier/heavy/sec,
/obj/item/clothing/suit/armor/carrier/heavy/sec,
/obj/item/clothing/suit/armor/carrier/heavy/sec,
/obj/item/clothing/head/helmet/security,
/obj/item/clothing/head/helmet/security,
/obj/item/clothing/head/helmet/security,
/obj/item/clothing/head/helmet/security,
/turf/simulated/floor/tiled/dark,
/area/ship/orion_express_ship)
"vFS" = (
@@ -290,6 +290,7 @@
},
/obj/effect/floor_decal/industrial/warning/corner,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/firecloset/full,
/turf/simulated/floor/plating,
/area/ship/tirakqi_freighter)
"dTw" = (
@@ -408,14 +409,17 @@
/obj/machinery/light/skrell{
dir = 4
},
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/pistol,
/obj/item/clothing/accessory/holster/hip/brown,
/obj/item/clothing/accessory/holster/hip/brown,
/obj/item/clothing/head/helmet/security/skrell,
/obj/item/clothing/head/helmet/security/skrell,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/clothing/suit/armor/material/makeshift/plasteel,
/obj/item/clothing/suit/armor/material/makeshift/trenchcoat,
/obj/item/storage/box/shotgunshells,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/turf/simulated/floor/shuttle/skrell,
/area/ship/tirakqi_freighter)
"eKc" = (
@@ -772,10 +776,6 @@
/obj/structure/lattice/catwalk/indoor/grate,
/turf/simulated/floor,
/area/ship/tirakqi_freighter)
"hfR" = (
/obj/item/clothing/head/collectable/petehat,
/turf/simulated/floor/plating,
/area/ship/tirakqi_freighter)
"hsG" = (
/obj/structure/table/rack,
/obj/item/clothing/ears/skrell/band,
@@ -909,6 +909,7 @@
/area/ship/tirakqi_freighter)
"hUJ" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/firecloset/full,
/turf/simulated/floor/shuttle/skrell,
/area/ship/tirakqi_freighter)
"hXr" = (
@@ -1304,14 +1305,16 @@
/area/ship/tirakqi_freighter)
"lwj" = (
/obj/structure/closet/skrell,
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/blaster/carbine,
/obj/item/gun/energy/pistol,
/obj/item/clothing/accessory/holster/hip/brown,
/obj/item/clothing/accessory/holster/hip/brown,
/obj/item/clothing/head/helmet/security/skrell,
/obj/item/clothing/head/helmet/security/skrell,
/obj/item/clothing/head/hardhat/dblue,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/clothing/suit/armor/carrier/generic,
/obj/item/clothing/suit/armor/carrier/generic,
/obj/random/civgun,
/obj/random/civgun,
/obj/random/civgun,
/turf/simulated/floor/shuttle/skrell,
/area/ship/tirakqi_freighter)
"lAV" = (
@@ -1496,11 +1499,11 @@
/area/ship/tirakqi_freighter)
"oJg" = (
/obj/structure/closet/crate,
/obj/random/vault_weapon,
/obj/random/projectile,
/obj/random/ammo,
/obj/random/ammo,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/item/melee/telebaton/nlom,
/obj/item/material/knife/butterfly,
/obj/item/material/knife/butterfly/switchblade,
/obj/item/material/twohanded/baseballbat/metal,
/turf/simulated/floor/shuttle/skrell/blue,
/area/ship/tirakqi_freighter)
"oLC" = (
@@ -35132,7 +35135,7 @@ xRX
xRX
kfX
dQZ
hfR
dQZ
gTr
krH
eDP
+10 -10
View File
@@ -1,6 +1,6 @@
/datum/map_template/ruin/away_site/fsf_patrol_ship
name = "FSF Patrol Ship"
description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
name = "FSF Corvette"
description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
suffix = "ships/sol_merc/fsf_patrol_ship.dmm"
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE)
spawn_weight = 1
@@ -9,12 +9,12 @@
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/fsf_shuttle)
/decl/submap_archetype/fsf_patrol_ship
map = "FSF Patrol Ship"
descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
map = "FSF Corvette"
descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
//areas
/area/ship/fsf_patrol_ship
name = "FSF Patrol Ship"
name = "FSF Corvette"
/area/shuttle/fsf_shuttle
name = "FSF Shuttle"
@@ -23,9 +23,9 @@
//ship stuff
/obj/effect/overmap/visitable/ship/fsf_patrol_ship
name = "FSF Patrol Ship"
name = "FSF Corvette"
class = "FSFV"
desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -47,13 +47,13 @@
..()
/obj/effect/shuttle_landmark/fsf_patrol_ship/nav1
name = "FSF Patrol Ship - Port Side"
name = "FSF Corvette - Port Side"
landmark_tag = "nav_fsf_patrol_ship_1"
base_turf = /turf/space/dynamic
base_area = /area/space
/obj/effect/shuttle_landmark/fsf_patrol_ship/nav2
name = "FSF Patrol Ship - Port Side"
name = "FSF Corvette - Port Side"
landmark_tag = "nav_fsf_patrol_ship_2"
base_turf = /turf/space/dynamic
base_area = /area/space
@@ -68,7 +68,7 @@
name = "FSF Shuttle"
class = "FSFV"
designation = "Condottiere"
desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to the Free Solarian Fleets, a Solarian warlord's mercenary fleet."
desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus."
shuttle = "FSF Shuttle"
max_speed = 1/(3 SECONDS)
burn_delay = 2 SECONDS
+131 -48
View File
@@ -90,6 +90,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"atj" = (
@@ -131,6 +132,17 @@
/obj/item/stack/material/steel/full,
/obj/item/stack/material/steel/full,
/obj/item/stack/material/glass/reinforced/full,
/obj/item/tape_roll,
/obj/item/tape_roll,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/bag/inflatable,
/obj/item/storage/bag/inflatable,
/obj/item/tank/phoron/shuttle,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/stack/material/glass/full,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"aBb" = (
@@ -184,6 +196,7 @@
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"aJd" = (
@@ -214,8 +227,9 @@
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/structure/table/steel,
/obj/item/toy/desk/fan,
/obj/machinery/computer/ship/targeting{
dir = 8
},
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
@@ -226,6 +240,7 @@
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"aSm" = (
@@ -348,7 +363,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"bFk" = (
/obj/item/modular_computer/console/preset/civilian{
/obj/machinery/computer/ship/targeting{
dir = 1
},
/obj/structure/railing/mapped,
@@ -362,6 +377,7 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"bLq" = (
@@ -382,13 +398,30 @@
/area/ship/fsf_patrol_ship)
"ccm" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate,
/obj/item/tank/phoron/shuttle,
/obj/item/storage/bag/inflatable,
/obj/item/storage/bag/inflatable,
/obj/item/storage/box/lights/mixed,
/obj/item/tape_roll,
/obj/item/tape_roll,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"cdD" = (
@@ -465,7 +498,7 @@
/area/ship/fsf_patrol_ship)
"dLJ" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms"
name = "Telecomms/Aux CIC"
},
/obj/structure/plasticflaps/airtight,
/turf/simulated/floor,
@@ -702,9 +735,10 @@
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"fqb" = (
/obj/structure/bed/stool/chair/office/dark{
/obj/structure/bed/stool/chair/office/bridge/pilot{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
@@ -1007,6 +1041,12 @@
},
/turf/simulated/floor/carpet/blue,
/area/ship/fsf_patrol_ship)
"gYW" = (
/obj/machinery/ammunition_loader/francisca{
weapon_id = "FSF Francisca Rotary Gun"
},
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"hdb" = (
/obj/machinery/atmospherics/portables_connector{
dir = 8;
@@ -1116,6 +1156,9 @@
/obj/structure/closet/toolcloset,
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/gloves/yellow,
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"hBs" = (
@@ -1306,7 +1349,7 @@
dir = 10
},
/obj/structure/table/steel,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical/surgeon,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/mask/surgical/w,
/obj/machinery/light{
@@ -1601,8 +1644,10 @@
/turf/simulated/floor/shuttle/black,
/area/shuttle/fsf_shuttle)
"lmO" = (
/obj/structure/table/steel,
/obj/item/folder/red,
/obj/machinery/computer/ship/helm{
dir = 8;
req_access = list(203)
},
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
@@ -2279,6 +2324,14 @@
/obj/machinery/computer/ship/targeting,
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"rCG" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/fsf_patrol_ship)
"rNp" = (
/obj/structure/bed/stool/chair/office/dark,
/obj/effect/floor_decal/corner_wide/green/full{
@@ -2311,6 +2364,15 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"swZ" = (
/obj/machinery/ship_weapon/francisca{
pixel_x = -64;
pixel_y = -162;
weapon_id = "FSF Francisca Rotary Gun"
},
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
/area/ship/fsf_patrol_ship)
"sBv" = (
/obj/effect/landmark/entry_point/fore{
name = "fore, armoury"
@@ -2333,6 +2395,14 @@
/obj/effect/step_trigger/teleporter,
/turf/space/transit/north,
/area/space)
"sOy" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/ship/sensors,
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
},
/area/ship/fsf_patrol_ship)
"sSs" = (
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
@@ -2472,6 +2542,13 @@
"uaE" = (
/turf/unsimulated/wall/fakepdoor,
/area/ship/fsf_patrol_ship)
"ubV" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
},
/area/ship/fsf_patrol_ship)
"udB" = (
/obj/machinery/door/airlock/glass_security{
name = "Cell";
@@ -2550,6 +2627,12 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/fsf_patrol_ship)
"vgt" = (
/obj/structure/ship_weapon_dummy{
is_barrel = 1
},
/turf/template_noop,
/area/ship/fsf_patrol_ship)
"vmq" = (
/obj/effect/floor_decal/spline/plain/corner{
dir = 1
@@ -30330,11 +30413,11 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
lBQ
lBQ
lBQ
lBQ
vgt
xRX
xRX
xRX
@@ -30587,8 +30670,8 @@ xRX
xRX
xRX
xRX
xRX
xRX
swZ
lBQ
xRX
xRX
xRX
@@ -30844,7 +30927,7 @@ qfj
yjk
yjk
yjk
yjk
gYW
yjk
yjk
yjk
@@ -31848,13 +31931,13 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
dYf
yjk
yjk
yjk
yjk
yjk
@@ -32109,7 +32192,7 @@ yjk
yjk
yjk
yjk
dYf
yjk
yjk
yjk
yjk
@@ -33390,9 +33473,9 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
sSs
vQR
@@ -36474,9 +36557,9 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
sSs
bci
@@ -36989,14 +37072,14 @@ xRX
xRX
xRX
aaI
oJN
rCG
aSi
quc
yjW
yjk
kFu
xoc
xoc
ubV
yjk
ajL
kWZ
@@ -37251,7 +37334,7 @@ aJd
oJN
quc
yjk
xoc
sOy
fqb
fUw
yjk
@@ -37763,7 +37846,7 @@ yjk
yjk
yjk
yjk
gpq
yjk
yjk
yjk
yjk
@@ -38016,13 +38099,13 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
gpq
yjk
yjk
yjk
yjk
yjk
+11 -11
View File
@@ -1,20 +1,20 @@
/datum/map_template/ruin/away_site/sfa_patrol_ship
name = "SFA Patrol Ship"
description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
name = "SFA Corvette"
description = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
suffix = "ships/sol_pirate/sfa_patrol_ship.dmm"
sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE)
sectors = list(SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS)
spawn_weight = 1
spawn_cost = 1
id = "sfa_patrol_ship"
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/sfa_shuttle)
/decl/submap_archetype/sfa_patrol_ship
map = "SFA Patrol Ship"
descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
map = "SFA Corvette"
descriptor = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
//areas
/area/ship/sfa_patrol_ship
name = "SFA Patrol Ship"
name = "SFA Corvette"
/area/shuttle/sfa_shuttle
name = "SFA Shuttle"
@@ -23,9 +23,9 @@
//ship stuff
/obj/effect/overmap/visitable/ship/sfa_patrol_ship
name = "SFA Patrol Ship"
name = "SFA Corvette"
class = "SFAV"
desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
desc = "A small corvette manufactured for the Solarian Navy by Hephaestus, the Montevideo-class is an anti-piracy vessel through and through - with a shuttle bay that takes up a third of the ship and only a single weapon hardpoint located in one arm of the ship, the Montevideo is designed for long-term, self-sufficient operations in inhabited space against small-time pirate vessels that would be unable to overcome the ship's lackluster armaments. Generous automation and streamlined equipment allows it to function with a very small crew."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -47,13 +47,13 @@
..()
/obj/effect/shuttle_landmark/sfa_patrol_ship/nav1
name = "SFA Patrol Ship - Port Side"
name = "SFA Corvette - Port Side"
landmark_tag = "nav_sfa_patrol_ship_1"
base_turf = /turf/space/dynamic
base_area = /area/space
/obj/effect/shuttle_landmark/sfa_patrol_ship/nav2
name = "SFA Patrol Ship - Port Airlock"
name = "SFA Corvette - Port Airlock"
landmark_tag = "nav_sfa_patrol_ship_2"
base_turf = /turf/space/dynamic
base_area = /area/space
@@ -68,7 +68,7 @@
name = "SFA Shuttle"
class = "SFAV"
designation = "Pickford"
desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus. This one's transponder identifies it as belonging to the Southern Fleet Administration, an all-but-defunct Solarian warlord state."
desc = "An inefficient design of ultra-light shuttle known as the Wisp-class. Its only redeeming features are the extreme cheapness of the design and the ease of finding replacement parts. Manufactured by Hephaestus."
shuttle = "SFA Shuttle"
max_speed = 1/(3 SECONDS)
burn_delay = 2 SECONDS
+129 -51
View File
@@ -94,6 +94,9 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/machinery/vending/sovietsoda{
name = "Soda Water Machine"
},
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"atj" = (
@@ -142,6 +145,17 @@
/obj/item/stack/material/steel/full,
/obj/item/stack/material/steel/full,
/obj/item/stack/material/glass/reinforced/full,
/obj/item/tape_roll,
/obj/item/tape_roll,
/obj/item/storage/box/lights/mixed,
/obj/item/storage/bag/inflatable,
/obj/item/storage/bag/inflatable,
/obj/item/tank/phoron/shuttle,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/stack/material/glass/full,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"aBb" = (
@@ -195,6 +209,7 @@
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"aJd" = (
@@ -225,8 +240,9 @@
/obj/machinery/light/small/emergency{
dir = 4
},
/obj/structure/table/steel,
/obj/item/toy/desk/fan,
/obj/machinery/computer/ship/targeting{
dir = 8
},
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
@@ -237,6 +253,7 @@
/obj/machinery/light/small/emergency{
dir = 8
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"aSm" = (
@@ -373,7 +390,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship)
"bFk" = (
/obj/item/modular_computer/console/preset/civilian{
/obj/machinery/computer/ship/targeting{
dir = 1
},
/obj/structure/railing/mapped,
@@ -387,6 +404,7 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"bNj" = (
@@ -401,11 +419,30 @@
/area/ship/sfa_patrol_ship)
"ccm" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/closet/crate,
/obj/item/tank/phoron/shuttle,
/obj/item/storage/bag/inflatable,
/obj/item/storage/bag/inflatable,
/obj/item/storage/box/lights/mixed,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 8
},
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"ccO" = (
@@ -482,7 +519,7 @@
/area/ship/sfa_patrol_ship)
"dLJ" = (
/obj/machinery/door/airlock/hatch{
name = "Telecomms"
name = "Telecomms/Aux CIC"
},
/obj/structure/plasticflaps/airtight,
/turf/simulated/floor,
@@ -724,7 +761,7 @@
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"fqb" = (
/obj/structure/bed/stool/chair/office/dark{
/obj/structure/bed/stool/chair/office/bridge/pilot{
dir = 4
},
/obj/effect/decal/cleanable/dirt,
@@ -1150,6 +1187,9 @@
/obj/structure/closet/toolcloset,
/obj/item/clothing/gloves/yellow,
/obj/item/clothing/gloves/yellow,
/obj/structure/extinguisher_cabinet{
pixel_y = 30
},
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship)
"hBs" = (
@@ -1162,6 +1202,14 @@
},
/turf/simulated/wall/shuttle/raider,
/area/ship/sfa_patrol_ship)
"hKh" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/ship/sensors,
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
},
/area/ship/sfa_patrol_ship)
"hQp" = (
/obj/machinery/atmospherics/unary/engine,
/obj/structure/window/reinforced,
@@ -1204,6 +1252,11 @@
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/sfa_shuttle)
"iiJ" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"iiZ" = (
/obj/machinery/atmospherics/unary/vent_pump/high_volume{
dir = 8;
@@ -1350,7 +1403,7 @@
dir = 10
},
/obj/structure/table/steel,
/obj/item/clothing/under/rank/medical,
/obj/item/clothing/under/rank/medical/surgeon,
/obj/item/clothing/gloves/latex,
/obj/item/clothing/mask/surgical/w,
/obj/machinery/light{
@@ -1643,6 +1696,14 @@
},
/turf/simulated/floor/tiled/white,
/area/ship/sfa_patrol_ship)
"kUJ" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/effect/decal/cleanable/dirt,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/sfa_patrol_ship)
"kWZ" = (
/obj/structure/table/steel,
/obj/item/storage/box/gloves,
@@ -1696,8 +1757,10 @@
/turf/simulated/floor/shuttle/black,
/area/shuttle/sfa_shuttle)
"lmO" = (
/obj/structure/table/steel,
/obj/item/folder/red,
/obj/machinery/computer/ship/helm{
dir = 8;
req_access = list(203)
},
/turf/simulated/floor/tiled{
name = "cooled floor";
temperature = 278
@@ -2356,11 +2419,13 @@
/turf/simulated/wall/shuttle/raider,
/area/ship/sfa_patrol_ship)
"rdB" = (
/obj/structure/lattice/catwalk/indoor/grate,
/obj/machinery/vending/sovietsoda{
name = "Soda Water Machine"
/obj/machinery/ship_weapon/francisca{
pixel_x = -64;
pixel_y = -162;
weapon_id = "SFA Francisca Rotary Gun"
},
/turf/simulated/floor/tiled/dark,
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
/area/ship/sfa_patrol_ship)
"rgA" = (
/obj/effect/decal/cleanable/blood/oil,
@@ -2611,6 +2676,13 @@
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
/area/ship/sfa_patrol_ship)
"uii" = (
/obj/structure/ship_weapon_dummy,
/obj/structure/ship_weapon_dummy{
is_barrel = 1
},
/turf/template_noop,
/area/ship/sfa_patrol_ship)
"uBC" = (
/obj/structure/reagent_dispensers/watertank,
/turf/simulated/floor/tiled/dark,
@@ -2910,6 +2982,12 @@
/obj/item/folder/blue,
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship)
"wEB" = (
/obj/machinery/ammunition_loader/francisca{
weapon_id = "SFA Francisca Rotary Gun"
},
/turf/simulated/floor/tiled/dark,
/area/ship/sfa_patrol_ship)
"wMs" = (
/obj/structure/bed/stool{
pixel_y = 16
@@ -30473,11 +30551,11 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
ufa
ufa
ufa
ufa
uii
xRX
xRX
xRX
@@ -30730,8 +30808,8 @@ xRX
xRX
xRX
xRX
xRX
xRX
rdB
ufa
xRX
xRX
xRX
@@ -30987,7 +31065,7 @@ nit
yjk
yjk
yjk
yjk
wEB
yjk
yjk
yjk
@@ -31244,7 +31322,7 @@ sBA
nsN
yjk
pXP
rdB
aCd
yjk
akP
aMB
@@ -31991,13 +32069,13 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
dyv
yjk
yjk
yjk
yjk
yjk
@@ -32252,7 +32330,7 @@ yjk
yjk
yjk
yjk
dyv
yjk
yjk
yjk
yjk
@@ -33022,7 +33100,7 @@ xRX
aaI
bGz
aHw
yjW
iiJ
mkb
yjk
lNu
@@ -33533,9 +33611,9 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
sBA
vQR
@@ -36617,9 +36695,9 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
shH
bci
@@ -37132,7 +37210,7 @@ xRX
xRX
xRX
aaI
oJN
kUJ
aSi
mkb
yjW
@@ -37394,7 +37472,7 @@ aJd
oJN
mkb
yjk
bfG
hKh
fqb
fUw
yjk
@@ -37906,7 +37984,7 @@ yjk
yjk
yjk
yjk
pIa
yjk
yjk
yjk
yjk
@@ -38159,13 +38237,13 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
yjk
yjk
yjk
yjk
pIa
yjk
yjk
yjk
yjk
yjk
@@ -1,20 +1,20 @@
/datum/map_template/ruin/away_site/tcfl_peacekeeper_ship
name = "TCFL Peacekeeper Ship"
description = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one's transponder identifies it as a Tau Ceti Foreign Legion patrol vessel, and as a Decanus-class Clipper - the TCFL designation for this design."
name = "TCFL Corvette"
description = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design."
suffix = "ships/tcfl_patrol/tcfl_peacekeeper_ship.dmm"
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS)
spawn_weight = 1
spawn_cost = 1
id = "tcfl_peacekeeper_ship"
shuttles_to_initialise = list(/datum/shuttle/autodock/overmap/tcfl_shuttle)
/decl/submap_archetype/tcfl_peacekeeper_ship
map = "TCFL Peacekeeper Ship"
descriptor = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one's transponder identifies it as a Tau Ceti Foreign Legion patrol vessel, and as a Decanus-class Clipper - the TCFL designation for this design."
map = "TCFL Corvette"
descriptor = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design."
//areas
/area/ship/tcfl_peacekeeper_ship
name = "TCFL Peacekeeper Ship"
name = "TCFL Corvette"
/area/shuttle/tcfl_shuttle
name = "TCFL Shuttle"
@@ -23,9 +23,9 @@
//ship stuff
/obj/effect/overmap/visitable/ship/tcfl_peacekeeper_ship
name = "TCFL Peacekeeper Ship"
name = "TCFL Corvette"
class = "BLV"
desc = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one's transponder identifies it as a Tau Ceti Foreign Legion patrol vessel, and as a Decanus-class Clipper - the TCFL designation for this design."
desc = "Serving as the very foundation of the SCC's (And more specifically, NanoTrasen's) fleet of asset protection vessels, the Cetus-class is versatile and durable, but also clumsy and somewhat underpowered in regards to its engine and propulsion. It features small weapon hardpoints in its thruster arms, and a massive hangar host to the design's interdiction counterpart - the Hydrus-class shuttle. This one appears to be a Decanus-class, the Tau Ceti Foreign Legion variation of the design."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -47,13 +47,13 @@
..()
/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav1
name = "TCFL Peacekeeper Ship - Port Side"
name = "TCFL Corvette - Port Side"
landmark_tag = "nav_tcfl_peacekeeper_ship_1"
base_turf = /turf/space/dynamic
base_area = /area/space
/obj/effect/shuttle_landmark/tcfl_peacekeeper_ship/nav2
name = "TCFL Peacekeeper Ship - Port Airlock"
name = "TCFL Corvette - Port Airlock"
landmark_tag = "nav_tcfl_peacekeeper_ship_2"
base_turf = /turf/space/dynamic
base_area = /area/space
@@ -68,7 +68,7 @@
name = "TCFL Shuttle"
designation = "BLV"
class = "Stake"
desc = "A large and unusually-shaped shuttle, the Hydrus-class is deceptively fast and is designed to operate out of a Cetus-class corvette's rear hangar bay, interdicting targets that its mothership intercepts. This one's transponder identifies it as a Tau Ceti Foreign Legion shuttle, and as a Velite-class Interceptor - the TCFL designation for this design."
desc = "A large and unusually-shaped shuttle, the Hydrus-class is deceptively fast and is designed to operate out of a Cetus-class corvette's rear hangar bay, interdicting targets that its mothership intercepts. This one appears to be a Velite-class Interceptor - the TCFL designation for this design."
shuttle = "TCFL Shuttle"
max_speed = 1/(3 SECONDS)
burn_delay = 2 SECONDS
@@ -156,6 +156,12 @@
/obj/item/ship_ammunition/grauwolf_bundle/ap,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"aTI" = (
/obj/machinery/computer/ship/engines{
dir = 4
},
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"aUf" = (
/obj/structure/closet/crate/medical,
/obj/item/storage/firstaid/regular,
@@ -917,6 +923,10 @@
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/wall/shuttle/legion,
/area/shuttle/tcfl_shuttle)
"gaY" = (
/obj/effect/floor_decal/industrial/outline/red,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"gcq" = (
/obj/effect/floor_decal/industrial/warning{
dir = 10
@@ -1080,10 +1090,18 @@
dir = 1
},
/area/shuttle/tcfl_shuttle)
"haL" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/ship/sensors{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"hdb" = (
/obj/machinery/light/small{
dir = 4
},
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"hdd" = (
@@ -1237,6 +1255,14 @@
},
/turf/simulated/floor/shuttle/black,
/area/shuttle/tcfl_shuttle)
"hLc" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/ship/helm{
dir = 8;
req_access = list(204)
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"hLR" = (
/obj/structure/bed/stool/chair/shuttle{
dir = 4
@@ -1279,6 +1305,7 @@
/area/ship/tcfl_peacekeeper_ship)
"hRT" = (
/obj/machinery/vending/tool,
/obj/machinery/light/small/emergency,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"hSW" = (
@@ -1454,6 +1481,9 @@
/area/space)
"iVq" = (
/obj/machinery/mech_recharger,
/mob/living/heavy_vehicle/premade/combatripley{
h_r_hand = /obj/item/mecha_equipment/clamp
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"iWp" = (
@@ -1643,6 +1673,12 @@
/obj/effect/floor_decal/industrial/warning,
/turf/simulated/floor/shuttle/black,
/area/shuttle/tcfl_shuttle)
"jQY" = (
/obj/machinery/ammunition_loader/francisca{
weapon_id = "TCFL Francisca Rotary Gun"
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"jRX" = (
/obj/machinery/embedded_controller/radio/simple_docking_controller{
frequency = 1380;
@@ -1690,6 +1726,9 @@
dir = 9
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/bed/stool/chair/office/bridge/generic{
dir = 4
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"kgR" = (
@@ -1798,6 +1837,13 @@
/obj/machinery/light/small,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"kyw" = (
/obj/effect/decal/cleanable/dirt,
/obj/machinery/computer/ship/targeting{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"kzm" = (
/obj/machinery/door/firedoor,
/obj/effect/floor_decal/corner/blue{
@@ -2050,6 +2096,9 @@
/obj/machinery/light/small/emergency{
dir = 1
},
/obj/effect/floor_decal/industrial/warning{
dir = 8
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"mnC" = (
@@ -2109,6 +2158,10 @@
/obj/item/stack/material/glass/full,
/obj/item/stack/material/glass/reinforced/full,
/obj/structure/lattice/catwalk/indoor,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/obj/item/grenade/chem_grenade/metalfoam,
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"mEc" = (
@@ -2239,6 +2292,7 @@
/area/ship/tcfl_peacekeeper_ship)
"nsw" = (
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"ntt" = (
@@ -2416,6 +2470,12 @@
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"pcu" = (
/obj/machinery/light/small/emergency,
/obj/structure/table/steel,
/obj/item/clothing/ears/earmuffs,
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"pfg" = (
/obj/structure/window/shuttle/legion,
/obj/structure/grille,
@@ -2751,6 +2811,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"qXd" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 9
},
/obj/machinery/door/firedoor,
/obj/machinery/portable_atmospherics/powered/scrubber/huge,
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"qXw" = (
/obj/machinery/atmospherics/pipe/simple/hidden,
/obj/machinery/access_button{
@@ -2814,12 +2882,39 @@
},
/area/ship/tcfl_peacekeeper_ship)
"rkM" = (
/obj/machinery/light/small,
/obj/machinery/mech_recharger,
/mob/living/heavy_vehicle/premade/combatripley{
h_r_hand = /obj/item/mecha_equipment/clamp
/obj/effect/floor_decal/industrial/warning,
/obj/structure/table/rack,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca,
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/turf/simulated/floor,
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/obj/item/ship_ammunition/francisca/ap{
pixel_y = 5
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"rlW" = (
/obj/structure/ship_weapon_dummy{
is_barrel = 1
},
/turf/template_noop,
/area/ship/tcfl_peacekeeper_ship)
"rrF" = (
/obj/structure/bed/stool,
@@ -3023,6 +3118,15 @@
},
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"sJV" = (
/obj/machinery/ship_weapon/francisca{
pixel_x = -64;
pixel_y = -162;
weapon_id = "TCFL Francisca Rotary Gun"
},
/obj/structure/ship_weapon_dummy,
/turf/template_noop,
/area/ship/tcfl_peacekeeper_ship)
"sKP" = (
/obj/effect/floor_decal/corner/blue{
dir = 9
@@ -3066,6 +3170,10 @@
},
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"sTl" = (
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"sWY" = (
/turf/simulated/floor/shuttle/dark_blue,
/area/ship/tcfl_peacekeeper_ship)
@@ -3094,7 +3202,7 @@
/area/ship/tcfl_peacekeeper_ship)
"tis" = (
/obj/machinery/door/airlock/hatch{
name = "Maintenance";
name = "Maintenance/Backup Controls";
req_access = list(204)
},
/obj/machinery/door/firedoor,
@@ -3217,6 +3325,20 @@
},
/turf/simulated/floor/plating,
/area/ship/tcfl_peacekeeper_ship)
"tTZ" = (
/obj/structure/table/rack,
/obj/structure/window/reinforced{
dir = 4
},
/obj/structure/window/reinforced,
/obj/structure/window/reinforced{
dir = 8
},
/obj/machinery/door/window{
dir = 1
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"tUb" = (
/obj/effect/floor_decal/corner/blue{
dir = 6
@@ -3395,6 +3517,14 @@
},
/turf/simulated/floor/tiled/dark,
/area/ship/tcfl_peacekeeper_ship)
"vjD" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 5
},
/obj/machinery/door/firedoor,
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor,
/area/ship/tcfl_peacekeeper_ship)
"vnW" = (
/obj/structure/railing/mapped{
dir = 8
@@ -24332,11 +24462,11 @@ xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
xRX
hSW
hSW
hSW
hSW
rlW
xRX
xRX
xRX
@@ -24589,8 +24719,8 @@ xRX
xRX
xRX
xRX
xRX
xRX
sJV
hSW
xRX
xRX
xRX
@@ -24846,7 +24976,7 @@ yjk
yjk
yjk
qtX
yjk
jQY
yjk
xRX
xRX
@@ -25094,16 +25224,16 @@ xRX
xRX
xRX
sBA
qds
pPl
vjD
sTl
hZq
oYH
hZq
pPl
aTI
yjk
dCR
mxc
rkM
bYX
yjk
xRX
xRX
@@ -25608,9 +25738,9 @@ xRX
xRX
xRX
sBA
gxW
qXd
hdb
pPl
sTl
pPl
xFD
sfQ
@@ -26644,9 +26774,9 @@ urq
rYF
arF
xji
jWO
xji
hRT
qtX
yjk
xRX
xRX
xRX
@@ -32803,7 +32933,7 @@ jWO
jWO
jWO
jWO
ghV
rkM
yjk
hRJ
iWp
@@ -33327,7 +33457,7 @@ hNy
hNy
hNy
lmS
cwQ
pcu
yjk
xRX
xRX
@@ -33584,7 +33714,7 @@ xji
xji
xji
xji
xji
tTZ
yjk
xRX
xRX
@@ -34863,12 +34993,12 @@ sBA
gxW
hWh
jbQ
jWO
jWO
jWO
haL
hLc
kyw
yjk
sOz
xji
gaY
cwQ
yjk
xRX
@@ -1,6 +1,6 @@
/datum/map_template/ruin/away_site/tramp_freighter
name = "Tramp Freighter"
description = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space. This one's transponder identifies it as an independent vessel."
description = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space."
suffix = "ships/tramp_freighter/tramp_freighter.dmm"
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_NEW_ANKARA, SECTOR_BADLANDS, SECTOR_AEMAQ)
spawn_weight = 1
@@ -10,7 +10,7 @@
/decl/submap_archetype/tramp_freighter
map = "Tramp Freighter"
descriptor = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space. This one's transponder identifies it as an independent vessel."
descriptor = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space."
//areas
/area/ship/tramp_freighter
@@ -25,7 +25,7 @@
/obj/effect/overmap/visitable/ship/tramp_freighter
name = "Tramp Freighter"
class = "ICV"
desc = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space. This one's transponder identifies it as an independent vessel."
desc = "A freighter of mixed repute, the Catspaw-class is a rare independent design, and a favorite of small-scale freight businesses. It has a shielded cargo bay and an internal hangar, capable of accommodating a small shuttle. Its other features, however, are lacking - with cramped crew amenities and no defenses to speak of, the Catspaw is risky to operate in unpoliced space."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -658,18 +658,9 @@
/obj/effect/floor_decal/industrial/outline/red,
/obj/effect/decal/cleanable/dirt,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/flashshells,
/obj/item/gun/projectile/shotgun/doublebarrel,
/obj/item/storage/box/flashshells,
/obj/item/storage/box/shotgunshells,
/obj/item/gun/projectile/shotgun/pump/rifle/pipegun,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/item/ammo_casing/a556,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/turf/simulated/floor/tiled/dark,
/area/ship/tramp_freighter)
"eiL" = (
@@ -954,6 +945,7 @@
/obj/item/spacecash/c50,
/obj/structure/closet,
/obj/effect/floor_decal/corner/black/diagonal,
/obj/item/clothing/suit/armor/material/makeshift/plasteel,
/turf/simulated/floor/tiled/yellow,
/area/ship/tramp_freighter)
"fXG" = (
@@ -1311,16 +1303,9 @@
},
/obj/effect/floor_decal/industrial/outline/red,
/obj/effect/decal/cleanable/dirt,
/obj/item/gun/projectile/tanto,
/obj/item/ammo_magazine/mc10mm,
/obj/item/ammo_magazine/mc10mm,
/obj/item/gun/projectile/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/gun/projectile/revolver/detective,
/obj/item/ammo_magazine/c38,
/obj/item/ammo_magazine/c38,
/obj/item/gun/energy/pistol,
/obj/random/civgun,
/obj/random/civgun,
/obj/random/civgun,
/turf/simulated/floor/tiled/dark,
/area/ship/tramp_freighter)
"jgW" = (
@@ -1963,6 +1948,7 @@
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/gloves/fingerless,
/obj/item/clothing/suit/storage/toggle/leather_jacket/flight,
/obj/item/clothing/suit/armor/material/makeshift/plasteel,
/turf/simulated/floor/tiled/yellow,
/area/ship/tramp_freighter)
"uDF" = (
@@ -1,8 +1,8 @@
/datum/map_template/ruin/away_site/militia_ship
name = "Militia Ship"
description = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one's transponder identifies it as a local militia vessel."
description = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus."
suffix = "ships/wildlands_milita/militia_ship.dmm"
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE)
sectors = list(SECTOR_TAU_CETI, SECTOR_ROMANOVICH, SECTOR_CORP_ZONE, SECTOR_VALLEY_HALE, SECTOR_BADLANDS)
spawn_weight = 1
spawn_cost = 1
id = "militia_ship"
@@ -10,7 +10,7 @@
/decl/submap_archetype/militia_ship
map = "Militia Ship"
descriptor = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one's transponder identifies it as a local militia vessel."
descriptor = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus."
//areas
/area/ship/militia_ship
@@ -25,7 +25,7 @@
/obj/effect/overmap/visitable/ship/militia_ship
name = "Militia Ship"
class = "IPV"
desc = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus. This one's transponder identifies it as a local militia vessel."
desc = "An unarmed and extremely prolific design of large, self-sufficient shuttle, prized for its modularity. Found all throughout the spur, the Yak-class shuttle can be configured to conceivably serve in any role, though it is only rarely armed with ship-to-ship weapons. Manufactured by Hephaestus."
icon_state = "shuttle"
moving_state = "shuttle_moving"
max_speed = 1/(2 SECONDS)
@@ -497,7 +497,6 @@
/obj/item/flag/biesel/l,
/obj/item/flag/coalition,
/obj/item/flag/coalition/l,
/obj/item/gun/projectile/revolver/detective,
/obj/item/spacecash/c100,
/obj/item/spacecash/c100,
/obj/item/spacecash/c100,
@@ -522,8 +521,6 @@
/obj/item/spacecash/c20,
/obj/item/spacecash/c20,
/obj/item/grenade/smokebomb,
/obj/item/ammo_magazine/c762,
/obj/item/gun/projectile/automatic/rifle/shorty,
/turf/simulated/floor/carpet/rubber,
/area/ship/militia_ship)
"fQq" = (
@@ -572,16 +569,14 @@
},
/obj/item/material/knife/trench,
/obj/item/material/knife/trench,
/obj/item/storage/box/shotgunshells,
/obj/random/civgun/rifle,
/obj/random/civgun/rifle,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/gun/projectile/shotgun/pump/rifle,
/obj/item/ammo_magazine/boltaction,
/obj/item/ammo_magazine/boltaction,
/obj/item/ammo_magazine/boltaction,
/obj/item/gun/projectile/shotgun/pump,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/beanbags,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/shotgunshells,
/obj/item/storage/box/flashshells,
/turf/simulated/floor/tiled/dark,
/area/ship/militia_ship)
"goI" = (
@@ -720,14 +715,14 @@
/area/ship/militia_ship)
"hWh" = (
/obj/structure/table/rack,
/obj/item/tank/jetpack/oxygen,
/obj/item/tank/jetpack/oxygen,
/obj/item/tank/jetpack/oxygen,
/obj/item/tank/jetpack/oxygen,
/obj/effect/floor_decal/industrial/outline/yellow,
/obj/structure/sign/staff_only{
pixel_x = -32
},
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide,
/obj/item/tank/jetpack/carbondioxide,
/turf/simulated/floor/tiled/dark,
/area/ship/militia_ship)
"hZq" = (
@@ -1364,23 +1359,14 @@
},
/obj/item/material/knife/trench,
/obj/item/material/knife/trench,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc9mm,
/obj/item/ammo_magazine/mc9mm,
/obj/random/civgun,
/obj/random/civgun,
/obj/item/gun/projectile/leyon,
/obj/item/gun/energy/blaster/revolver,
/obj/item/gun/projectile/leyon,
/obj/item/gun/projectile/pistol,
/obj/item/ammo_magazine/mc10mm,
/obj/item/ammo_magazine/mc10mm,
/obj/item/ammo_magazine/mc10mm,
/obj/item/ammo_magazine/mc10mm,
/obj/item/gun/projectile/tanto,
/obj/item/gun/projectile/tanto,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/obj/item/ammo_magazine/mc10mm/leyon,
/turf/simulated/floor/tiled/dark,
@@ -31632,7 +31618,7 @@ aaI
aou
aHw
eCV
mkb
eMT
yjk
yjk
yjk
@@ -36258,7 +36244,7 @@ aaI
aHv
aSJ
hdb
mkb
eMT
yjk
vwF
vwF