diff --git a/_maps/shuttles/pirate_silverscale.dmm b/_maps/shuttles/pirate_silverscale.dmm index 318995cdbeb..f5a63f28e49 100644 --- a/_maps/shuttles/pirate_silverscale.dmm +++ b/_maps/shuttles/pirate_silverscale.dmm @@ -11,8 +11,11 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "aZ" = ( -/obj/machinery/suit_storage_unit/pirate, /obj/effect/turf_decal/bot_red, +/obj/machinery/suit_storage_unit/pirate{ + helmet_type = /obj/item/clothing/head/helmet/space/pirate/tophat; + suit_type = /obj/item/clothing/suit/space/pirate/silverscale + }, /turf/open/floor/pod/dark, /area/shuttle/pirate) "bp" = ( @@ -30,9 +33,6 @@ /turf/open/floor/pod/light, /area/shuttle/pirate) "de" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "pirateportexternal" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -40,6 +40,9 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "dI" = ( @@ -51,20 +54,18 @@ anchored = 1 }, /obj/structure/cable, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, /obj/effect/turf_decal/bot, /turf/open/floor/pod/dark, /area/shuttle/pirate) "dT" = ( -/obj/item/ammo_box/strilka310{ - pixel_y = 2 - }, -/obj/item/ammo_box/strilka310, -/obj/item/grenade/c4{ - pixel_x = -13 - }, /obj/structure/table, +/obj/item/grenade/c4, +/obj/item/grenade/c4{ + pixel_x = 9 + }, +/obj/item/grenade/c4{ + pixel_x = -9 + }, /turf/open/floor/iron/dark, /area/shuttle/pirate) "ei" = ( @@ -108,15 +109,25 @@ /obj/structure/rack{ dir = 8 }, -/obj/item/ammo_box/strilka310, -/obj/item/ammo_box/strilka310{ - pixel_y = 3 - }, /obj/effect/turf_decal/bot, -/obj/item/gun/ballistic/rifle/boltaction/prime, +/obj/item/ammo_box/strilka310/phasic{ + pixel_y = -5; + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = 5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5; + pixel_y = -5 + }, +/obj/item/ammo_box/strilka310/phasic{ + pixel_x = -5 + }, /obj/item/gun/ballistic/rifle/boltaction/prime{ pixel_y = 4 }, +/obj/item/gun/ballistic/rifle/boltaction/prime, /turf/open/floor/pod/dark, /area/shuttle/pirate) "fN" = ( @@ -300,13 +311,13 @@ /turf/open/floor/plating/airless, /area/shuttle/pirate) "nY" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "pirateportexternal" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "pirateportexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "pk" = ( @@ -330,6 +341,14 @@ "rB" = ( /turf/closed/wall/mineral/titanium, /area/shuttle/pirate) +"st" = ( +/mob/living/basic/bot/medbot/nukie{ + name = "Mortimer"; + faction = list("pirate"); + desc = "A lowly medibot serving as the Silverscales' live-in manservant/butler/coat rack. They recently discovered it can heal people as well." + }, +/turf/open/floor/carpet/royalblack, +/area/shuttle/pirate) "sB" = ( /turf/open/floor/iron/dark/textured, /area/shuttle/pirate) @@ -384,6 +403,9 @@ "xj" = ( /obj/structure/table/glass, /obj/item/storage/medkit/brute, +/obj/item/storage/medkit/fire{ + pixel_y = 5 + }, /turf/open/floor/carpet/royalblack, /area/shuttle/pirate) "xs" = ( @@ -427,9 +449,6 @@ /turf/open/floor/pod/dark, /area/shuttle/pirate) "zQ" = ( -/obj/machinery/door/airlock/external/glass/ruin{ - id_tag = "piratestarboardexternal" - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, @@ -437,6 +456,9 @@ dir = 8 }, /obj/effect/mapping_helpers/airlock/cutaiwire, +/obj/machinery/door/airlock/external/glass/ruin{ + id_tag = "piratestarboardexternal" + }, /turf/open/floor/pod/light, /area/shuttle/pirate) "Ae" = ( @@ -525,8 +547,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ dir = 4 }, -/obj/machinery/airalarm/directional/north, -/obj/effect/mapping_helpers/airalarm/all_access, +/obj/machinery/button/door/directional/north{ + specialfunctions = 4; + normaldoorcontrol = 1; + name = "External Bolt Control"; + id = "piratestarboardexternal" + }, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Fl" = ( @@ -632,6 +658,18 @@ /obj/item/gun/ballistic/shotgun/doublebarrel/slugs, /turf/open/floor/pod/dark, /area/shuttle/pirate) +"Lf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{ + dir = 4 + }, +/obj/machinery/button/door/directional/south{ + id = "pirateportexternal"; + name = "External Bolt Control"; + normaldoorcontrol = 1; + specialfunctions = 4 + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Lk" = ( /obj/machinery/power/terminal{ dir = 1 @@ -723,6 +761,14 @@ /obj/effect/mapping_helpers/airlock/cutaiwire, /turf/open/floor/pod/light, /area/shuttle/pirate) +"NL" = ( +/obj/structure/guncase, +/obj/item/gun/energy/laser/luxurypaywall{ + projectile_damage_multiplier = 1.30; + desc = "A laser gun modified to cost 20 credits to fire. Someone on the station should have an ID that works with this thing." + }, +/turf/open/floor/pod/dark, +/area/shuttle/pirate) "Ox" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 @@ -875,6 +921,8 @@ /area/shuttle/pirate) "UV" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, +/obj/machinery/airalarm/directional/north, +/obj/effect/mapping_helpers/airalarm/all_access, /turf/open/floor/pod/dark, /area/shuttle/pirate) "Vw" = ( @@ -1049,7 +1097,7 @@ TV rB rB dQ -Si +Lf rB aZ aZ @@ -1095,7 +1143,7 @@ fR Ox Qm wa -Qm +NL rB UV wa @@ -1187,7 +1235,7 @@ xs Ai am am -am +st am am Ai diff --git a/code/modules/antagonists/pirate/pirate_outfits.dm b/code/modules/antagonists/pirate/pirate_outfits.dm index aef7f1d9d4b..72318fe4987 100644 --- a/code/modules/antagonists/pirate/pirate_outfits.dm +++ b/code/modules/antagonists/pirate/pirate_outfits.dm @@ -62,10 +62,12 @@ id_trim = /datum/id_trim/pirate/silverscale uniform = /obj/item/clothing/under/syndicate/sniper suit = /obj/item/clothing/suit/armor/vest/alt + back = /obj/item/storage/backpack/satchel glasses = /obj/item/clothing/glasses/monocle gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/collectable/tophat shoes = /obj/item/clothing/shoes/laceup + implants = list(/obj/item/implant/explosive) /datum/outfit/pirate/silverscale/captain name = "Silver Scale Captain" diff --git a/code/modules/clothing/spacesuits/pirate.dm b/code/modules/clothing/spacesuits/pirate.dm index 946c0c2b66f..ca041d68d03 100644 --- a/code/modules/clothing/spacesuits/pirate.dm +++ b/code/modules/clothing/spacesuits/pirate.dm @@ -30,3 +30,15 @@ armor_type = /datum/armor/space_pirate strip_delay = 40 equip_delay_other = 20 + +/obj/item/clothing/head/helmet/space/pirate/tophat + name = "designer pirate helmet" + desc = "A modified EVA helmet with a five-thousand credit Lizzy Vuitton hat affixed to the top, proving that working in deep space is no excuse for being poor." + icon_state = "spacetophat" + +/obj/item/clothing/suit/space/pirate/silverscale + name = "designer pirate suit" + desc = "A specially-made Cybersun branded space suit; the fine plastisilk exterior is woven from the coccons of black-market Lümlan mothroaches \ + and the trim is lined with the ivory of the critically endagered Zanzibarian dwarf elephant. Baby seal leather boots sold seperately." + inhand_icon_state = "syndicate-black" + icon_state = "syndicate-black-white" diff --git a/code/modules/clothing/spacesuits/syndi.dm b/code/modules/clothing/spacesuits/syndi.dm index 67702582ff8..9cca1cfc3af 100644 --- a/code/modules/clothing/spacesuits/syndi.dm +++ b/code/modules/clothing/spacesuits/syndi.dm @@ -28,6 +28,7 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( /obj/item/clothing/suit/space/syndicate/black/blue = /obj/item/clothing/head/helmet/space/syndicate/black/blue, /obj/item/clothing/suit/space/syndicate/black/orange = /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/suit/space/syndicate/black/red = /obj/item/clothing/head/helmet/space/syndicate/black/red, + /obj/item/clothing/suit/space/syndicate/black/white = /obj/item/clothing/head/helmet/space/syndicate/black, /obj/item/clothing/suit/space/syndicate/black/med = /obj/item/clothing/head/helmet/space/syndicate/black/med, /obj/item/clothing/suit/space/syndicate/black/engie = /obj/item/clothing/head/helmet/space/syndicate/black/engie, )) @@ -132,6 +133,13 @@ GLOBAL_LIST_INIT(syndicate_space_suits_to_helmets,list( inhand_icon_state = "syndicate-black-blue" helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black/blue +//Black and white syndicate space suit without the medical iconography +/obj/item/clothing/suit/space/syndicate/black/white + name = "black and white space suit" + icon_state = "syndicate-black-white" + inhand_icon_state = "syndicate-black" + helmet_type = /obj/item/clothing/head/helmet/space/syndicate/black + //Black medical syndicate space suit /obj/item/clothing/head/helmet/space/syndicate/black/med diff --git a/code/modules/projectiles/ammunition/ballistic/rifle.dm b/code/modules/projectiles/ammunition/ballistic/rifle.dm index 3a7c3fcb59d..4c5c24a3eec 100644 --- a/code/modules/projectiles/ammunition/ballistic/rifle.dm +++ b/code/modules/projectiles/ammunition/ballistic/rifle.dm @@ -20,6 +20,10 @@ /obj/item/ammo_casing/strilka310/enchanted projectile_type = /obj/projectile/bullet/strilka310/enchanted +/obj/item/ammo_casing/strilka310/phasic + name = ".310 Strilka phasic bullet casing" + desc = "A phasic .310 Strika bullet casing. " + projectile_type = /obj/projectile/bullet/strilka310/phasic // .223 (M-90gl Carbine) /obj/item/ammo_casing/a223 diff --git a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index b604c5f8eac..1fb6cbbf94d 100644 --- a/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -128,6 +128,12 @@ name = "stripper clip (.310 Surplus)" ammo_type = /obj/item/ammo_casing/strilka310/surplus +/obj/item/ammo_box/strilka310/phasic + name = "stripper clip (.310 Phasic)" + desc = "A stripper clip filled with phasic bullets, hastily developed after an incident where a misfire resulted in the destruction of Atrakor Silverscale's priceless Vigoxian Fabergé egg. \ + These fancy bullets pass right though valuables until they end up in a far less expensive human skull." + ammo_type = /obj/item/ammo_casing/strilka310/phasic + /obj/item/ammo_box/n762 name = "ammo box (7.62x38mmR)" icon_state = "10mmbox" diff --git a/code/modules/projectiles/boxes_magazines/internal/rifle.dm b/code/modules/projectiles/boxes_magazines/internal/rifle.dm index 8c6abaa0e77..863f29508da 100644 --- a/code/modules/projectiles/boxes_magazines/internal/rifle.dm +++ b/code/modules/projectiles/boxes_magazines/internal/rifle.dm @@ -9,6 +9,9 @@ /obj/item/ammo_box/magazine/internal/boltaction/surplus ammo_type = /obj/item/ammo_casing/strilka310/surplus +/obj/item/ammo_box/magazine/internal/boltaction/phasic + ammo_type = /obj/item/ammo_casing/strilka310/phasic + /obj/item/ammo_box/magazine/internal/boltaction/pipegun name = "pipegun internal magazine" caliber = CALIBER_JUNK diff --git a/code/modules/projectiles/guns/ballistic/rifle.dm b/code/modules/projectiles/guns/ballistic/rifle.dm index 21ddb63211e..8604e21b325 100644 --- a/code/modules/projectiles/guns/ballistic/rifle.dm +++ b/code/modules/projectiles/guns/ballistic/rifle.dm @@ -159,6 +159,7 @@ You are now probably one of the few people in the universe to ever hold an \"Obrez Moderna\". \ All you had to do was take an allen wrench to the stock to take it off. But no, you just had to \ go for the saw." + accepted_magazine_type = /obj/item/ammo_box/magazine/internal/boltaction/phasic /obj/item/gun/ballistic/rifle/boltaction/prime/Initialize(mapload) . = ..() diff --git a/code/modules/projectiles/projectile/bullets/rifle.dm b/code/modules/projectiles/projectile/bullets/rifle.dm index 7e29b7e5c24..6f14df2f4c8 100644 --- a/code/modules/projectiles/projectile/bullets/rifle.dm +++ b/code/modules/projectiles/projectile/bullets/rifle.dm @@ -35,6 +35,10 @@ damage = 20 stamina = 80 +/obj/projectile/bullet/strilka310/phasic + name = "phasic .310 bullet" + projectile_phasing = PASSTABLE | PASSGLASS | PASSGRILLE | PASSCLOSEDTURF | PASSMACHINE | PASSSTRUCTURE | PASSDOORS + // Harpoons (Harpoon Gun) /obj/projectile/bullet/harpoon diff --git a/icons/mob/clothing/head/spacehelm.dmi b/icons/mob/clothing/head/spacehelm.dmi index 0b9f3d4a36e..d9a634a63c7 100644 Binary files a/icons/mob/clothing/head/spacehelm.dmi and b/icons/mob/clothing/head/spacehelm.dmi differ diff --git a/icons/mob/clothing/suits/spacesuit.dmi b/icons/mob/clothing/suits/spacesuit.dmi index 0067c4bf36a..1f691729a30 100644 Binary files a/icons/mob/clothing/suits/spacesuit.dmi and b/icons/mob/clothing/suits/spacesuit.dmi differ diff --git a/icons/obj/clothing/head/spacehelm.dmi b/icons/obj/clothing/head/spacehelm.dmi index c2830a9d933..980d2a07a50 100644 Binary files a/icons/obj/clothing/head/spacehelm.dmi and b/icons/obj/clothing/head/spacehelm.dmi differ diff --git a/icons/obj/clothing/suits/spacesuit.dmi b/icons/obj/clothing/suits/spacesuit.dmi index 922ad05c35e..7fe01246352 100644 Binary files a/icons/obj/clothing/suits/spacesuit.dmi and b/icons/obj/clothing/suits/spacesuit.dmi differ