Skip to content

Commit

Permalink
Explorer Redux (ParadiseSS13#24202)
Browse files Browse the repository at this point in the history
* WE'RE SO BACK

* LET THERE BE SOUND

* More bugs

* fixes

* sound

* hmm

* clothing sprites + minor code changes to clothes

* meestake

* spritening

* YARR

* hiss

* Cyberiad explorer remap

* hand telover

* delta days

* rooms done

* VENDOR

* Mapping done

* Salvage mapped

* qol

* Forgot the hivelord.

* woops

* oops redux

* reviews and more

* consistency

* Update code/game/jobs/job_globals.dm

Co-authored-by: Henri215 <[email protected]>

* character

* Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/mob/living/simple_animal/hostile/pirate.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/effects/spawners/random_spawners.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/research/designs/machine_designs.dm

Co-authored-by: Henri215 <[email protected]>

* some reviews

* Update code/game/machinery/constructable_frame.dm

Co-authored-by: Henri215 <[email protected]>

* supply

* area repathing and ambience

* mapping

* metamapping

* Update code/game/objects/items/weapons/storage/belt.dm

Co-authored-by: Burzah <[email protected]>

* the doorening

* redooring

* modsuit

* more reviews

* the plasmamamninigngg

* add random salvage generation across space ruins

* add blackbox tracking for salvage sold

* gun

* deconflicts and reviews

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/clothing/head/job_hats.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/weapons/storage/garment.dm

Co-authored-by: Henri215 <[email protected]>

* all conversations resolved

* maybe work now?

* please no more, too many apcs

* Update code/modules/mob/living/simple_animal/corpse.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* Update code/game/objects/items/sellable.dm

Co-authored-by: Henri215 <[email protected]>

* henri review + action figure

* Update code/game/objects/items/toys.dm

Co-authored-by: Henri215 <[email protected]>

* PDA

* conflicts

* more conflicts

* maybe all conflcits?

* wait fuck

* maybe fixed???

* KIDAN SPRITES

* MAYBE?

* access fixes

* explorer hotfixes 1:

- fixes space pirates dying in space
- gives explorers ORM access
- box: fixes access on NTR airlock
- box: fixes naming on BS airlock
- box: adds expedition access to mail sorting room

* add salvage selling back

* NOT FOR SALE

* oh my god actually sell the fucking salvage this time

* maybe fine now?

* carpover

* NO MORE CABLE

* balance tweaks

* some depot loot updates

* merge conflict

* deconflicted???

* woops more oversights

* skirts, bombers, exploredrobe code + sprites

* woops (again)

* deconflicting

* remove old explorer room again

* Hat fix

* minor changes to sprites and code for hats

* yarrr fix 1

* first fixes

* don't drop loot from syndies gibbed by depot destruction

* add selling back with new signal based system

* speedmerge this shit

* minor changes to collars/bomber resprite

* docking port in

* ruins

* WE DON'T NEED CONFIG CHANGES WE NEED PICTURES PICTURES OF SPIDERMAN

* no more murder hallway on whiteship

* undelete meson sunglasses, redelete uristrunes

* BOOTY BAGS

* don't drop ashdrake loot from crusher kills

* box: fix ntrep fax, add explorer access to ORMroom

* add meson sunglasses item icon back

* fix cere handtele, meta shutter control, death sound arg

* cleaning up

* she mosins on my russian till i dj station

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Matt <[email protected]>
Signed-off-by: Marm <[email protected]>

* Update code/modules/clothing/suits/misc_suits.dm

Co-authored-by: Matt <[email protected]>
Signed-off-by: Marm <[email protected]>

* Update code/modules/mining/machine_vending.dm

Co-authored-by: Matt <[email protected]>
Signed-off-by: Marm <[email protected]>

* Update code/game/gamemodes/game_mode.dm

Co-authored-by: Contrabang <[email protected]>
Signed-off-by: Marm <[email protected]>

* mapping

* Cleaning up

* revert changes in tools/{bootstrap,ci}

---------

Signed-off-by: Marm <[email protected]>
Co-authored-by: Christasmurf <[email protected]>
Co-authored-by: warriorstar-orion <[email protected]>
Co-authored-by: Henri215 <[email protected]>
Co-authored-by: Burzah <[email protected]>
Co-authored-by: github-actions <[email protected]>
Co-authored-by: DGamerL <[email protected]>
Co-authored-by: Contrabang <[email protected]>
  • Loading branch information
8 people authored May 27, 2024
1 parent c9f44b1 commit 5a68c5f
Show file tree
Hide file tree
Showing 146 changed files with 5,883 additions and 4,899 deletions.
50 changes: 36 additions & 14 deletions _maps/map_files/RandomRuins/SpaceRuins/abandoned_engi_sat.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
icon_state = "dark"
},
/area/ruin/space/abandoned_engi_sat)
"aR" = (
/mob/living/simple_animal/hostile/carp/megacarp,
/turf/template_noop,
/area/template_noop)
"bi" = (
/obj/structure/chair/comfy/black{
dir = 8
Expand Down Expand Up @@ -239,6 +243,7 @@
/area/ruin/space/abandoned_engi_sat)
"hB" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"hE" = (
Expand Down Expand Up @@ -567,7 +572,6 @@
"pX" = (
/obj/structure/closet{
icon_state = "eng_secure";
opened = 1;
open_door_sprite = "eng_secure_door";
name = "engineer's locker"
},
Expand All @@ -577,6 +581,10 @@
/obj/effect/spawner/random_spawners/wall_rusted_always,
/turf/simulated/wall/r_wall,
/area/ruin/space/abandoned_engi_sat)
"rn" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)
"rr" = (
/obj/structure/lattice,
/turf/template_noop,
Expand Down Expand Up @@ -1079,6 +1087,11 @@
name = "floor"
},
/area/ruin/space/abandoned_engi_sat)
"Ig" = (
/obj/structure/table,
/obj/item/salvage/ruin/nanotrasen,
/turf/simulated/floor/plasteel,
/area/ruin/space/abandoned_engi_sat)
"Iz" = (
/obj/structure/disposalpipe/segment,
/obj/effect/spawner/random_spawners/wall_rusted_always,
Expand Down Expand Up @@ -1204,6 +1217,10 @@
icon_state = "blue"
},
/area/ruin/space/abandoned_engi_sat)
"OW" = (
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"OZ" = (
/obj/structure/lattice/catwalk,
/obj/structure/cable{
Expand Down Expand Up @@ -1410,6 +1427,11 @@
/obj/structure/bed,
/turf/simulated/floor/carpet/airless,
/area/ruin/space/abandoned_engi_sat)
"Xq" = (
/obj/effect/decal/cleanable/dirt,
/mob/living/simple_animal/hostile/asteroid/hivelord,
/turf/simulated/floor/plating,
/area/ruin/space/abandoned_engi_sat)
"XP" = (
/obj/effect/decal/cleanable/dirt,
/turf/simulated/floor/plating,
Expand Down Expand Up @@ -1550,13 +1572,13 @@ LP
"}
(2,1,1) = {"
LP
rn
LP
LP
LP
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -1586,9 +1608,9 @@ LP
LP
LP
LP
rn
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -1780,7 +1802,7 @@ Iz
hE
LP
LP
LP
aR
LP
LP
LP
Expand Down Expand Up @@ -1974,7 +1996,7 @@ kt
eP
fA
XP
et
OW
et
Yz
CP
Expand Down Expand Up @@ -2040,7 +2062,7 @@ kZ
Tw
YE
jG
XP
Xq
XP
Ud
fA
Expand Down Expand Up @@ -2308,7 +2330,7 @@ oL
mW
NM
mW
BR
Ig
IC
IC
ao
Expand Down Expand Up @@ -2357,11 +2379,11 @@ LP
Gi
LP
LP
rn
LP
LP
LP
LP
LP
rn
LP
"}
(26,1,1) = {"
Expand Down Expand Up @@ -2427,7 +2449,7 @@ px
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -2486,7 +2508,7 @@ uQ
qu
LP
LP
LP
rn
LP
LP
LP
Expand Down Expand Up @@ -2523,7 +2545,7 @@ LP
LP
LP
LP
LP
rn
LP
LP
LP
Expand Down
16 changes: 10 additions & 6 deletions _maps/map_files/RandomRuins/SpaceRuins/asteroid1.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
"c" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
a
Expand Down Expand Up @@ -83,7 +87,7 @@ a
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -158,7 +162,7 @@ c
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -220,10 +224,10 @@ a
a
a
a
V
a
a
a
a
V
a
a
a
Expand Down Expand Up @@ -254,7 +258,7 @@ a
(12,1,1) = {"
a
a
a
V
a
a
c
Expand Down Expand Up @@ -322,7 +326,7 @@ a
a
a
a
a
V
a
a
a
Expand Down
24 changes: 18 additions & 6 deletions _maps/map_files/RandomRuins/SpaceRuins/asteroid2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,18 @@
"d" = (
/turf/simulated/mineral/random/high_chance,
/area/ruin/space/unpowered)
"t" = (
/obj/structure/spawner/mining/basilisk,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"R" = (
/obj/structure/spawner/mining/goliath,
/turf/simulated/floor/plating/asteroid/airless,
/area/ruin/space/unpowered)
"V" = (
/mob/living/simple_animal/hostile/carp,
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
a
Expand Down Expand Up @@ -105,7 +117,7 @@ a
a
a
b
b
t
b
c
c
Expand Down Expand Up @@ -367,7 +379,7 @@ b
(17,1,1) = {"
a
a
a
V
b
a
a
Expand All @@ -388,8 +400,8 @@ a
"}
(18,1,1) = {"
a
a
a
V
V
b
b
a
Expand All @@ -400,7 +412,7 @@ a
b
b
b
b
R
b
b
b
Expand All @@ -413,7 +425,7 @@ a
a
a
a
a
V
a
a
a
Expand Down
Loading

0 comments on commit 5a68c5f

Please sign in to comment.