Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
95da043
Merge split/plumbing into split/base-human-npcs
Jackriip Nov 15, 2026
46eb84f
Merge split/fixes into split/base-human-npcs
Jackriip Nov 15, 2026
66187e9
Human NPCs: a real human body with AI, gear, soft crit, surrender and…
Jackriip Nov 15, 2026
f73eed6
Pirate crews, boarders, ruin troopers, hermits and mission NPCs are p…
Jackriip Nov 15, 2026
79a97d2
Bounty criminals, companions, the kingpin's crew and the mafia club a…
Jackriip Nov 16, 2026
9cf5733
Mission waves arrive by drop pod or dig out of the ground
Jackriip Nov 16, 2026
969585a
NPC shots pass over their own side; a grabbed NPC shields against its…
Jackriip Nov 16, 2026
ce0fdc3
Bounty targets: plain guards, space suits, holstered guns, slower pis…
Jackriip Nov 16, 2026
375d588
Zone event route test: count the people a loan queues
Jackriip Nov 16, 2026
69d94bb
Merge branch 'split/npc-pirates-ruins' into split/npc-bounties
Jackriip Nov 16, 2026
4986264
Merge branch 'split/npc-pirates-ruins' into split/mission-waves
Jackriip Nov 16, 2026
d2bc42f
Zone bounty tests: put the criminal in crit with a chest hit
Jackriip Nov 16, 2026
1db8aa3
Merge branch 'split/npc-bounties' into split/npc-shield
Jackriip Nov 16, 2026
0b76b5e
Merge branch 'split/npc-bounties' into split/bounty-guards
Jackriip Nov 16, 2026
4ee8d60
Merge pull request #552 from voidcrew/split/human-npcs
Jackriip Nov 16, 2026
8f08e11
Merge pull request #553 from voidcrew/split/npc-pirates-ruins
Jackriip Nov 16, 2026
92cdff1
Merge branch 'split/base-human-npcs' into split/npc-bounties
Jackriip Nov 16, 2026
4638b2b
Prison inmates, guards and experiment subjects are people
Jackriip Nov 16, 2026
b1582e9
Prison barricade test: take the mess table out of the smoothing queue…
Jackriip Nov 16, 2026
bd60578
Townsfolk, outpost and planet NPCs, strays and mission survivors are …
Jackriip Nov 16, 2026
157e579
Merge pull request #559 from voidcrew/split/npc-ambient
Jackriip Nov 16, 2026
edc60f1
Rescued strays thank the crew with ship parts
Jackriip Nov 16, 2026
132202c
Rescued survivors raise the crew's reputation
Jackriip Nov 16, 2026
19985c8
Merge pull request #571 from voidcrew/split/rescue-rep
Jackriip Nov 16, 2026
16c49c8
Merge pull request #569 from voidcrew/split/bounty-guards
Jackriip Nov 16, 2026
b7d8085
Merge branch 'split/base-human-npcs' into split/npc-shield
Jackriip Nov 16, 2026
a5dfc04
Merge pull request #568 from voidcrew/split/npc-shield
Jackriip Nov 16, 2026
d4f24f5
Merge remote-tracking branch 'origin2/master' into HEAD
Jackriip Nov 16, 2026
fd063ad
Merge pull request #567 from voidcrew/split/mission-waves
Jackriip Nov 16, 2026
98b237f
Merge remote-tracking branch 'origin2/master' into HEAD
Jackriip Nov 16, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions _maps/voidcrew/RandomRuins/BeachRuins/fishing_hut.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@
/turf/template_noop,
/area/template_noop)
"qU" = (
/mob/living/basic/trooper/pirate/melee,
/obj/effect/spawner/human_npc/ruin/pirate,
/obj/structure/chair/stool/directional/west,
/turf/open/floor/bamboo/tatami,
/area/ruin/powered{
Expand Down Expand Up @@ -853,7 +853,7 @@
/turf/open/misc/asteroid/sand/beach,
/area/overmap_encounter/planetoid/beach)
"Mn" = (
/mob/living/basic/trooper/pirate/ranged,
/obj/effect/spawner/human_npc/ruin/pirate/gunner,
/obj/structure/chair/stool/directional/east,
/turf/open/floor/bamboo/tatami,
/area/ruin/powered{
Expand Down
28 changes: 14 additions & 14 deletions _maps/voidcrew/RandomRuins/BeachRuins/push_it.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@
/area/overmap_encounter/planetoid/beach)
"dG" = (
/obj/structure/chair,
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
},
Expand Down Expand Up @@ -244,7 +244,7 @@
/obj/structure/chair{
dir = 4
},
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/turf/open/floor/iron/dark,
/area/ruin/powered)
"ia" = (
Expand Down Expand Up @@ -338,7 +338,7 @@
/turf/template_noop,
/area/template_noop)
"mf" = (
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/carpet/neon/simple/violet/nodots,
/area/ruin/powered)
"ms" = (
Expand All @@ -365,7 +365,7 @@
/turf/open/floor/carpet/neon/simple/violet,
/area/ruin/powered)
"mK" = (
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
},
Expand Down Expand Up @@ -532,7 +532,7 @@
/area/ruin/powered)
"sv" = (
/obj/structure/chair/stool/directional/north,
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/carpet/neon/simple/violet/nodots,
/area/ruin/powered)
"sP" = (
Expand Down Expand Up @@ -602,7 +602,7 @@
/area/ruin/powered)
"ve" = (
/obj/structure/toilet,
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/obj/machinery/light/small/directional/north,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered)
Expand Down Expand Up @@ -738,7 +738,7 @@
/obj/structure/chair/sofa/corp/right{
dir = 1
},
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/turf/open/floor/carpet/neon/simple/violet,
/area/ruin/powered)
"Cz" = (
Expand Down Expand Up @@ -817,7 +817,7 @@
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 1
},
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered)
"Fw" = (
Expand Down Expand Up @@ -1065,7 +1065,7 @@
/turf/open/floor/iron/dark,
/area/ruin/powered)
"Pl" = (
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/turf/open/floor/light/colour_cycle/dancefloor_a,
/area/ruin/powered)
"Pq" = (
Expand All @@ -1085,7 +1085,7 @@
/area/template_noop)
"Qw" = (
/obj/structure/chair/sofa/corp/corner,
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/carpet/neon/simple/violet,
/area/ruin/powered)
"QN" = (
Expand Down Expand Up @@ -1169,7 +1169,7 @@
"SV" = (
/obj/structure/mirror/directional/north,
/obj/structure/sink/directional/south,
/mob/living/basic/trooper/russian/ranged,
/obj/effect/spawner/human_npc/ruin/russian/gunner,
/obj/machinery/light/blacklight/directional/west,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered)
Expand Down Expand Up @@ -1218,7 +1218,7 @@
/turf/open/floor/carpet/neon/simple/violet,
/area/ruin/powered)
"Ux" = (
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/light/colour_cycle/dancefloor_a,
/area/ruin/powered)
"UU" = (
Expand Down Expand Up @@ -1257,7 +1257,7 @@
/obj/structure/chair/sofa/corp/corner{
dir = 8
},
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/iron/dark/smooth_large,
/area/ruin/powered)
"VX" = (
Expand Down Expand Up @@ -1292,7 +1292,7 @@
/obj/structure/chair{
dir = 1
},
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/obj/effect/turf_decal/siding/thinplating_new/dark{
dir = 8
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/syndielab)
"ae" = (
/mob/living/basic/trooper/syndicate/ranged,
/obj/effect/spawner/human_npc/ruin/syndicate/gunner,
/obj/structure/cable/layer1,
/turf/open/floor/iron/dark/textured,
/area/ruin/syndielab)
"af" = (
/obj/structure/chair/sofa/corp/right,
/mob/living/basic/trooper/syndicate/ranged,
/obj/effect/spawner/human_npc/ruin/syndicate/gunner,
/obj/machinery/light/warm/directional/north,
/obj/structure/cable/layer1,
/turf/open/floor/iron/dark/textured,
Expand Down
12 changes: 6 additions & 6 deletions _maps/voidcrew/RandomRuins/JungleRuins/jungle_pirate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@
/obj/structure/railing{
dir = 4
},
/mob/living/basic/trooper/pirate/ranged,
/obj/effect/spawner/human_npc/ruin/pirate/gunner,
/turf/open/floor/wood,
/area/ruin/unpowered)
"rc" = (
Expand Down Expand Up @@ -242,11 +242,11 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"DH" = (
/mob/living/basic/trooper/pirate/ranged/space,
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/open/floor/carpet/red,
/area/ruin/unpowered)
"DS" = (
/mob/living/basic/trooper/pirate/ranged,
/obj/effect/spawner/human_npc/ruin/pirate/gunner,
/turf/open/floor/wood,
/area/ruin/unpowered)
"DV" = (
Expand Down Expand Up @@ -296,7 +296,7 @@
/turf/open/floor/wood,
/area/ruin/unpowered)
"LT" = (
/mob/living/basic/trooper/pirate/melee,
/obj/effect/spawner/human_npc/ruin/pirate,
/obj/structure/chair/wood,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
Expand Down Expand Up @@ -366,7 +366,7 @@
/turf/open/misc/dirt/jungle,
/area/ruin/unpowered)
"UX" = (
/mob/living/basic/trooper/pirate/melee,
/obj/effect/spawner/human_npc/ruin/pirate,
/turf/open/floor/wood,
/area/ruin/unpowered)
"Vf" = (
Expand Down Expand Up @@ -396,7 +396,7 @@
/turf/open/floor/carpet/red,
/area/ruin/unpowered)
"XA" = (
/mob/living/basic/trooper/pirate/melee,
/obj/effect/spawner/human_npc/ruin/pirate,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/wood,
/area/ruin/unpowered)
Expand Down
4 changes: 2 additions & 2 deletions _maps/voidcrew/RandomRuins/JungleRuins/jungle_syndicate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@
/area/ruin/powered)
"G" = (
/obj/structure/cable,
/mob/living/basic/trooper/syndicate,
/obj/effect/spawner/human_npc/ruin/syndicate,
/turf/open/floor/plating,
/area/ruin/powered)
"H" = (
Expand All @@ -148,7 +148,7 @@
/area/ruin/unpowered)
"K" = (
/obj/structure/chair/plastic,
/mob/living/basic/trooper/syndicate/ranged,
/obj/effect/spawner/human_npc/ruin/syndicate/gunner,
/turf/open/floor/plating,
/area/ruin/powered)
"M" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1749,7 +1749,7 @@
/area/ruin/space/has_grav/powered/mafia_club/back_office)
"FW" = (
/obj/effect/landmark/bounty_lair_gatekeeper{
gatekeeper_type = /mob/living/basic/trooper/russian/mafia/lieutenant
gatekeeper_type = /mob/living/carbon/human/npc/bounty_mafia/lieutenant
},
/turf/open/floor/carpet/red,
/area/ruin/space/has_grav/powered/mafia_club/back_office)
Expand Down Expand Up @@ -2653,7 +2653,7 @@
/area/ruin/space/has_grav/powered/mafia_club/staff)
"ZX" = (
/obj/effect/landmark/bounty_lair_gatekeeper{
gatekeeper_type = /mob/living/basic/trooper/russian/mafia/lieutenant
gatekeeper_type = /mob/living/carbon/human/npc/bounty_mafia/lieutenant
},
/turf/open/floor/iron/dark/textured,
/area/ruin/space/has_grav/powered/mafia_club/back_office)
Expand Down
22 changes: 7 additions & 15 deletions _maps/voidcrew/RandomRuins/SpaceRuins/caravanambush.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,7 @@
/area/template_noop)
"ah" = (
/obj/structure/lattice/catwalk,
/mob/living/basic/trooper/pirate/ranged/space{
environment_smash = 0
},
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/template_noop,
/area/template_noop)
"ai" = (
Expand Down Expand Up @@ -60,7 +58,7 @@
/area/shuttle/ruin/caravan/freighter2)
"al" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/trooper/syndicate/ranged/space,
/obj/effect/spawner/human_npc/ruin/syndicate/commando/gunner,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter3)
"am" = (
Expand All @@ -74,7 +72,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/trooper/syndicate/ranged/space,
/obj/effect/spawner/human_npc/ruin/syndicate/commando/gunner,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter3)
"ao" = (
Expand All @@ -85,7 +83,7 @@
/obj/effect/turf_decal/box/white/corners{
dir = 4
},
/mob/living/basic/trooper/syndicate/ranged/space,
/obj/effect/spawner/human_npc/ruin/syndicate/commando/gunner,
/turf/open/floor/iron/dark/airless,
/area/shuttle/ruin/caravan/freighter3)
"aD" = (
Expand Down Expand Up @@ -623,9 +621,7 @@
dir = 4
},
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/trooper/pirate/ranged/space{
environment_smash = 0
},
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
"wC" = (
Expand Down Expand Up @@ -755,9 +751,7 @@
/area/ruin/space/has_grav)
"Fr" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/trooper/pirate/ranged/space{
environment_smash = 0
},
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/open/floor/plating/airless,
/area/shuttle/ruin/caravan/freighter2)
"FG" = (
Expand Down Expand Up @@ -956,9 +950,7 @@
"Nm" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on,
/obj/effect/decal/cleanable/dirt,
/mob/living/basic/trooper/pirate/ranged/space{
environment_smash = 0
},
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/open/floor/iron/airless,
/area/shuttle/ruin/caravan/freighter2)
"NJ" = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
/area/ruin/space/has_grav/derelictconstruction)
"fa" = (
/obj/structure/lattice,
/mob/living/basic/trooper/pirate/ranged/space,
/obj/effect/spawner/human_npc/ruin/pirate/space/gunner,
/turf/template_noop,
/area/space/nearstation)
"gi" = (
Expand Down Expand Up @@ -438,7 +438,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/derelictconstruction)
"Za" = (
/mob/living/basic/trooper/pirate/melee/space,
/obj/effect/spawner/human_npc/ruin/pirate/space,
/obj/structure/lattice/catwalk,
/turf/template_noop,
/area/ruin/space/has_grav/derelictconstruction)
Expand Down
8 changes: 4 additions & 4 deletions _maps/voidcrew/RandomRuins/SpaceRuins/forgottenship.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aG" = (
/mob/living/basic/trooper/nanotrasen/ranged,
/obj/effect/spawner/human_npc/ruin/nanotrasen,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aH" = (
Expand All @@ -190,7 +190,7 @@
dir = 10
},
/obj/item/wrench,
/mob/living/basic/trooper/nanotrasen/ranged,
/obj/effect/spawner/human_npc/ruin/nanotrasen,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aK" = (
Expand All @@ -214,7 +214,7 @@
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aN" = (
/obj/machinery/light/directional/south,
/mob/living/basic/trooper/nanotrasen/ranged,
/obj/effect/spawner/human_npc/ruin/nanotrasen,
/turf/open/floor/iron/dark,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"aO" = (
Expand Down Expand Up @@ -299,7 +299,7 @@
/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden{
dir = 4
},
/mob/living/basic/trooper/nanotrasen/ranged,
/obj/effect/spawner/human_npc/ruin/nanotrasen,
/turf/open/floor/mineral/plastitanium,
/area/ruin/space/has_grav/syndicate_forgotten_ship)
"bd" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"wh" = (
/mob/living/basic/trooper/syndicate/ranged,
/obj/effect/spawner/human_npc/ruin/syndicate/gunner,
/turf/open/floor/plating,
/area/ruin/space/has_grav/garbagetruck/medicalwaste)
"wk" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/voidcrew/RandomRuins/SpaceRuins/garbagetruck3.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@
"JR" = (
/obj/effect/decal/cleanable/ash,
/obj/effect/decal/cleanable/blood/splatter/oil,
/mob/living/basic/trooper/russian,
/obj/effect/spawner/human_npc/ruin/russian,
/turf/open/floor/plating/dumpsterair,
/area/ruin/space/has_grav/garbagetruck/squat)
"JW" = (
Expand Down
Loading
Loading