diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index 2dfff37a4d..123f84eef6 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -33,7 +33,7 @@ /area/template_noop) "ah" = ( /obj/structure/lattice/catwalk, -/mob/living/simple_animal/hostile/pirate/space{ +/mob/living/simple_animal/hostile/pirate/space/ranged{ environment_smash = 0 }, /turf/template_noop, @@ -176,7 +176,7 @@ /area/shuttle/caravan/freighter3) "aP" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/mob/living/simple_animal/hostile/pirate/space{ +/mob/living/simple_animal/hostile/pirate/space/ranged{ environment_smash = 0 }, /turf/open/floor/plasteel/airless/floorgrime, @@ -404,6 +404,8 @@ /area/shuttle/caravan/freighter3) "gt" = ( /obj/effect/turf_decal/bot_white, +/obj/structure/closet/crate/secure/weapon, +/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted, /turf/open/floor/plasteel/airless/dark, /area/shuttle/caravan/freighter3) "gv" = ( @@ -471,7 +473,7 @@ /turf/open/floor/plating/airless, /area/shuttle/caravan/freighter3) "gT" = ( -/mob/living/simple_animal/hostile/syndicate/melee/space{ +/mob/living/simple_animal/hostile/syndicate/ranged/space{ environment_smash = 0; name = "Syndicate Salvage Worker" }, @@ -612,6 +614,10 @@ /obj/effect/turf_decal/box/white/corners{ dir = 1 }, +/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{ + environment_smash = 0; + name = "Syndicate Salvage Leader" + }, /turf/open/floor/plasteel/airless/dark, /area/shuttle/caravan/freighter3) "hz" = ( @@ -625,10 +631,6 @@ }, /area/shuttle/caravan/freighter3) "hB" = ( -/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{ - environment_smash = 0; - name = "Syndicate Salvage Leader" - }, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -895,7 +897,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate/melee/space{ +/mob/living/simple_animal/hostile/syndicate/ranged/space{ environment_smash = 0; name = "Syndicate Salvage Worker" }, diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 8bcddfb680..dac9d9fa0f 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -43,6 +43,13 @@ dir = 5 }, /area/shuttle/caravan/pirate) +"eL" = ( +/obj/machinery/porta_turret/syndicate/pod{ + dir = 10; + faction = list("pirate") + }, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/caravan/pirate) "fh" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 @@ -73,7 +80,9 @@ /turf/open/floor/plasteel/red/side, /area/shuttle/caravan/pirate) "hh" = ( -/mob/living/simple_animal/hostile/pirate, +/mob/living/simple_animal/hostile/pirate{ + environment_smash = 0 + }, /turf/open/floor/plasteel, /area/shuttle/caravan/pirate) "hI" = ( @@ -390,6 +399,12 @@ /obj/item/reagent_containers/food/drinks/bottle/rum, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/pirate) +"tM" = ( +/mob/living/simple_animal/hostile/pirate/ranged{ + environment_smash = 0 + }, +/turf/open/floor/plasteel/floorgrime, +/area/shuttle/caravan/pirate) "ul" = ( /obj/structure/table, /obj/item/retractor, @@ -448,8 +463,6 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/structure/closet/crate/secure/weapon, -/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -853,6 +866,13 @@ /obj/item/melee/classic_baton, /turf/open/floor/plasteel/darkred/corner, /area/shuttle/caravan/pirate) +"Yj" = ( +/obj/machinery/porta_turret/syndicate/pod{ + dir = 9; + faction = list("pirate") + }, +/turf/closed/wall/mineral/plastitanium, +/area/shuttle/caravan/pirate) "Yo" = ( /obj/structure/table, /obj/item/storage/box/lethalshot, @@ -913,7 +933,7 @@ Jv "} (3,1,1) = {" Jv -oL +Yj af qX yt @@ -923,7 +943,7 @@ RK FM jh af -oL +eL Jv "} (4,1,1) = {" @@ -980,7 +1000,7 @@ su Ag af jo -su +tM sr af af diff --git a/_maps/shuttles/ruin_syndicate_dropship.dmm b/_maps/shuttles/ruin_syndicate_dropship.dmm index d635953737..75c5bd24c0 100644 --- a/_maps/shuttles/ruin_syndicate_dropship.dmm +++ b/_maps/shuttles/ruin_syndicate_dropship.dmm @@ -319,9 +319,8 @@ /obj/structure/chair/office/dark{ dir = 4 }, -/mob/living/simple_animal/hostile/syndicate{ - environment_smash = 0; - name = "Syndicate Salvage Pilot" +/mob/living/simple_animal/hostile/syndicate/ranged/pilot{ + environment_smash = 0 }, /turf/open/floor/plasteel/dark, /area/shuttle/caravan/syndicate3) diff --git a/_maps/shuttles/ruin_syndicate_fighter.dmm b/_maps/shuttles/ruin_syndicate_fighter.dmm index 116448f4d6..97cd611673 100644 --- a/_maps/shuttles/ruin_syndicate_fighter.dmm +++ b/_maps/shuttles/ruin_syndicate_fighter.dmm @@ -18,9 +18,8 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/mob/living/simple_animal/hostile/syndicate{ - environment_smash = 0; - name = "Syndicate Salvage Pilot" +/mob/living/simple_animal/hostile/syndicate/ranged/pilot{ + environment_smash = 0 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/caravan/syndicate1) diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index edf601515a..3a5c102e52 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -118,6 +118,10 @@ projectilesound = 'sound/weapons/gunshot_smg.ogg' loot = list(/obj/effect/gibspawner/human) +/mob/living/simple_animal/hostile/syndicate/ranged/pilot + name = "Syndicate Salvage Pilot" + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier) + /mob/living/simple_animal/hostile/syndicate/ranged/space icon_state = "syndicaterangedspace" icon_living = "syndicaterangedspace"