mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-18 10:33:30 +01:00
Explorer Redux (#24202)
* 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 <77684085+Henri215@users.noreply.github.com> * character * Update code/modules/mob/living/simple_animal/hostile/mining/hivelord.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mob/living/simple_animal/hostile/pirate.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/effects/spawners/random_spawners.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/boxes.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/research/designs/machine_designs.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * some reviews * Update code/game/machinery/constructable_frame.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * supply * area repathing and ambience * mapping * metamapping * Update code/game/objects/items/weapons/storage/belt.dm Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/head/job_hats.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/weapons/storage/garment.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <77684085+Henri215@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/sellable.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * henri review + action figure * Update code/game/objects/items/toys.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * 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 <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/clothing/suits/misc_suits.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/modules/mining/machine_vending.dm Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * Update code/game/gamemodes/game_mode.dm Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> * mapping * Cleaning up * revert changes in tools/{bootstrap,ci} --------- Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com> Co-authored-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com> Co-authored-by: github-actions <github-actions@github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
This commit is contained in:
Marm
@@ -56,6 +56,8 @@ SUBSYSTEM_DEF(economy)
|
||||
var/credits_per_plasma = 10
|
||||
/// credits gained per research design sold
|
||||
var/credits_per_design = 20
|
||||
/// points gained per salvage sold
|
||||
var/credits_per_salvage = 100
|
||||
/// credits gained per working mech sold
|
||||
var/credits_per_mech = 100
|
||||
/// credits gained for each secondary goal completed
|
||||
|
||||
@@ -139,6 +139,59 @@ SUBSYSTEM_DEF(mapping)
|
||||
if(HAS_TRAIT(SSstation, STATION_TRAIT_HANGOVER))
|
||||
generate_themed_messes(list(/obj/effect/spawner/themed_mess/party))
|
||||
|
||||
/datum/controller/subsystem/mapping/proc/seed_space_salvage(space_z_levels)
|
||||
log_startup_progress("Seeding space salvage...")
|
||||
var/space_salvage_timer = start_watch()
|
||||
var/seeded_salvage_surfaces = list()
|
||||
var/seeded_salvage_closets = list()
|
||||
|
||||
var/list/small_salvage_items = list(
|
||||
/obj/item/salvage/ruin/brick,
|
||||
/obj/item/salvage/ruin/nanotrasen,
|
||||
/obj/item/salvage/ruin/carp,
|
||||
/obj/item/salvage/ruin/tablet,
|
||||
/obj/item/salvage/ruin/pirate,
|
||||
/obj/item/salvage/ruin/russian
|
||||
)
|
||||
|
||||
for(var/z_level in space_z_levels)
|
||||
var/list/turf/z_level_turfs = block(locate(1, 1, z_level), locate(world.maxx, world.maxy, z_level))
|
||||
for(var/z_level_turf in z_level_turfs)
|
||||
var/turf/T = z_level_turf
|
||||
var/area/A = get_area(T)
|
||||
if(istype(A, /area/ruin/space))
|
||||
// cardboard boxes are blacklisted otherwise deepstorage.dmm ends up hogging all the loot
|
||||
var/list/closet_blacklist = list(/obj/structure/closet/cardboard, /obj/structure/closet/fireaxecabinet, /obj/structure/closet/walllocker/emerglocker, /obj/structure/closet/crate/can, /obj/structure/closet/body_bag, /obj/structure/closet/coffin)
|
||||
for(var/obj/structure/closet/closet in T)
|
||||
if(is_type_in_list(closet, closet_blacklist))
|
||||
continue
|
||||
|
||||
seeded_salvage_closets |= closet
|
||||
for(var/obj/structure/table/table in T)
|
||||
if(locate(/obj/machinery) in T)
|
||||
continue // Machinery on tables tend to take up all the visible space
|
||||
seeded_salvage_surfaces |= table
|
||||
|
||||
var/max_salvage_attempts = rand(10, 15)
|
||||
while(max_salvage_attempts > 0 && length(seeded_salvage_closets) > 0)
|
||||
var/obj/structure/closet/C = pick_n_take(seeded_salvage_closets)
|
||||
var/salvage_item_type = pick(small_salvage_items)
|
||||
var/obj/salvage_item = new salvage_item_type(C)
|
||||
salvage_item.pixel_x = rand(-5, 5)
|
||||
salvage_item.pixel_y = rand(-5, 5)
|
||||
max_salvage_attempts -= 1
|
||||
|
||||
max_salvage_attempts = rand(10, 15)
|
||||
while(max_salvage_attempts > 0 && length(seeded_salvage_surfaces) > 0)
|
||||
var/obj/T = pick_n_take(seeded_salvage_surfaces)
|
||||
var/salvage_item_type = pick(small_salvage_items)
|
||||
var/obj/salvage_item = new salvage_item_type(T.loc)
|
||||
salvage_item.pixel_x = rand(-5, 5)
|
||||
salvage_item.pixel_y = rand(-5, 5)
|
||||
max_salvage_attempts -= 1
|
||||
|
||||
log_startup_progress("Successfully seeded space salvage in [stop_watch(space_salvage_timer)]s.")
|
||||
|
||||
// Do not confuse with seedRuins()
|
||||
/datum/controller/subsystem/mapping/proc/handleRuins()
|
||||
// load in extra levels of space ruins
|
||||
@@ -156,8 +209,10 @@ SUBSYSTEM_DEF(mapping)
|
||||
// Note that this budget is not split evenly accross all zlevels
|
||||
log_startup_progress("Seeding ruins...")
|
||||
var/seed_ruins_timer = start_watch()
|
||||
seedRuins(levels_by_trait(SPAWN_RUINS), rand(20, 30), /area/space, GLOB.space_ruins_templates)
|
||||
var/space_z_levels = levels_by_trait(SPAWN_RUINS)
|
||||
seedRuins(space_z_levels, rand(20, 30), /area/space, GLOB.space_ruins_templates)
|
||||
log_startup_progress("Successfully seeded ruins in [stop_watch(seed_ruins_timer)]s.")
|
||||
seed_space_salvage(space_z_levels)
|
||||
|
||||
// Loads in the station
|
||||
/datum/controller/subsystem/mapping/proc/loadStation()
|
||||
|
||||
Reference in New Issue
Block a user