 Marm
|
5a68c5f6d3
|
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>
|
2024-05-27 19:27:59 +00:00 |
|