Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dynamic missions #3538

Closed
wants to merge 69 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
f9aa603
one cargo console
FalloutFalcon May 15, 2024
62784f3
one cargo console
FalloutFalcon May 15, 2024
6ff0ac3
javascript stuff
FalloutFalcon May 15, 2024
5f39bc8
more cruft behavior
FalloutFalcon May 15, 2024
904728b
how did that get unticked
FalloutFalcon May 15, 2024
740a696
mostly flavor text
FalloutFalcon May 15, 2024
63998c9
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon May 31, 2024
e874284
hm
FalloutFalcon May 31, 2024
d038fe8
dead varibles
FalloutFalcon May 31, 2024
fd00663
prettier
FalloutFalcon May 31, 2024
7b121b5
bounty machine
FalloutFalcon Jun 5, 2024
597db34
idk
FalloutFalcon Jun 5, 2024
fcc40f5
reverting stuff so i can. do stuff
FalloutFalcon Jun 5, 2024
614cec4
Merge branch 'express' of https://github.com/FalloutFalcon/ShiptestF …
FalloutFalcon Jun 5, 2024
44684f5
stuf
FalloutFalcon Jun 5, 2024
df4a601
yea
FalloutFalcon Jun 6, 2024
c6c40e7
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 12, 2024
731757d
dynamic missioc code
FalloutFalcon Sep 24, 2024
2cb527e
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Sep 24, 2024
4ec0fce
Merge branch 'mission' of https://github.com/FalloutFalcon/ShiptestF …
FalloutFalcon Sep 24, 2024
47ecd2b
sample missions
FalloutFalcon Sep 24, 2024
ac6903b
alot of stuff related to dynamic missions
FalloutFalcon Sep 24, 2024
c808e4e
ui tweaks
FalloutFalcon Sep 24, 2024
207c19f
tweaks to ui to return a proc instead of pure cr value
FalloutFalcon Sep 26, 2024
3d5708c
alot of small tweaks for rewards ui
FalloutFalcon Sep 27, 2024
a0e7aa6
tweaks to allow a bit more leway in what we use as a poi item
FalloutFalcon Sep 27, 2024
d536775
removes stuff related to sending and tweaks missions to allow non-sp…
FalloutFalcon Sep 27, 2024
7fa3137
kill mission and repath missions in general
FalloutFalcon Sep 27, 2024
2e0c44d
kill mission
FalloutFalcon Sep 27, 2024
fc3fb20
neat little spawner tool and rename func
FalloutFalcon Sep 27, 2024
5447f9c
changes path for this
FalloutFalcon Sep 29, 2024
7ed1661
improvments
FalloutFalcon Oct 12, 2024
5d9cc9c
the drill
FalloutFalcon Oct 12, 2024
ec7a6d1
maps
FalloutFalcon Oct 12, 2024
4f4b9c1
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Oct 12, 2024
0fe0ed5
not real
FalloutFalcon Oct 12, 2024
ede1794
examine
FalloutFalcon Oct 12, 2024
441e16f
tgui
FalloutFalcon Oct 12, 2024
a8a7e77
improvments to overmap ui thing
FalloutFalcon Oct 13, 2024
0d7c46e
elite missions
FalloutFalcon Oct 13, 2024
bcc7714
missions and stuff
FalloutFalcon Oct 13, 2024
dd3b79f
simplifys some behavoir
FalloutFalcon Oct 13, 2024
f07ed20
more tweaks and improvments
FalloutFalcon Oct 14, 2024
869485c
coomit
FalloutFalcon Oct 14, 2024
8422ad2
program
FalloutFalcon Oct 14, 2024
7b0b760
the file system
FalloutFalcon Oct 15, 2024
4b72aaa
small tweaks to tgui
FalloutFalcon Oct 15, 2024
e2919dd
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Oct 18, 2024
f366ac3
if location_sepcific
FalloutFalcon Oct 18, 2024
a742e10
plently of small tweaks
FalloutFalcon Oct 18, 2024
37f459a
mission
FalloutFalcon Oct 18, 2024
784933e
signaled baby
FalloutFalcon Oct 19, 2024
cc2d06a
more changes!
FalloutFalcon Oct 19, 2024
6b99bf1
more changes, removes awaymission areas.
FalloutFalcon Oct 19, 2024
e962a22
repaths these to make more sense
FalloutFalcon Oct 19, 2024
38e9f82
tweaks to verbs to speed this up
FalloutFalcon Oct 19, 2024
7d0004c
more improvments
FalloutFalcon Oct 19, 2024
2b2aa86
more!
FalloutFalcon Oct 22, 2024
103e74b
weakrefing mission pois on late init
FalloutFalcon Oct 23, 2024
ec5f436
autodocing some stuff and starts a readme
FalloutFalcon Oct 23, 2024
4de8b7e
more improvments
FalloutFalcon Oct 24, 2024
8cc5089
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Oct 24, 2024
f8ccf6c
yea
FalloutFalcon Oct 25, 2024
e1ea919
moves the unticked missions
FalloutFalcon Oct 25, 2024
3175894
stuf
FalloutFalcon Oct 25, 2024
8dbfb3e
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Oct 25, 2024
8c448b0
file orgininzation
FalloutFalcon Oct 25, 2024
0c2e7b1
varius improvments
FalloutFalcon Oct 25, 2024
1aa8a6e
regexing descriptions and names of missions
FalloutFalcon Oct 26, 2024
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
1 change: 1 addition & 0 deletions _maps/RandomRuins/BeachRuins/beach_pirate_crash.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,7 @@
/obj/effect/turf_decal/weather/sand{
dir = 6
},
/obj/effect/landmark/mission_poi/main/kill,
/turf/open/floor/plating/asteroid/sand,
/area/overmap_encounter/planetoid/cave/explored)
"jZ" = (
Expand Down
5 changes: 5 additions & 0 deletions _maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1297,6 +1297,11 @@
dir = 8
},
/mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured,
/obj/effect/landmark/mission_poi/main/kill{
already_spawned = 1;
type_to_spawn = /mob/living/simple_animal/hostile/human/frontier/ranged/officer/neutured;
mission_index = 1
},
/turf/open/floor/carpet/red,
/area/ruin/beach/treasure_cove)
"SX" = (
Expand Down
1 change: 1 addition & 0 deletions _maps/RandomRuins/IceRuins/icemoon_crashed_holemaker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@
pixel_x = -32
},
/obj/effect/decal/cleanable/dirt/dust,
/obj/effect/landmark/mission_poi/main,
/turf/open/floor/plasteel/dark,
/area/ruin/unpowered/crashed_holemaker)
"cS" = (
Expand Down
7 changes: 6 additions & 1 deletion _maps/RandomRuins/IceRuins/icemoon_hydroponics_lab.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2195,6 +2195,11 @@
},
/turf/open/floor/plasteel/tech,
/area/ruin/powered/hydroponicslab)
"Xb" = (
/obj/structure/table/wood,
/obj/effect/landmark/mission_poi/main,
/turf/open/floor/wood/walnut,
/area/ruin/powered/hydroponicslab)
"Xt" = (
/obj/structure/table/wood,
/obj/item/folder{
Expand Down Expand Up @@ -2912,7 +2917,7 @@ pj
da
ic
We
vH
Xb
vH
vH
aJ
Expand Down
9 changes: 4 additions & 5 deletions _maps/RandomRuins/IceRuins/icemoon_ice_lodge.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@
dir = 6
},
/obj/structure/destructible/tribal_torch/lit{
pixel_y = 0;
pixel_x = 10
},
/turf/open/floor/wood/ebony,
Expand All @@ -122,7 +121,6 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/structure/sign/poster/contraband/backdoor_xeno_babes_6{
pixel_y = 0;
pixel_x = 30
},
/obj/item/reagent_containers/food/drinks/bottle/absinthe{
Expand Down Expand Up @@ -1724,7 +1722,6 @@
pixel_x = 5
},
/obj/item/storage/box/ammo/c38{
pixel_y = 0;
pixel_x = -11
},
/obj/item/storage/box/ammo/c38{
Expand Down Expand Up @@ -2355,7 +2352,6 @@
pixel_x = 4
},
/obj/item/candle/infinite{
pixel_y = 0;
pixel_x = 10
},
/obj/item/candle/infinite{
Expand Down Expand Up @@ -3408,6 +3404,10 @@
range_light = 5
},
/obj/effect/mob_spawn/human/corpse/srm/montagne,
/obj/effect/landmark/mission_poi/main{
mission_index = 1;
already_spawned = 1
},
/turf/open/floor/wood/maple,
/area/ruin/powered/icemoon/lodge/cellar)
"Yo" = (
Expand All @@ -3426,7 +3426,6 @@
pixel_x = 1
},
/obj/item/toy/cards/deck{
pixel_y = 0;
pixel_x = -4
},
/obj/item/storage/pill_bottle/dice{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@
/obj/effect/turf_decal/corner/opaque/black{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/black{
dir = 2
},
/obj/effect/turf_decal/corner/opaque/black,
/turf/open/floor/plasteel,
/area/ruin/powered)
"cB" = (
Expand Down Expand Up @@ -79,6 +77,16 @@
/obj/item/reagent_containers/food/drinks/beer,
/turf/open/floor/plating/ice/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"hY" = (
/obj/structure/vein/ice/classthree{
vein_class = 4;
mining_charges = 30
},
/obj/effect/landmark/mission_poi/main/drill{
mission_index = 2
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"iz" = (
/obj/structure/fence/door/opened{
dir = 8
Expand Down Expand Up @@ -138,6 +146,9 @@
},
/obj/effect/decal/cleanable/dirt,
/obj/effect/decal/cleanable/dirt,
/obj/effect/landmark/mission_poi/main{
mission_index = 1
},
/turf/open/floor/wood,
/area/ruin/powered)
"mI" = (
Expand Down Expand Up @@ -204,9 +215,7 @@
/obj/effect/turf_decal/corner/opaque/black{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/black{
dir = 2
},
/obj/effect/turf_decal/corner/opaque/black,
/turf/open/floor/plasteel,
/area/ruin/powered)
"tg" = (
Expand Down Expand Up @@ -248,9 +257,7 @@
/obj/effect/turf_decal/corner/opaque/black{
dir = 1
},
/obj/effect/turf_decal/corner/opaque/black{
dir = 2
},
/obj/effect/turf_decal/corner/opaque/black,
/turf/open/floor/plasteel,
/area/ruin/powered)
"us" = (
Expand Down Expand Up @@ -476,6 +483,13 @@
/obj/structure/chair/comfy/orange/directional/east,
/turf/open/floor/carpet,
/area/ruin/powered)
"OI" = (
/obj/effect/landmark/mission_poi/guard{
type_to_spawn = /mob/living/simple_animal/hostile/human/frontier/ranged/trooper/internals;
mission_index = 2
},
/turf/open/floor/plating/asteroid/snow/icemoon,
/area/overmap_encounter/planetoid/cave/explored)
"Pp" = (
/obj/effect/spawner/random/vending/snack,
/turf/open/floor/holofloor/wood,
Expand Down Expand Up @@ -981,7 +995,7 @@ Og
Og
Og
zT
Og
OI
Og
zT
Og
Expand Down Expand Up @@ -1070,10 +1084,10 @@ Vn
Og
zT
Og
Og
Og
Bq
Og
hY
Og
Og
Og
Gy
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,7 @@
pixel_y = 10
},
/obj/structure/table/wood/fancy/blue,
/obj/effect/landmark/mission_poi,
/turf/open/floor/carpet/orange{
initial_gas_mix = "ICEMOON_ATMOS"
},
Expand Down
1 change: 1 addition & 0 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7415,6 +7415,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"YA" = (
/obj/machinery/blackbox_recorder,
/obj/effect/landmark/mission_poi/main/blackbox,
/turf/open/floor/mineral/plastitanium/red,
/area/ruin/jungle/starport/tower)
"YC" = (
Expand Down
12 changes: 11 additions & 1 deletion _maps/RandomRuins/JungleRuins/jungle_cavecrew.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -668,6 +668,9 @@
/obj/structure/cable{
icon_state = "1-2"
},
/obj/effect/landmark/mission_poi/main/kill{
mission_index = 1
},
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/bridge)
"iN" = (
Expand Down Expand Up @@ -2176,6 +2179,9 @@
pixel_x = -5;
pixel_y = -3
},
/obj/effect/landmark/mission_poi/main{
mission_index = 2
},
/turf/open/floor/plasteel/tech,
/area/ruin/jungle/cavecrew/bridge)
"Al" = (
Expand Down Expand Up @@ -2733,6 +2739,10 @@
dir = 10
},
/obj/machinery/light/directional/south,
/obj/effect/landmark/mission_poi/guard{
type_to_spawn = /mob/living/simple_animal/hostile/human/frontier/ranged/neutered;
mission_index = 2
},
/turf/open/floor/plasteel/dark,
/area/ruin/jungle/cavecrew/bridge)
"Ir" = (
Expand Down Expand Up @@ -3219,7 +3229,7 @@
/obj/effect/turf_decal/industrial/hatch/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/structure/closet/crate/secure/loot,
/obj/item/wallframe/bounty_board,
/obj/item/wallframe/bounty_viewer,
/turf/open/floor/plasteel/patterned/cargo_one,
/area/ruin/jungle/cavecrew/cargo)
"Nf" = (
Expand Down
28 changes: 7 additions & 21 deletions _maps/RandomRuins/JungleRuins/jungle_interceptor.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2634,9 +2634,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"wI" = (
/obj/machinery/power/terminal,
/obj/structure/cable/orange{
icon_state = "0-1"
},
/obj/structure/cable/orange,
/obj/structure/cable/orange{
icon_state = "1-5"
},
Expand Down Expand Up @@ -3251,9 +3249,7 @@
icon_state = "1-2"
},
/obj/machinery/door/airlock/security,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/machinery/door/firedoor/border_only{
dir = 1
},
Expand Down Expand Up @@ -3650,9 +3646,7 @@
dir = 4
},
/obj/structure/catwalk/over/plated_catwalk/dark,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/turf/open/floor/plating,
/area/overmap_encounter/planetoid/jungle/explored)
"FQ" = (
Expand Down Expand Up @@ -4769,9 +4763,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"OL" = (
/obj/machinery/power/terminal,
/obj/structure/cable/orange{
icon_state = "0-1"
},
/obj/structure/cable/orange,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
Expand Down Expand Up @@ -4812,9 +4804,7 @@
/area/overmap_encounter/planetoid/jungle/explored)
"OW" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2,
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/stack/cable_coil/cut/orange,
/turf/open/floor/plating/rust,
/area/overmap_encounter/planetoid/jungle/explored)
Expand Down Expand Up @@ -5274,9 +5264,7 @@
/area/ruin/jungle/interceptor/starhall)
"ST" = (
/obj/machinery/power/terminal,
/obj/structure/cable/orange{
icon_state = "0-1"
},
/obj/structure/cable/orange,
/obj/effect/turf_decal/industrial/warning{
dir = 1
},
Expand Down Expand Up @@ -5437,9 +5425,7 @@
/turf/open/floor/plating,
/area/ruin/jungle/interceptor/starhall)
"Up" = (
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{
dir = 2
},
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4,
/obj/item/stack/cable_coil/cut/orange,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plating,
Expand Down
20 changes: 20 additions & 0 deletions _maps/RandomRuins/JungleRuins/jungle_syndicate.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@
/obj/effect/decal/cleanable/dirt/dust,
/obj/structure/table,
/obj/item/storage/cans/sixbeer,
/obj/effect/landmark/mission_poi/main{
blocks_emissive = 1;
mission_index = 1
},
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"bS" = (
Expand Down Expand Up @@ -128,6 +132,10 @@
name = "Jerry";
unsuitable_atmos_damage = 0
},
/obj/effect/landmark/mission_poi/main/kill{
already_spawned = 1;
mission_index = 2
},
/turf/open/floor/plating,
/area/ruin/jungle/syndifort/jerry)
"es" = (
Expand All @@ -154,6 +162,10 @@
/area/ruin/jungle/syndifort)
"eU" = (
/obj/structure/chair/plastic,
/obj/effect/landmark/mission_poi/guard{
mission_index = 1;
type_to_spawn = /mob/living/simple_animal/hostile/human/syndicate/ranged
},
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"eW" = (
Expand Down Expand Up @@ -762,6 +774,10 @@
/obj/structure/sign/poster/contraband/peacemaker{
pixel_x = 32
},
/obj/effect/landmark/mission_poi/guard{
mission_index = 1;
type_to_spawn = /mob/living/simple_animal/hostile/human/syndicate
},
/turf/open/floor/plating,
/area/ruin/jungle/syndifort)
"xm" = (
Expand Down Expand Up @@ -941,6 +957,10 @@
"BC" = (
/obj/structure/chair/plastic,
/obj/machinery/light/small/directional/north,
/obj/effect/landmark/mission_poi/guard{
mission_index = 1;
type_to_spawn = /mob/living/simple_animal/hostile/human/syndicate
},
/turf/open/floor/plating/rust,
/area/ruin/jungle/syndifort)
"BH" = (
Expand Down
Loading
Loading