Equipment Locker and Ore Redemption Unit v1.0
Merge branch 'master' of https://github.com/tgstation/-tg-station into miningpoints
Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
Stops being able to power machines on asteroid turf
The west fields on the asteroid have been filled in, and the high mineral chance tiles have been redistributed throughout the asteroid.
High mineral chance turfs have been dotted throughout the asteroid instead of in small clumps.
High Mineral chance turfs and Labor minerals turfs are now color coded for your convenience in mapping, they go back to the default rock icon on new()
Makes SmeltMineral() less horrible actually adds the Mining Equipment Locker and Ore Redemption Machine to the map.
Makes SmeltMineral() less horrible actually adds the Mining Equipment Locker and Ore Redemption Machine to the map.
Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
Some mob tweaks, ghetto smelting, equipment locker item fixes and changes
Asteroid Overhaul v1.0
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
Adds the basic framework of NODROP
Asteroid Overhaul - Added explosions activating Gibtonite, revised ore redemption and equipment locker code, added warning signs to the western asteroid, tweaked mob spawning a little
Replaced before_take_item() and drop_from_inventory() with u_equip
Makes NODROP work for carbons, adds sanity checks to u_equip calls.
Blobize edge case fix

Fixes an edge case for blobize where if you open someone's player panel and they ghost between then and when you hit the blobize button it still gives priority to them for the created blob.

Note that you can't usually get the option to blobize a player if they've left their body before you open the player panel, if you want to blobize a specific person in this way, ask for them to return to their body.
Merge branch 'master' of https://github.com/tgstation/-tg-station into blobjob

Conflicts:
	code/modules/mob/transform_procs.dm
Gave Lawyer a sec headset

Oh god lets hope i did git right this time
removes a spawn() from the singularity consume proc that was causing runtimes. I think it also makes the singularity less laggy? Or maybe it's just a placebo effect.