[MIRROR] Buffs the Silverscale pirates (and their species slightly), and tweaks their shuttle [MDB IGNORE] (#11950)

* Buffs the Silverscale pirates (and their species slightly), and tweaks their shuttle (#65079)

* Buffs the Silverscale pirates (and their species slightly), and tweaks their shuttle

Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-03-07 22:10:37 -07:00
committed by GitHub
co-authored by MrMelbert
parent 7505caeb5e
commit 68a784ab62
11 changed files with 328 additions and 153 deletions
+295 -149
View File
@@ -8,13 +8,9 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/turf/open/floor/iron/dark,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"aA" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/item/storage/bag/money/vault,
/obj/item/stack/sheet/mineral/gold{
amount = 3;
@@ -26,10 +22,30 @@
pixel_x = 2;
pixel_y = -1
},
/obj/structure/table,
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"aZ" = (
/obj/machinery/suit_storage_unit/pirate,
/obj/effect/turf_decal/bot_red,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"bH" = (
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"ci" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/airalarm/all_access{
dir = 1;
pixel_y = 24
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"cE" = (
@@ -43,7 +59,12 @@
/obj/machinery/door/airlock/silver,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/pod/dark,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"dd" = (
/obj/machinery/newscaster/directional/east,
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"de" = (
/obj/machinery/door/airlock/external/glass/ruin{
@@ -52,17 +73,25 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/turf/open/floor/pod/dark,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"dI" = (
/obj/structure/dresser,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"dT" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
/obj/item/ammo_box/a762{
pixel_y = 2
},
/obj/item/ammo_box/a762,
/obj/item/grenade/c4{
pixel_x = -13
},
/obj/structure/table,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"ei" = (
@@ -74,7 +103,8 @@
/obj/structure/shuttle/engine/heater{
dir = 4
},
/turf/open/floor/plating,
/obj/effect/turf_decal/trimline/yellow/warning,
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"eK" = (
/obj/structure/shuttle/engine/router,
@@ -88,11 +118,16 @@
/obj/machinery/computer/shuttle/pirate{
dir = 8
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/side{
dir = 8
},
/area/shuttle/pirate)
"fN" = (
/obj/structure/dresser,
/obj/machinery/light/small/directional/north,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 9
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"fT" = (
@@ -105,27 +140,39 @@
/obj/structure/chair/comfy/shuttle{
dir = 1
},
/turf/open/floor/iron/dark,
/obj/machinery/airalarm/all_access{
dir = 8;
pixel_x = -24
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"ht" = (
/obj/machinery/door/airlock/silver,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/pod/dark,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"hu" = (
/obj/structure/chair/stool/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"hF" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"hW" = (
/obj/machinery/piratepad,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 8
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"iY" = (
/obj/structure/chair/comfy/shuttle,
/turf/open/floor/iron/dark,
/obj/effect/turf_decal/trimline/blue,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"je" = (
/turf/template_noop,
@@ -152,12 +199,11 @@
preferred_direction = 4;
width = 26
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"jo" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/plating,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"jG" = (
/obj/effect/turf_decal/trimline/yellow/warning{
@@ -170,10 +216,14 @@
dir = 4
},
/obj/machinery/light/small/directional/south,
/obj/effect/turf_decal/caution/stand_clear{
dir = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"ko" = (
/obj/structure/reagent_dispensers/watertank,
/obj/effect/turf_decal/bot/right,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"ky" = (
@@ -188,7 +238,7 @@
dir = 8
},
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"kF" = (
/obj/effect/turf_decal/trimline/yellow/warning,
@@ -198,10 +248,6 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"kU" = (
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"lk" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
@@ -210,9 +256,12 @@
/area/shuttle/pirate)
"lu" = (
/obj/item/storage/secure/safe/directional/north,
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale/captain{
dir = 8
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/obj/structure/bed/pod,
/obj/item/bedsheet/black,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"lL" = (
@@ -225,7 +274,10 @@
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/turf/open/space/basic,
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 6
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"mI" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -237,7 +289,18 @@
/obj/machinery/computer/monitor/secret{
dir = 8
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/side{
dir = 8
},
/area/shuttle/pirate)
"nm" = (
/obj/structure/shuttle/engine/propulsion{
dir = 4
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 5
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"nB" = (
/obj/effect/turf_decal/trimline/yellow/warning{
@@ -249,11 +312,25 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"nK" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
/obj/structure/shuttle/engine/heater{
dir = 8
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 1
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"nY" = (
/obj/machinery/door/airlock/external/glass/ruin{
id_tag = "pirateportexternal"
},
/turf/open/floor/pod/dark,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 4
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"pk" = (
/obj/machinery/porta_turret/syndicate/energy{
@@ -271,7 +348,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/turf/open/floor/carpet/royalblack,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"qA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -283,6 +360,9 @@
"rB" = (
/turf/closed/wall/mineral/titanium,
/area/shuttle/pirate)
"sB" = (
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"ue" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 1
@@ -307,10 +387,14 @@
/obj/structure/chair/comfy/shuttle{
dir = 4
},
/turf/open/floor/iron/dark,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"vM" = (
/obj/structure/closet/secure_closet/personal/cabinet,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/obj/item/ammo_casing/shotgun,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"vP" = (
@@ -327,6 +411,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"wE" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 8;
faction = list("pirate")
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 6
},
/turf/open/floor/plating/airless,
/area/template_noop)
"xe" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/machinery/light/directional/east,
@@ -334,13 +428,7 @@
/area/shuttle/pirate)
"xj" = (
/obj/structure/table/glass,
/obj/item/reagent_containers/food/drinks/drinkingglass{
pixel_x = -8
},
/obj/item/reagent_containers/food/drinks/drinkingglass{
pixel_x = 9;
pixel_y = 9
},
/obj/item/storage/firstaid/brute,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"xs" = (
@@ -368,6 +456,12 @@
/obj/item/melee/energy/sword/saber/purple{
pixel_x = 17
},
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"yv" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/obj/machinery/meter,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"zB" = (
@@ -375,13 +469,16 @@
/obj/machinery/chem_dispenser/drinks/beer{
dir = 1
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"zN" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/light/small/directional/north,
/obj/effect/turf_decal/caution/stand_clear{
dir = 4
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"zQ" = (
@@ -391,10 +488,16 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/turf/open/floor/pod/dark,
/obj/effect/mapping_helpers/airlock/cyclelink_helper{
dir = 8
},
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"Ae" = (
/obj/machinery/shuttle_scrambler,
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"Ai" = (
@@ -404,7 +507,6 @@
/obj/structure/chair/sofa/corp/right{
dir = 1
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"AE" = (
@@ -412,7 +514,8 @@
/obj/structure/shuttle/engine/heater{
dir = 8
},
/turf/open/space/basic,
/obj/effect/turf_decal/trimline/yellow/warning,
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"AR" = (
/obj/structure/toilet{
@@ -426,22 +529,7 @@
dir = 8
},
/obj/machinery/light/small/directional/south,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"BK" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 1
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"BO" = (
/obj/structure/shuttle/engine/propulsion{
dir = 8
},
/obj/effect/turf_decal/trimline/yellow/warning{
dir = 9
},
/turf/open/floor/plating/airless,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"Ch" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -458,20 +546,21 @@
charge = 1e+006
},
/obj/structure/cable,
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"CW" = (
/obj/machinery/vending/boozeomat/all_access{
onstation = 0
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"Dt" = (
/obj/structure/chair/comfy/shuttle{
dir = 4
"DP" = (
/obj/machinery/airalarm/all_access{
dir = 4;
pixel_x = 24
},
/obj/machinery/light/floor,
/turf/open/floor/iron/dark,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"DX" = (
/obj/structure/chair/comfy/shuttle{
@@ -504,7 +593,7 @@
pixel_x = 2;
pixel_y = 4
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"HD" = (
/obj/effect/spawner/structure/window/reinforced/shuttle,
@@ -517,6 +606,7 @@
/obj/structure/musician/piano{
icon_state = "piano"
},
/obj/machinery/light/directional/west,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"Ig" = (
@@ -524,12 +614,13 @@
/obj/machinery/chem_dispenser/drinks{
dir = 1
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"Is" = (
/obj/machinery/computer/piratepad_control{
dir = 4
},
/obj/machinery/light/directional/west,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"Jc" = (
@@ -544,17 +635,22 @@
/obj/item/reagent_containers/food/drinks/bottle/wine{
pixel_y = 6
},
/turf/open/floor/iron/dark,
/obj/machinery/newscaster/directional/west,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"Jq" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 6
},
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale/gunner{
dir = 4
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"JL" = (
/obj/structure/bookcase/random/nonfiction,
/turf/open/floor/iron/dark,
/obj/machinery/newscaster/directional/west,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"JV" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden,
@@ -574,8 +670,23 @@
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"LE" = (
/obj/machinery/porta_turret/syndicate/energy{
dir = 4;
faction = list("pirate")
},
/obj/effect/turf_decal/trimline/yellow/end{
dir = 4
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"LQ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale{
dir = 8
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 9
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"Mo" = (
@@ -584,7 +695,9 @@
x_offset = 10;
y_offset = 5
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/side{
dir = 8
},
/area/shuttle/pirate)
"Mu" = (
/obj/structure/shuttle/engine/propulsion{
@@ -593,13 +706,18 @@
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"MA" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale/captain{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 10
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"Nm" = (
/obj/machinery/loot_locator,
/obj/effect/turf_decal/bot,
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"NI" = (
@@ -607,7 +725,8 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/turf/open/floor/iron/dark,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"Oo" = (
/obj/structure/table/glass,
@@ -638,7 +757,7 @@
pixel_x = 3;
pixel_y = 5
},
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"Ox" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
@@ -646,10 +765,11 @@
},
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"OT" = (
/obj/machinery/door/airlock/silver,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/dark,
"OJ" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 8
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"Pg" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
@@ -664,14 +784,11 @@
/obj/machinery/atmospherics/components/tank/air{
dir = 1
},
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"QO" = (
/obj/structure/bed/pod,
/obj/item/bedsheet/black,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 10
},
/obj/machinery/newscaster/directional/north,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"QU" = (
@@ -687,15 +804,11 @@
amount = 10
},
/obj/item/multitool,
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"RE" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 9
},
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale/gunner{
dir = 4
},
/obj/machinery/newscaster/directional/south,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"RF" = (
@@ -706,19 +819,31 @@
/area/shuttle/pirate)
"RH" = (
/obj/structure/fireplace,
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"RO" = (
/obj/structure/rack{
dir = 8;
layer = 2.9
},
/obj/item/gun/ballistic/rifle/boltaction{
pixel_y = 5
/obj/item/ammo_box/a762,
/obj/item/ammo_box/a762{
pixel_y = 3
},
/obj/effect/turf_decal/bot,
/obj/item/gun/ballistic/rifle/boltaction/brand_new/prime,
/obj/item/gun/ballistic/rifle/boltaction/brand_new/prime{
pixel_y = 4
},
/obj/item/gun/ballistic/rifle/boltaction,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"RU" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/light/small/directional/south,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"RY" = (
/obj/machinery/light/directional/east,
/turf/open/floor/pod/dark,
@@ -744,6 +869,11 @@
anchored = 1
},
/obj/structure/cable,
/obj/machinery/airalarm/all_access{
dir = 1;
pixel_y = 24
},
/obj/effect/turf_decal/bot,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"Sv" = (
@@ -768,13 +898,21 @@
},
/turf/open/floor/plating/airless,
/area/shuttle/pirate)
"Uf" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/obj/machinery/light/small/directional/north,
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"Ut" = (
/obj/structure/rack,
/obj/item/stack/sheet/mineral/wood{
amount = 10
},
/obj/item/lighter,
/turf/open/floor/iron/dark,
/obj/item/melee/roastingstick,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"UJ" = (
/obj/structure/shuttle/engine/propulsion{
@@ -798,6 +936,7 @@
/area/shuttle/pirate)
"Wy" = (
/obj/structure/reagent_dispensers/fueltank,
/obj/effect/turf_decal/bot/left,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"Xw" = (
@@ -826,11 +965,14 @@
onstation = 0
},
/obj/machinery/light/small/directional/south,
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 10
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"XX" = (
/obj/structure/bookcase/random/fiction,
/turf/open/floor/iron/dark,
/turf/open/floor/iron/dark/textured,
/area/shuttle/pirate)
"Yj" = (
/obj/structure/rack{
@@ -838,7 +980,9 @@
layer = 2.9
},
/obj/item/storage/box/lethalshot,
/obj/item/gun/ballistic/shotgun/doublebarrel,
/obj/item/storage/box/lethalshot,
/obj/effect/turf_decal/bot,
/obj/item/gun/ballistic/shotgun/doublebarrel/slugs,
/turf/open/floor/pod/dark,
/area/shuttle/pirate)
"YD" = (
@@ -849,19 +993,21 @@
pixel_y = -5
},
/obj/item/radio/intercom{
freerange = 1;
pixel_y = 5
},
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
"YL" = (
/obj/effect/mob_spawn/ghost_role/human/pirate/silverscale{
dir = 8
},
/turf/open/floor/carpet/royalblack,
/area/shuttle/pirate)
"ZD" = (
/obj/machinery/door/airlock/silver/glass,
/obj/effect/mapping_helpers/airlock/cutaiwire,
/turf/open/floor/pod/light,
/area/shuttle/pirate)
"ZU" = (
/obj/structure/chair/sofa/corp/left{
dir = 1
},
/obj/machinery/light/directional/east,
/turf/open/floor/iron/dark,
/area/shuttle/pirate)
@@ -886,7 +1032,7 @@ je
"}
(2,1,1) = {"
je
BO
vw
rB
TT
rB
@@ -905,7 +1051,7 @@ je
"}
(3,1,1) = {"
je
AE
nK
rB
jQ
rB
@@ -955,7 +1101,7 @@ Yj
RO
xR
rB
Si
ci
QI
rB
rB
@@ -975,7 +1121,7 @@ wa
wa
cH
Si
wa
yv
ko
rB
"}
@@ -986,11 +1132,11 @@ Pg
qA
rB
RY
Qm
Qm
wa
bH
Ox
Qm
Qm
wa
RY
rB
xe
@@ -1005,11 +1151,11 @@ au
rB
rB
rB
OT
cH
rB
rB
rB
OT
cH
rB
rB
rB
@@ -1024,11 +1170,11 @@ fT
cE
xs
HS
kU
iY
Ch
eU
Jc
gg
kU
Ch
aA
xs
Kq
@@ -1043,11 +1189,11 @@ fT
CH
xs
hu
am
JV
eU
Xw
DX
am
JV
dT
xs
Ai
@@ -1061,13 +1207,13 @@ RH
ue
lk
ZD
Ai
am
ei
JV
eU
xj
DX
am
Ai
JV
lk
ZD
ei
Ch
@@ -1076,19 +1222,19 @@ rB
"}
(12,1,1) = {"
HD
Ai
sB
ue
Aj
jo
lk
xs
Ai
am
am
am
am
am
ei
jo
Ch
Ai
xs
Ai
Ch
zB
HD
@@ -1097,17 +1243,17 @@ HD
HD
XX
fT
CH
ZU
xs
Nm
Vw
vz
Dt
vz
vz
YD
Ae
xs
Ai
dd
fT
Ig
HD
@@ -1118,13 +1264,13 @@ rB
pU
rB
rB
HD
rB
HD
Mo
fj
nh
HD
HD
rB
rB
rB
pU
@@ -1153,7 +1299,7 @@ rB
(16,1,1) = {"
rB
vM
BK
OJ
MA
HD
xO
@@ -1165,8 +1311,8 @@ je
RF
HD
LQ
JV
YL
OJ
uP
rB
"}
(17,1,1) = {"
@@ -1189,10 +1335,10 @@ rB
rB
"}
(18,1,1) = {"
je
wE
rB
lu
Sv
RU
rB
je
je
@@ -1202,10 +1348,10 @@ je
je
je
rB
Sv
uP
Uf
DP
rB
je
wE
"}
(19,1,1) = {"
je
@@ -1228,7 +1374,7 @@ je
"}
(20,1,1) = {"
je
em
hF
rB
ky
rB
@@ -1247,7 +1393,7 @@ je
"}
(21,1,1) = {"
je
mz
nm
rB
rB
rB
@@ -1364,7 +1510,7 @@ je
je
je
je
rB
LE
je
je
je
@@ -1372,7 +1518,7 @@ je
je
je
je
rB
LE
je
je
je
+1 -1
View File
@@ -169,7 +169,7 @@
id = /obj/item/card/id/advanced/silver
id_trim = /datum/id_trim/pirate/silverscale
uniform = /obj/item/clothing/under/suit/charcoal
uniform = /obj/item/clothing/under/syndicate/sniper
suit = /obj/item/clothing/suit/armor/vest/alt
glasses = /obj/item/clothing/glasses/monocle
gloves = /obj/item/clothing/gloves/color/black
@@ -158,6 +158,9 @@ Lizard subspecies: SILVER SCALED
TRAIT_CAN_STRIP,
TRAIT_HOLY,
TRAIT_NOBREATH,
TRAIT_RESISTHIGHPRESSURE,
TRAIT_RESISTLOWPRESSURE,
TRAIT_PIERCEIMMUNE,
TRAIT_VIRUSIMMUNE,
TRAIT_WINE_TASTER,
)
@@ -22,6 +22,10 @@
name = "double-barrel shotgun internal magazine"
max_ammo = 2
/obj/item/ammo_box/magazine/internal/shot/dual/slugs
name = "double-barrel shotgun internal magazine (slugs)"
ammo_type = /obj/item/ammo_casing/shotgun
/obj/item/ammo_box/magazine/internal/shot/riot
name = "riot shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
@@ -49,7 +49,8 @@
/obj/item/gun/ballistic/rifle/boltaction
name = "\improper Mosin Nagant"
desc = "This piece of junk looks like something that could have been used 700 years ago. It feels slightly moist."
sawn_desc = "An extremely sawn-off Mosin Nagant, popularly known as an \"obrez\". There was probably a reason it wasn't manufactured this short to begin with."
sawn_desc = "An extremely sawn-off Mosin Nagant, popularly known as an \"Obrez\". \
There was probably a reason it wasn't manufactured this short to begin with."
weapon_weight = WEAPON_HEAVY
icon_state = "moistnugget"
inhand_icon_state = "moistnugget"
@@ -119,11 +120,26 @@
can_be_sawn_off = FALSE
/obj/item/gun/ballistic/rifle/boltaction/brand_new
name = "Mosin Nagant"
desc = "Brand new Mosin Nagant issued by Nanotrasen for their interns. You would rather not to damage it."
desc = "A brand new Mosin Nagant issued by Nanotrasen for their interns. You would rather not to damage it."
can_be_sawn_off = FALSE
realistic = FALSE
/obj/item/gun/ballistic/rifle/boltaction/brand_new/prime
name = "\improper Regal Nagant"
desc = "A prized hunting Mosin Nagant. Used for the most dangerous game."
icon_state = "moistprime"
inhand_icon_state = "moistprime"
worn_icon_state = "moistprime"
can_be_sawn_off = TRUE
sawn_desc = "A sawn-off Regal Nagant... Doing this was a sin, I hope you're happy. \
You are now probably one of the few people in the universe to ever hold a \"Regal Obrez\". \
Even thinking about that name combination makes you ill."
/obj/item/gun/ballistic/rifle/boltaction/brand_new/prime/sawoff(mob/user)
. = ..()
if(.)
name = "\improper Regal Obrez" // wear it loud and proud
/obj/item/gun/ballistic/rifle/boltaction/pipegun
name = "pipegun"
desc = "An excellent weapon for flushing out tunnel rats and enemy assistants, but its rifling leaves much to be desired."
@@ -181,6 +181,12 @@
if(.)
weapon_weight = WEAPON_MEDIUM
/obj/item/gun/ballistic/shotgun/doublebarrel/slugs
name = "hunting shotgun"
desc = "A hunting shotgun used by the wealthy to hunt \"game\"."
sawn_desc = "A sawn-off hunting shotgun. In its new state, it's remarkably less effective at hunting... anything."
mag_type = /obj/item/ammo_box/magazine/internal/shot/dual/slugs
/obj/item/gun/ballistic/shotgun/hook
name = "hook modified sawn-off shotgun"
desc = "Range isn't an issue when you can bring your victim to you."
Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 128 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 55 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 65 KiB

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 32 KiB