mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
Makes the caravan ambush ruin harder to cheese (#38509)
* makes caravan ambush more challenging * SMASH
This commit is contained in:
@@ -33,7 +33,7 @@
|
|||||||
/area/template_noop)
|
/area/template_noop)
|
||||||
"ah" = (
|
"ah" = (
|
||||||
/obj/structure/lattice/catwalk,
|
/obj/structure/lattice/catwalk,
|
||||||
/mob/living/simple_animal/hostile/pirate/space{
|
/mob/living/simple_animal/hostile/pirate/space/ranged{
|
||||||
environment_smash = 0
|
environment_smash = 0
|
||||||
},
|
},
|
||||||
/turf/template_noop,
|
/turf/template_noop,
|
||||||
@@ -176,7 +176,7 @@
|
|||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"aP" = (
|
"aP" = (
|
||||||
/obj/machinery/atmospherics/components/unary/vent_pump/on,
|
/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
|
environment_smash = 0
|
||||||
},
|
},
|
||||||
/turf/open/floor/plasteel/airless/floorgrime,
|
/turf/open/floor/plasteel/airless/floorgrime,
|
||||||
@@ -404,6 +404,8 @@
|
|||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"gt" = (
|
"gt" = (
|
||||||
/obj/effect/turf_decal/bot_white,
|
/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,
|
/turf/open/floor/plasteel/airless/dark,
|
||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"gv" = (
|
"gv" = (
|
||||||
@@ -471,7 +473,7 @@
|
|||||||
/turf/open/floor/plating/airless,
|
/turf/open/floor/plating/airless,
|
||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"gT" = (
|
"gT" = (
|
||||||
/mob/living/simple_animal/hostile/syndicate/melee/space{
|
/mob/living/simple_animal/hostile/syndicate/ranged/space{
|
||||||
environment_smash = 0;
|
environment_smash = 0;
|
||||||
name = "Syndicate Salvage Worker"
|
name = "Syndicate Salvage Worker"
|
||||||
},
|
},
|
||||||
@@ -612,6 +614,10 @@
|
|||||||
/obj/effect/turf_decal/box/white/corners{
|
/obj/effect/turf_decal/box/white/corners{
|
||||||
dir = 1
|
dir = 1
|
||||||
},
|
},
|
||||||
|
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
|
||||||
|
environment_smash = 0;
|
||||||
|
name = "Syndicate Salvage Leader"
|
||||||
|
},
|
||||||
/turf/open/floor/plasteel/airless/dark,
|
/turf/open/floor/plasteel/airless/dark,
|
||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"hz" = (
|
"hz" = (
|
||||||
@@ -625,10 +631,6 @@
|
|||||||
},
|
},
|
||||||
/area/shuttle/caravan/freighter3)
|
/area/shuttle/caravan/freighter3)
|
||||||
"hB" = (
|
"hB" = (
|
||||||
/mob/living/simple_animal/hostile/syndicate/ranged/space/stormtrooper{
|
|
||||||
environment_smash = 0;
|
|
||||||
name = "Syndicate Salvage Leader"
|
|
||||||
},
|
|
||||||
/turf/open/floor/plasteel/airless{
|
/turf/open/floor/plasteel/airless{
|
||||||
icon_state = "damaged2"
|
icon_state = "damaged2"
|
||||||
},
|
},
|
||||||
@@ -895,7 +897,7 @@
|
|||||||
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
|
||||||
dir = 4
|
dir = 4
|
||||||
},
|
},
|
||||||
/mob/living/simple_animal/hostile/syndicate/melee/space{
|
/mob/living/simple_animal/hostile/syndicate/ranged/space{
|
||||||
environment_smash = 0;
|
environment_smash = 0;
|
||||||
name = "Syndicate Salvage Worker"
|
name = "Syndicate Salvage Worker"
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -43,6 +43,13 @@
|
|||||||
dir = 5
|
dir = 5
|
||||||
},
|
},
|
||||||
/area/shuttle/caravan/pirate)
|
/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" = (
|
"fh" = (
|
||||||
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
|
||||||
dir = 4
|
dir = 4
|
||||||
@@ -73,7 +80,9 @@
|
|||||||
/turf/open/floor/plasteel/red/side,
|
/turf/open/floor/plasteel/red/side,
|
||||||
/area/shuttle/caravan/pirate)
|
/area/shuttle/caravan/pirate)
|
||||||
"hh" = (
|
"hh" = (
|
||||||
/mob/living/simple_animal/hostile/pirate,
|
/mob/living/simple_animal/hostile/pirate{
|
||||||
|
environment_smash = 0
|
||||||
|
},
|
||||||
/turf/open/floor/plasteel,
|
/turf/open/floor/plasteel,
|
||||||
/area/shuttle/caravan/pirate)
|
/area/shuttle/caravan/pirate)
|
||||||
"hI" = (
|
"hI" = (
|
||||||
@@ -390,6 +399,12 @@
|
|||||||
/obj/item/reagent_containers/food/drinks/bottle/rum,
|
/obj/item/reagent_containers/food/drinks/bottle/rum,
|
||||||
/turf/open/floor/plasteel/dark,
|
/turf/open/floor/plasteel/dark,
|
||||||
/area/shuttle/caravan/pirate)
|
/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" = (
|
"ul" = (
|
||||||
/obj/structure/table,
|
/obj/structure/table,
|
||||||
/obj/item/retractor,
|
/obj/item/retractor,
|
||||||
@@ -448,8 +463,6 @@
|
|||||||
/obj/machinery/light/small{
|
/obj/machinery/light/small{
|
||||||
dir = 8
|
dir = 8
|
||||||
},
|
},
|
||||||
/obj/structure/closet/crate/secure/weapon,
|
|
||||||
/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted,
|
|
||||||
/turf/open/floor/plasteel/red/side{
|
/turf/open/floor/plasteel/red/side{
|
||||||
dir = 8
|
dir = 8
|
||||||
},
|
},
|
||||||
@@ -853,6 +866,13 @@
|
|||||||
/obj/item/melee/classic_baton,
|
/obj/item/melee/classic_baton,
|
||||||
/turf/open/floor/plasteel/darkred/corner,
|
/turf/open/floor/plasteel/darkred/corner,
|
||||||
/area/shuttle/caravan/pirate)
|
/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" = (
|
"Yo" = (
|
||||||
/obj/structure/table,
|
/obj/structure/table,
|
||||||
/obj/item/storage/box/lethalshot,
|
/obj/item/storage/box/lethalshot,
|
||||||
@@ -913,7 +933,7 @@ Jv
|
|||||||
"}
|
"}
|
||||||
(3,1,1) = {"
|
(3,1,1) = {"
|
||||||
Jv
|
Jv
|
||||||
oL
|
Yj
|
||||||
af
|
af
|
||||||
qX
|
qX
|
||||||
yt
|
yt
|
||||||
@@ -923,7 +943,7 @@ RK
|
|||||||
FM
|
FM
|
||||||
jh
|
jh
|
||||||
af
|
af
|
||||||
oL
|
eL
|
||||||
Jv
|
Jv
|
||||||
"}
|
"}
|
||||||
(4,1,1) = {"
|
(4,1,1) = {"
|
||||||
@@ -980,7 +1000,7 @@ su
|
|||||||
Ag
|
Ag
|
||||||
af
|
af
|
||||||
jo
|
jo
|
||||||
su
|
tM
|
||||||
sr
|
sr
|
||||||
af
|
af
|
||||||
af
|
af
|
||||||
|
|||||||
@@ -319,9 +319,8 @@
|
|||||||
/obj/structure/chair/office/dark{
|
/obj/structure/chair/office/dark{
|
||||||
dir = 4
|
dir = 4
|
||||||
},
|
},
|
||||||
/mob/living/simple_animal/hostile/syndicate{
|
/mob/living/simple_animal/hostile/syndicate/ranged/pilot{
|
||||||
environment_smash = 0;
|
environment_smash = 0
|
||||||
name = "Syndicate Salvage Pilot"
|
|
||||||
},
|
},
|
||||||
/turf/open/floor/plasteel/dark,
|
/turf/open/floor/plasteel/dark,
|
||||||
/area/shuttle/caravan/syndicate3)
|
/area/shuttle/caravan/syndicate3)
|
||||||
|
|||||||
@@ -18,9 +18,8 @@
|
|||||||
/obj/structure/cable/yellow{
|
/obj/structure/cable/yellow{
|
||||||
icon_state = "0-2"
|
icon_state = "0-2"
|
||||||
},
|
},
|
||||||
/mob/living/simple_animal/hostile/syndicate{
|
/mob/living/simple_animal/hostile/syndicate/ranged/pilot{
|
||||||
environment_smash = 0;
|
environment_smash = 0
|
||||||
name = "Syndicate Salvage Pilot"
|
|
||||||
},
|
},
|
||||||
/turf/open/floor/mineral/plastitanium,
|
/turf/open/floor/mineral/plastitanium,
|
||||||
/area/shuttle/caravan/syndicate1)
|
/area/shuttle/caravan/syndicate1)
|
||||||
|
|||||||
@@ -118,6 +118,10 @@
|
|||||||
projectilesound = 'sound/weapons/gunshot_smg.ogg'
|
projectilesound = 'sound/weapons/gunshot_smg.ogg'
|
||||||
loot = list(/obj/effect/gibspawner/human)
|
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
|
/mob/living/simple_animal/hostile/syndicate/ranged/space
|
||||||
icon_state = "syndicaterangedspace"
|
icon_state = "syndicaterangedspace"
|
||||||
icon_living = "syndicaterangedspace"
|
icon_living = "syndicaterangedspace"
|
||||||
|
|||||||
Reference in New Issue
Block a user